Commit 1917643dd0df00188c950fa1498fe651b7065956
2011-09-09T10:19:01
Do away with the increasingly confusing and irrelevant total queued and efficiency measures per device.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193
diff --git a/main.c b/main.c
index 6e236a8..feb093d 100644
--- a/main.c
+++ b/main.c
@@ -1809,18 +1809,18 @@ static void text_print_status(int thr_id)
if (cgpu->has_adl) {
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->total_mhashes / total_secs, cgpu->getworks,
+ cgpu->total_mhashes / total_secs,
cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
- cgpu->efficiency, cgpu->utility);
+ cgpu->utility);
} else
#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->total_mhashes / total_secs, cgpu->getworks,
+ cgpu->total_mhashes / total_secs,
cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
- cgpu->efficiency, cgpu->utility);
+ cgpu->utility);
}
/* 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];
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);
#ifdef HAVE_ADL
@@ -1878,22 +1877,21 @@ static void curses_print_devstatus(int thr_id)
wprintw(statuswin, "DISABLED ");
else
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->getworks, cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
- cgpu->efficiency, cgpu->utility);
+ cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
+ cgpu->utility);
wclrtoeol(statuswin);
} else if (thr_id >= gpu_threads) {
int cpu = dev_from_id(thr_id);
struct cgpu_info *cgpu = &cpus[cpu];
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,
- cgpu->getworks, cgpu->accepted, cgpu->rejected,
- cgpu->efficiency, cgpu->utility);
+ cgpu->accepted, cgpu->rejected,
+ cgpu->utility);
wclrtoeol(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->efficiency = cgpu->getworks ? cgpu->accepted * 100.0 / cgpu->getworks : 0.0;
if (!opt_realquiet)
print_status(thr_id);
@@ -2067,14 +2064,14 @@ static bool submit_upstream_work(const struct work *work)
if (cgpu->has_adl) {
int gpu = cgpu->cpu_gpu;
- applog(LOG_INFO, "GPU %d %.1fC Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m",
- gpu, gpu_temp(gpu), cgpu->getworks, cgpu->accepted,
- cgpu->rejected, cgpu->hw_errors, cgpu->efficiency, cgpu->utility);
+ applog(LOG_INFO, "GPU %d %.1fC A:%d R:%d HW:%d U:%.2f/m",
+ gpu, gpu_temp(gpu), cgpu->accepted,
+ cgpu->rejected, cgpu->hw_errors, cgpu->utility);
} else
#endif
- applog(LOG_INFO, "%sPU %d Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m",
- cgpu->is_gpu? "G" : "C", cgpu->cpu_gpu, cgpu->getworks, cgpu->accepted,
- cgpu->rejected, cgpu->hw_errors, cgpu->efficiency, cgpu->utility);
+ applog(LOG_INFO, "%sPU %d A:%d R:%d HW:%d U:%.2f/m",
+ cgpu->is_gpu? "G" : "C", cgpu->cpu_gpu, cgpu->accepted,
+ cgpu->rejected, cgpu->hw_errors, cgpu->utility);
}
json_decref(val);
@@ -2151,8 +2148,6 @@ retry:
work->pool = pool;
total_getworks++;
pool->getwork_requested++;
- if (work->thr)
- work->thr->cgpu->getworks++;
json_decref(val);
out:
@@ -3092,10 +3087,10 @@ retry:
for (gpu = 0; gpu < nDevs; 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,
- cgpu->getworks, cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
- cgpu->efficiency, cgpu->utility);
+ cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
+ cgpu->utility);
#ifdef HAVE_ADL
if (gpus[gpu].has_adl) {
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(
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,
gpu_temp(gpu),
opt_log_interval,
cgpu->rolling,
cgpu->total_mhashes / total_secs,
- cgpu->getworks,
cgpu->accepted,
cgpu->rejected,
cgpu->hw_errors,
- cgpu->efficiency,
cgpu->utility
);
} else
#endif
sprintf(
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->cpu_gpu,
opt_log_interval,
cgpu->rolling,
cgpu->total_mhashes / total_secs,
- cgpu->getworks,
cgpu->accepted,
cgpu->rejected,
cgpu->hw_errors,
- cgpu->efficiency,
cgpu->utility
);
@@ -4765,18 +4756,18 @@ static void log_print_status(int thr_id)
if (cgpu->has_adl) {
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,
- cgpu->total_mhashes / total_secs, cgpu->getworks,
+ cgpu->total_mhashes / total_secs,
cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
- cgpu->efficiency, cgpu->utility);
+ cgpu->utility);
} else
#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->total_mhashes / total_secs, cgpu->getworks,
+ cgpu->total_mhashes / total_secs,
cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
- cgpu->efficiency, cgpu->utility);
+ cgpu->utility);
}
static void print_summary(void)
diff --git a/miner.h b/miner.h
index 378f004..0bd78b4 100644
--- a/miner.h
+++ b/miner.h
@@ -194,8 +194,6 @@ struct cgpu_info {
int hw_errors;
double rolling;
double total_mhashes;
- unsigned int getworks;
- double efficiency;
double utility;
enum alive status;
char init[40];