GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-12 07:48:22 +00:00
Code Issues Releases Wiki Activity

Merge pull request #434 from kanoi/master

Browse Source 
Alice v0.1 +
This commit is contained in:
kanoi 2013-06-02 17:31:53 -07:00
commit e4ab2e07a4
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
API.java
View File

@ -1,4 +1,6 @@
/*
*
* Copyright (C) Andrew Smith 2012-2013
*
* Usage: java API command ip port
*

31
cgminer.c
View File

@ -2034,10 +2034,9 @@ static void adj_width(int var, int *length)
static int dev_width;
static void curses_print_devstatus(int thr_id)
static void curses_print_devstatus(struct cgpu_info *cgpu, int count)
{
static int awidth = 1, rwidth = 1, hwwidth = 1, uwidth = 1;
struct cgpu_info *cgpu;
char logline[256];
char displayed_hashes[16], displayed_rolling[16];
uint64_t dh64, dr64;
@ -2045,14 +2044,12 @@ static void curses_print_devstatus(int thr_id)
if (opt_compact)
return;
cgpu = get_thr_cgpu(thr_id);
if (cgpu->cgminer_id >= start_devices || devcursor + cgpu->cgminer_id > LINES - 2)
if (count >= start_devices || devcursor + count > LINES - 2)
return;
cgpu->utility = cgpu->accepted / total_secs * 60;
wmove(statuswin,devcursor + cgpu->cgminer_id, 0);
wmove(statuswin,devcursor + count, 0);
wprintw(statuswin, " %s %*d: ", cgpu->drv->name, dev_width, cgpu->device_id);
logline[0] = '\0';
cgpu->drv->get_statline_before(logline, cgpu);
@ -6385,10 +6382,28 @@ static void *watchdog_thread(void __maybe_unused *userdata)
#ifdef HAVE_CURSES
if (curses_active_locked()) {
struct cgpu_info *cgpu;
int count;
change_logwinsize();
curses_print_status();
for (i = 0; i < mining_threads; i++)
curses_print_devstatus(i);
count = 0;
for (i = 0; i < mining_threads; i++) {
cgpu = get_thr_cgpu(i);
#ifndef USE_USBUTILS
if (cgpu)
#else
if (cgpu && !cgpu->usbinfo.nodev)
#endif
curses_print_devstatus(cgpu, count++);
}
#ifdef USE_USBUTILS
for (i = 0; i < mining_threads; i++) {
cgpu = get_thr_cgpu(i);
if (cgpu && cgpu->usbinfo.nodev)
curses_print_devstatus(cgpu, count++);
}
#endif
touchwin(statuswin);
wrefresh(statuswin);
touchwin(logwin);