GOSTSec
/
sgminer
mirror of https://github.com/GOSTSec/sgminer
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Do away with the increasingly confusing and irrelevant total queued and efficiency measures per device.

nfactor-troky
Con Kolivas 13 years ago
parent
2fafdab985
commit
1917643dd0
2 changed files with 29 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 67
      main.c
  2. 2
      miner.h

67
main.c
Unescape View File

@ -1809,18 +1809,18 @@ static void text_print_status(int thr_id)
if (cgpu->has_adl) { if (cgpu->has_adl) {
int gpu = cgpu->cpu_gpu; int gpu = cgpu->cpu_gpu;
printf("GPU %d: [%.1f ] [%.1f/%.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]\n", printf("GPU %d: [%.1f ] [%.1f/%.1f Mh/s] [A:%d R:%d HW:%d U:%.2f/m]\n",
cgpu->cpu_gpu, gpu_temp(gpu), cgpu->rolling, cgpu->cpu_gpu, gpu_temp(gpu), cgpu->rolling,
cgpu->total_mhashes / total_secs, cgpu->getworks, cgpu->total_mhashes / total_secs,
cgpu->accepted, cgpu->rejected, cgpu->hw_errors, cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
cgpu->efficiency, cgpu->utility); cgpu->utility);
} else } else
#endif #endif
printf(" %sPU %d: [%.1f / %.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]\n", printf(" %sPU %d: [%.1f / %.1f Mh/s] [A:%d R:%d HW:%d U:%.2f/m]\n",
cgpu->is_gpu ? "G" : "C", cgpu->cpu_gpu, cgpu->rolling, cgpu->is_gpu ? "G" : "C", cgpu->cpu_gpu, cgpu->rolling,
cgpu->total_mhashes / total_secs, cgpu->getworks, cgpu->total_mhashes / total_secs,
cgpu->accepted, cgpu->rejected, cgpu->hw_errors, cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
cgpu->efficiency, cgpu->utility); cgpu->utility);
} }
/* Must be called with curses mutex lock held and curses_active */ /* Must be called with curses mutex lock held and curses_active */
@ -1863,7 +1863,6 @@ static void curses_print_devstatus(int thr_id)
struct cgpu_info *cgpu = &gpus[gpu]; struct cgpu_info *cgpu = &gpus[gpu];
cgpu->utility = cgpu->accepted / ( total_secs ? total_secs : 1 ) * 60; cgpu->utility = cgpu->accepted / ( total_secs ? total_secs : 1 ) * 60;
cgpu->efficiency = cgpu->getworks ? cgpu->accepted * 100.0 / cgpu->getworks : 0.0;
mvwprintw(statuswin, gpucursor + gpu, 0, " GPU %d: ", gpu); mvwprintw(statuswin, gpucursor + gpu, 0, " GPU %d: ", gpu);
#ifdef HAVE_ADL #ifdef HAVE_ADL
@ -1878,22 +1877,21 @@ static void curses_print_devstatus(int thr_id)
wprintw(statuswin, "DISABLED "); wprintw(statuswin, "DISABLED ");
else else
wprintw(statuswin, "%.1f", cgpu->rolling); wprintw(statuswin, "%.1f", cgpu->rolling);
wprintw(statuswin, "/%.1fMh/s | Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m", wprintw(statuswin, "/%.1fMh/s | A:%d R:%d HW:%d U:%.2f/m",
cgpu->total_mhashes / total_secs, cgpu->total_mhashes / total_secs,
cgpu->getworks, cgpu->accepted, cgpu->rejected, cgpu->hw_errors, cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
cgpu->efficiency, cgpu->utility); 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);
struct cgpu_info *cgpu = &cpus[cpu]; struct cgpu_info *cgpu = &cpus[cpu];
cgpu->utility = cgpu->accepted / ( total_secs ? total_secs : 1 ) * 60; cgpu->utility = cgpu->accepted / ( total_secs ? total_secs : 1 ) * 60;
cgpu->efficiency = cgpu->getworks ? cgpu->accepted * 100.0 / cgpu->getworks : 0.0;
mvwprintw(statuswin, cpucursor + cpu, 0, " CPU %d: %.2f/%.2fMh/s | Q:%d A:%d R:%d E:%.0f%% U:%.2f/m", mvwprintw(statuswin, cpucursor + cpu, 0, " CPU %d: %.2f/%.2fMh/s | A:%d R:%d U:%.2f/m",
cpu, cgpu->rolling, cgpu->total_mhashes / total_secs, cpu, cgpu->rolling, cgpu->total_mhashes / total_secs,
cgpu->getworks, cgpu->accepted, cgpu->rejected, cgpu->accepted, cgpu->rejected,
cgpu->efficiency, cgpu->utility); cgpu->utility);
wclrtoeol(statuswin); wclrtoeol(statuswin);
} }
wnoutrefresh(statuswin); wnoutrefresh(statuswin);
@ -2058,7 +2056,6 @@ static bool submit_upstream_work(const struct work *work)
} }
cgpu->utility = cgpu->accepted / ( total_secs ? total_secs : 1 ) * 60; cgpu->utility = cgpu->accepted / ( total_secs ? total_secs : 1 ) * 60;
cgpu->efficiency = cgpu->getworks ? cgpu->accepted * 100.0 / cgpu->getworks : 0.0;
if (!opt_realquiet) if (!opt_realquiet)
print_status(thr_id); print_status(thr_id);
@ -2067,14 +2064,14 @@ static bool submit_upstream_work(const struct work *work)
if (cgpu->has_adl) { if (cgpu->has_adl) {
int gpu = cgpu->cpu_gpu; int gpu = cgpu->cpu_gpu;
applog(LOG_INFO, "GPU %d %.1fC Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m", applog(LOG_INFO, "GPU %d %.1fC A:%d R:%d HW:%d U:%.2f/m",
gpu, gpu_temp(gpu), cgpu->getworks, cgpu->accepted, gpu, gpu_temp(gpu), cgpu->accepted,
cgpu->rejected, cgpu->hw_errors, cgpu->efficiency, cgpu->utility); cgpu->rejected, cgpu->hw_errors, cgpu->utility);
} else } else
#endif #endif
applog(LOG_INFO, "%sPU %d Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m", applog(LOG_INFO, "%sPU %d A:%d R:%d HW:%d U:%.2f/m",
cgpu->is_gpu? "G" : "C", cgpu->cpu_gpu, cgpu->getworks, cgpu->accepted, cgpu->is_gpu? "G" : "C", cgpu->cpu_gpu, cgpu->accepted,
cgpu->rejected, cgpu->hw_errors, cgpu->efficiency, cgpu->utility); cgpu->rejected, cgpu->hw_errors, cgpu->utility);
} }
json_decref(val); json_decref(val);
@ -2151,8 +2148,6 @@ retry:
work->pool = pool; work->pool = pool;
total_getworks++; total_getworks++;
pool->getwork_requested++; pool->getwork_requested++;
if (work->thr)
work->thr->cgpu->getworks++;
json_decref(val); json_decref(val);
out: out:
@ -3092,10 +3087,10 @@ retry:
for (gpu = 0; gpu < nDevs; gpu++) { for (gpu = 0; gpu < nDevs; gpu++) {
struct cgpu_info *cgpu = &gpus[gpu]; struct cgpu_info *cgpu = &gpus[gpu];
wlog("GPU %d: [%.1f / %.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]\n", wlog("GPU %d: [%.1f / %.1f Mh/s] [A:%d R:%d HW:%d U:%.2f/m]\n",
gpu, cgpu->rolling, cgpu->total_mhashes / total_secs, gpu, cgpu->rolling, cgpu->total_mhashes / total_secs,
cgpu->getworks, cgpu->accepted, cgpu->rejected, cgpu->hw_errors, cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
cgpu->efficiency, cgpu->utility); cgpu->utility);
#ifdef HAVE_ADL #ifdef HAVE_ADL
if (gpus[gpu].has_adl) { if (gpus[gpu].has_adl) {
int engineclock = 0, memclock = 0, activity = 0, fanspeed = 0, fanpercent = 0, powertune = 0; int engineclock = 0, memclock = 0, activity = 0, fanspeed = 0, fanpercent = 0, powertune = 0;
@ -3338,34 +3333,30 @@ static void hashmeter(int thr_id, struct timeval *diff,
sprintf( sprintf(
statusline, statusline,
"[GPU%d %.1f C (%ds):%.1f (avg):%.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]", "[GPU%d %.1f C (%ds):%.1f (avg):%.1f Mh/s] [A:%d R:%d HW:%d U:%.2f/m]",
cgpu->cpu_gpu, cgpu->cpu_gpu,
gpu_temp(gpu), gpu_temp(gpu),
opt_log_interval, opt_log_interval,
cgpu->rolling, cgpu->rolling,
cgpu->total_mhashes / total_secs, cgpu->total_mhashes / total_secs,
cgpu->getworks,
cgpu->accepted, cgpu->accepted,
cgpu->rejected, cgpu->rejected,
cgpu->hw_errors, cgpu->hw_errors,
cgpu->efficiency,
cgpu->utility cgpu->utility
); );
} else } else
#endif #endif
sprintf( sprintf(
statusline, statusline,
"[%sPU%d (%ds):%.1f (avg):%.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]", "[%sPU%d (%ds):%.1f (avg):%.1f Mh/s] [A:%d R:%d HW:%d U:%.2f/m]",
cgpu->is_gpu ? "G" : "C", cgpu->is_gpu ? "G" : "C",
cgpu->cpu_gpu, cgpu->cpu_gpu,
opt_log_interval, opt_log_interval,
cgpu->rolling, cgpu->rolling,
cgpu->total_mhashes / total_secs, cgpu->total_mhashes / total_secs,
cgpu->getworks,
cgpu->accepted, cgpu->accepted,
cgpu->rejected, cgpu->rejected,
cgpu->hw_errors, cgpu->hw_errors,
cgpu->efficiency,
cgpu->utility cgpu->utility
); );
@ -4765,18 +4756,18 @@ static void log_print_status(int thr_id)
if (cgpu->has_adl) { if (cgpu->has_adl) {
int gpu = cgpu->cpu_gpu; int gpu = cgpu->cpu_gpu;
applog(LOG_WARNING, " GPU %d: [%.1f C] [%.1f/%.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]", applog(LOG_WARNING, " GPU %d: [%.1f C] [%.1f/%.1f Mh/s] [A:%d R:%d HW:%d U:%.2f/m]",
gpu, gpu_temp(gpu), cgpu->rolling, gpu, gpu_temp(gpu), cgpu->rolling,
cgpu->total_mhashes / total_secs, cgpu->getworks, cgpu->total_mhashes / total_secs,
cgpu->accepted, cgpu->rejected, cgpu->hw_errors, cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
cgpu->efficiency, cgpu->utility); cgpu->utility);
} else } else
#endif #endif
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] [A:%d R:%d HW:%d U:%.2f/m]",
cgpu->is_gpu ? "G" : "C", cgpu->cpu_gpu, cgpu->rolling, cgpu->is_gpu ? "G" : "C", cgpu->cpu_gpu, cgpu->rolling,
cgpu->total_mhashes / total_secs, cgpu->getworks, cgpu->total_mhashes / total_secs,
cgpu->accepted, cgpu->rejected, cgpu->hw_errors, cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
cgpu->efficiency, cgpu->utility); cgpu->utility);
} }
static void print_summary(void) static void print_summary(void)

2
miner.h
Unescape View File

@ -194,8 +194,6 @@ struct cgpu_info {
int hw_errors; int hw_errors;
double rolling; double rolling;
double total_mhashes; double total_mhashes;
unsigned int getworks;
double efficiency;
double utility; double utility;
enum alive status; enum alive status;
char init[40]; char init[40];

Write Preview
Loading…
Cancel
Save