1
0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-11 15:27:53 +00:00

Suppress correct log output when display per-device status.

This commit is contained in:
Con Kolivas 2011-08-18 23:07:30 +10:00
parent 4beade3772
commit a754cc3f0c

11
main.c
View File

@ -1553,9 +1553,10 @@ static bool submit_upstream_work(const struct work *work)
if (!opt_realquiet) if (!opt_realquiet)
print_status(thr_id); print_status(thr_id);
applog(LOG_INFO, "%sPU %d Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m", if (!want_per_device_stats)
cgpu->is_gpu? "G" : "C", cgpu->cpu_gpu, cgpu->getworks, cgpu->accepted, applog(LOG_INFO, "%sPU %d Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m",
cgpu->rejected, cgpu->hw_errors, cgpu->efficiency, cgpu->utility); cgpu->is_gpu? "G" : "C", cgpu->cpu_gpu, cgpu->getworks, cgpu->accepted,
cgpu->rejected, cgpu->hw_errors, cgpu->efficiency, cgpu->utility);
json_decref(val); json_decref(val);
@ -4151,10 +4152,6 @@ static void log_print_status(int thr_id)
{ {
struct cgpu_info *cgpu; struct cgpu_info *cgpu;
/* This will be displayed anyway */
if (want_per_device_stats)
return;
cgpu = thr_info[thr_id].cgpu; cgpu = thr_info[thr_id].cgpu;
applog(LOG_WARNING, " %sPU %d: [%.1f / %.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]", applog(LOG_WARNING, " %sPU %d: [%.1f / %.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]",
cgpu->is_gpu ? "G" : "C", cgpu->cpu_gpu, cgpu->rolling, cgpu->is_gpu ? "G" : "C", cgpu->cpu_gpu, cgpu->rolling,