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

Convert the decay_time function into one that truly creates an exponentially decaying average over opt_log_interval.

Browse Source
This commit is contained in:
Con Kolivas 2013-07-02 20:41:44 +10:00
parent 18422fbf7d
commit 42d96ee7fe
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cgminer.c
View File

@ -1879,24 +1879,15 @@ int dev_from_id(int thr_id)
return cgpu->device_id; return cgpu->device_id;
} }
/* Make the change in the recent value adjust dynamically when the difference /* Create an exponentially decaying average over the opt_log_interval */
* is large, but damp it when the values are closer together. This allows the void decay_time(double *f, double fadd, double fsecs)
* value to change quickly, but not fluctuate too dramatically when it has
* stabilised. */
void decay_time(double *f, double fadd)
{ {
double ratio = 0; double ftotal, fprop;
if (likely(*f > 0)) { fprop = 1.0 - 1 / (exp(fsecs / (double)opt_log_interval));
ratio = fadd / *f; ftotal = 1.0 + fprop;
if (ratio > 1) *f += (fadd * fprop);
ratio = 1 / ratio; *f /= ftotal;
}
if (ratio > 0.63)
*f = (fadd * 0.58 + *f) / 1.58;
else
*f = (fadd + *f * 0.58) / 1.58;
} }
static int __total_staged(void) static int __total_staged(void)
@ -4680,12 +4671,12 @@ static void hashmeter(int thr_id, struct timeval *diff,
thr_id, hashes_done, hashes_done / 1000 / secs); thr_id, hashes_done, hashes_done / 1000 / secs);
/* Rolling average for each thread and each device */ /* Rolling average for each thread and each device */
decay_time(&thr->rolling, local_mhashes / secs); decay_time(&thr->rolling, local_mhashes / secs, secs);
for (i = 0; i < cgpu->threads; i++) for (i = 0; i < cgpu->threads; i++)
thread_rolling += cgpu->thr[i]->rolling; thread_rolling += cgpu->thr[i]->rolling;
mutex_lock(&hash_lock); mutex_lock(&hash_lock);
decay_time(&cgpu->rolling, thread_rolling); decay_time(&cgpu->rolling, thread_rolling, secs);
cgpu->total_mhashes += local_mhashes; cgpu->total_mhashes += local_mhashes;
mutex_unlock(&hash_lock); mutex_unlock(&hash_lock);
@ -4726,7 +4717,7 @@ static void hashmeter(int thr_id, struct timeval *diff,
cgtime(&total_tv_end); cgtime(&total_tv_end);
local_secs = (double)total_diff.tv_sec + ((double)total_diff.tv_usec / 1000000.0); local_secs = (double)total_diff.tv_sec + ((double)total_diff.tv_usec / 1000000.0);
decay_time(&rolling, local_mhashes_done / local_secs); decay_time(&rolling, local_mhashes_done / local_secs, local_secs);
global_hashrate = roundl(rolling) * 1000000; global_hashrate = roundl(rolling) * 1000000;
timersub(&total_tv_end, &total_tv_start, &total_diff); timersub(&total_tv_end, &total_tv_start, &total_diff);