|
|
@@ -1434,7 +1434,7 @@ static int pool_staged(struct pool *pool)
|
|
|
#ifdef HAVE_CURSES
|
|
|
WINDOW *mainwin, *statuswin, *logwin;
|
|
|
#endif
|
|
|
-double total_secs = 0.1;
|
|
|
+double total_secs = 1.0;
|
|
|
static char statusline[256];
|
|
|
/* logstart is where the log window should start */
|
|
|
static int devcursor, logstart, logcursor;
|
|
|
@@ -1693,8 +1693,8 @@ static void curses_print_devstatus(int thr_id)
|
|
|
if (ypos >= statusy - 1)
|
|
|
return;
|
|
|
|
|
|
- cgpu->utility = cgpu->accepted / ( total_secs ? total_secs : 1 ) * 60;
|
|
|
- cgpu->utility_diff1 = cgpu->accepted_weighed / ( total_secs ?: 1 ) * 60;
|
|
|
+ cgpu->utility = cgpu->accepted / total_secs * 60;
|
|
|
+ cgpu->utility_diff1 = cgpu->accepted_weighed / total_secs * 60;
|
|
|
|
|
|
if (wmove(statuswin, ypos, 0) == ERR)
|
|
|
return;
|
|
|
@@ -2069,7 +2069,7 @@ static bool submit_upstream_work(const struct work *work, CURL *curl, bool resub
|
|
|
* be stale due to networking delays.
|
|
|
*/
|
|
|
if (pool->seq_rejects > 10 && !work->stale && opt_disable_pool && enabled_pools > 1) {
|
|
|
- double utility = total_accepted / ( total_secs ? total_secs : 1 ) * 60;
|
|
|
+ double utility = total_accepted / total_secs * 60;
|
|
|
|
|
|
if (pool->seq_rejects > utility * 3) {
|
|
|
applog(LOG_WARNING, "Pool %d rejected %d sequential shares, disabling!",
|
|
|
@@ -2082,8 +2082,8 @@ static bool submit_upstream_work(const struct work *work, CURL *curl, bool resub
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- cgpu->utility = cgpu->accepted / ( total_secs ? total_secs : 1 ) * 60;
|
|
|
- cgpu->utility_diff1 = cgpu->accepted_weighed / ( total_secs ?: 1 ) * 60;
|
|
|
+ cgpu->utility = cgpu->accepted / total_secs * 60;
|
|
|
+ cgpu->utility_diff1 = cgpu->accepted_weighed / total_secs * 60;
|
|
|
|
|
|
if (!opt_realquiet)
|
|
|
print_status(thr_id);
|
|
|
@@ -4094,7 +4094,7 @@ static void hashmeter(int thr_id, struct timeval *diff,
|
|
|
total_secs = (double)total_diff.tv_sec +
|
|
|
((double)total_diff.tv_usec / 1000000.0);
|
|
|
|
|
|
- utility = total_accepted / ( total_secs ? total_secs : 1 ) * 60;
|
|
|
+ utility = total_accepted / total_secs * 60;
|
|
|
efficiency = total_getworks ? total_accepted * 100.0 / total_getworks : 0.0;
|
|
|
|
|
|
ti_hashrate_bufstr(
|
|
|
@@ -5347,7 +5347,7 @@ static void print_summary(void)
|
|
|
mins = (diff.tv_sec % 3600) / 60;
|
|
|
secs = diff.tv_sec % 60;
|
|
|
|
|
|
- utility = total_accepted / ( total_secs ? total_secs : 1 ) * 60;
|
|
|
+ utility = total_accepted / total_secs * 60;
|
|
|
efficiency = total_getworks ? total_accepted * 100.0 / total_getworks : 0.0;
|
|
|
|
|
|
applog(LOG_WARNING, "\nSummary of runtime statistics:\n");
|
|
|
@@ -5359,8 +5359,7 @@ static void print_summary(void)
|
|
|
applog(LOG_WARNING, "CPU hasher algorithm used: %s", algo_names[opt_algo]);
|
|
|
#endif
|
|
|
applog(LOG_WARNING, "Runtime: %d hrs : %d mins : %d secs", hours, mins, secs);
|
|
|
- if (total_secs)
|
|
|
- applog(LOG_WARNING, "Average hashrate: %.1f Megahash/s", total_mhashes_done / total_secs);
|
|
|
+ applog(LOG_WARNING, "Average hashrate: %.1f Megahash/s", total_mhashes_done / total_secs);
|
|
|
applog(LOG_WARNING, "Solved blocks: %d", found_blocks);
|
|
|
applog(LOG_WARNING, "Queued work requests: %d", total_getworks);
|
|
|
applog(LOG_WARNING, "Share submissions: %d", total_accepted + total_rejected);
|
Luke Dashjr