GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-05 11:34:16 +00:00
Code Issues Releases Wiki Activity

Make the rolling log-second average more accurate.

Browse Source
This commit is contained in:
Con Kolivas 2011-07-26 10:45:52 +10:00
parent 7707ed4db1
commit ce6af96821
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.c
View File

@ -1987,7 +1987,7 @@ static void hashmeter(int thr_id, struct timeval *diff,
double local_secs;
double utility, efficiency = 0.0;
static double local_mhashes_done = 0;
static double rolling_local = 0;
static double rolling = 0;
double local_mhashes = (double)hashes_done / 1000000.0;
struct cgpu_info *cgpu = thr_info[thr_id].cgpu;
@ -2015,7 +2015,6 @@ static void hashmeter(int thr_id, struct timeval *diff,
pthread_mutex_lock(&hash_lock);
gettimeofday(&temp_tv_end, NULL);
timeval_subtract(&total_diff, &temp_tv_end, &total_tv_end);
local_secs = (double)total_diff.tv_sec + ((double)total_diff.tv_usec / 1000000.0);
total_mhashes_done += local_mhashes;
local_mhashes_done += local_mhashes;
@ -2024,8 +2023,9 @@ static void hashmeter(int thr_id, struct timeval *diff,
goto out_unlock;
gettimeofday(&total_tv_end, NULL);
local_secs = (double)total_diff.tv_sec + ((double)total_diff.tv_usec / 1000000.0);
/* Use a rolling average by faking an exponential decay over 5 * log */
rolling_local = ((rolling_local * 0.9) + local_mhashes_done) / 1.9;
rolling = ((rolling * 0.9) + (local_mhashes_done / local_secs)) / 1.9;
timeval_subtract(&total_diff, &total_tv_end, &total_tv_start);
total_secs = (double)total_diff.tv_sec +
@ -2035,7 +2035,7 @@ static void hashmeter(int thr_id, struct timeval *diff,
efficiency = total_getworks ? total_accepted * 100.0 / total_getworks : 0.0;
sprintf(statusline, "[(%ds):%.1f (avg):%.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]",
opt_log_interval, rolling_local / local_secs, total_mhashes_done / total_secs,
opt_log_interval, rolling, total_mhashes_done / total_secs,
total_getworks, total_accepted, total_rejected, hw_errors, efficiency, utility);
if (!curses_active) {
printf("%s \r", statusline);