|
|
@ -804,13 +804,21 @@ static void curses_print_status(int thr_id) |
|
|
|
struct cgpu_info *cgpu = &gpus[gpu]; |
|
|
|
struct cgpu_info *cgpu = &gpus[gpu]; |
|
|
|
|
|
|
|
|
|
|
|
wmove(statuswin, gpucursor + gpu, 0); |
|
|
|
wmove(statuswin, gpucursor + gpu, 0); |
|
|
|
if (!gpu_devices[gpu] || !cgpu->alive) |
|
|
|
if (!cgpu->alive) |
|
|
|
wattron(logwin, A_DIM); |
|
|
|
wprintw(statuswin, " GPU %d: [DEAD / %.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]", |
|
|
|
wprintw(statuswin, " GPU %d: [%.1f / %.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]", |
|
|
|
gpu, cgpu->total_mhashes / total_secs, |
|
|
|
gpu, cgpu->rolling, cgpu->total_mhashes / total_secs, |
|
|
|
cgpu->getworks, cgpu->accepted, cgpu->rejected, cgpu->hw_errors, |
|
|
|
cgpu->getworks, cgpu->accepted, cgpu->rejected, cgpu->hw_errors, |
|
|
|
cgpu->efficiency, cgpu->utility); |
|
|
|
cgpu->efficiency, cgpu->utility); |
|
|
|
else if (!gpu_devices[gpu]) |
|
|
|
wattroff(logwin, A_DIM); |
|
|
|
wprintw(statuswin, " GPU %d: [DISABLED / %.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]", |
|
|
|
|
|
|
|
gpu, cgpu->total_mhashes / total_secs, |
|
|
|
|
|
|
|
cgpu->getworks, cgpu->accepted, cgpu->rejected, cgpu->hw_errors, |
|
|
|
|
|
|
|
cgpu->efficiency, cgpu->utility); |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
wprintw(statuswin, " GPU %d: [%.1f / %.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]", |
|
|
|
|
|
|
|
gpu, cgpu->rolling, cgpu->total_mhashes / total_secs, |
|
|
|
|
|
|
|
cgpu->getworks, cgpu->accepted, cgpu->rejected, cgpu->hw_errors, |
|
|
|
|
|
|
|
cgpu->efficiency, cgpu->utility); |
|
|
|
wclrtoeol(statuswin); |
|
|
|
wclrtoeol(statuswin); |
|
|
|
} else if (thr_id >= gpu_threads) { |
|
|
|
} else if (thr_id >= gpu_threads) { |
|
|
|
int cpu = dev_from_id(thr_id); |
|
|
|
int cpu = dev_from_id(thr_id); |
|
|
@ -3422,16 +3430,11 @@ static void *watchdog_thread(void *userdata) |
|
|
|
/* Thread is waiting on getwork or disabled */ |
|
|
|
/* Thread is waiting on getwork or disabled */ |
|
|
|
if (thr->getwork || !gpu_devices[i] || !gpus[i].alive) |
|
|
|
if (thr->getwork || !gpu_devices[i] || !gpus[i].alive) |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
|
|
if (now.tv_sec - thr->last.tv_sec > 60) { |
|
|
|
if (now.tv_sec - thr->last.tv_sec > 60) { |
|
|
|
thr->rolling = thr->cgpu->rolling = 0; |
|
|
|
thr->rolling = thr->cgpu->rolling = 0; |
|
|
|
gpus[i].alive = false; |
|
|
|
gpus[i].alive = false; |
|
|
|
applog(LOG_ERR, "Attempting to restart thread %d, idle for more than 60 seconds", i); |
|
|
|
applog(LOG_ERR, "Thread %d idle for more than 60 seconds, GPU %d declared DEAD!", i, gpus[i]); |
|
|
|
reinit_device(thr->cgpu); |
|
|
|
|
|
|
|
/* Only initialise the device once since there
|
|
|
|
|
|
|
|
* will be multiple threads on the same device |
|
|
|
|
|
|
|
* and it will be declared !alive */ |
|
|
|
|
|
|
|
break; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|