GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-02 18:14:20 +00:00
Code Issues Releases Wiki Activity

Don't take more than one lock at a time.

Browse Source
This commit is contained in:
Con Kolivas 2011-07-27 10:36:16 +10:00
parent 98f609b5be
commit 324dd93bb7
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
main.c
View File

@ -1997,6 +1997,7 @@ static void hashmeter(int thr_id, struct timeval *diff,
static double rolling = 0; static double rolling = 0;
double local_mhashes = (double)hashes_done / 1000000.0; double local_mhashes = (double)hashes_done / 1000000.0;
struct cgpu_info *cgpu = thr_info[thr_id].cgpu; struct cgpu_info *cgpu = thr_info[thr_id].cgpu;
bool showlog = false;
/* Update the last time this thread reported in */ /* Update the last time this thread reported in */
if (thr_id >= 0) if (thr_id >= 0)
@ -2040,6 +2041,7 @@ static void hashmeter(int thr_id, struct timeval *diff,
if (total_diff.tv_sec < opt_log_interval) if (total_diff.tv_sec < opt_log_interval)
/* Only update the total every opt_log_interval seconds */ /* Only update the total every opt_log_interval seconds */
goto out_unlock; goto out_unlock;
showlog = true;
gettimeofday(&total_tv_end, NULL); gettimeofday(&total_tv_end, NULL);
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);
@ -2055,15 +2057,16 @@ static void hashmeter(int thr_id, struct timeval *diff,
sprintf(statusline, "[(%ds):%.1f (avg):%.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]", 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, total_mhashes_done / total_secs, opt_log_interval, rolling, total_mhashes_done / total_secs,
total_getworks, total_accepted, total_rejected, hw_errors, efficiency, utility); total_getworks, total_accepted, total_rejected, hw_errors, efficiency, utility);
if (!curses_active) {
printf("%s \r", statusline);
fflush(stdout);
} else
applog(LOG_INFO, "%s", statusline);
local_mhashes_done = 0; local_mhashes_done = 0;
out_unlock: out_unlock:
mutex_unlock(&hash_lock); mutex_unlock(&hash_lock);
if (showlog) {
if (!curses_active) {
printf("%s \r", statusline);
fflush(stdout);
} else
applog(LOG_INFO, "%s", statusline);
}
} }
/* This is overkill, but at least we'll know accurately how much work is /* This is overkill, but at least we'll know accurately how much work is