GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-23 04:54:26 +00:00
Code Issues Releases Wiki Activity

Since all the counts use the same mutex, grab it only once.

Browse Source
This commit is contained in:
Con Kolivas 2012-08-11 16:11:53 +10:00
parent 4f9394be81
commit c0aaf56a8d
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cgminer.c
View File

@ -1333,24 +1333,34 @@ void decay_time(double *f, double fadd)
*f = (fadd + *f * 0.58) / 1.58; *f = (fadd + *f * 0.58) / 1.58;
} }
static int __total_staged(void)
{
return HASH_COUNT(staged_work);
}
static int total_staged(void) static int total_staged(void)
{ {
int ret; int ret;
mutex_lock(stgd_lock); mutex_lock(stgd_lock);
ret = HASH_COUNT(staged_work); ret = __total_staged();
mutex_unlock(stgd_lock); mutex_unlock(stgd_lock);
return ret; return ret;
} }
/* We count the total_queued as pending staged as these are requests in flight /* We count the total_queued as pending staged as these are requests in flight
* one way or another which have not yet staged a work item but will */ * one way or another which have not yet staged a work item but will */
static int __pending_staged(void)
{
return HASH_COUNT(staged_work) + total_queued;
}
static int pending_staged(void) static int pending_staged(void)
{ {
int ret; int ret;
mutex_lock(stgd_lock); mutex_lock(stgd_lock);
ret = HASH_COUNT(staged_work) + total_queued; ret = __pending_staged();
mutex_unlock(stgd_lock); mutex_unlock(stgd_lock);
return ret; return ret;
} }
@ -2223,11 +2233,9 @@ static void push_curl_entry(struct curl_ent *ce, struct pool *pool)
/* 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
* queued to prevent ever being left without work */ * queued to prevent ever being left without work */
static void inc_queued(void) static void __inc_queued(void)
{ {
mutex_lock(stgd_lock);
total_queued++; total_queued++;
mutex_unlock(stgd_lock);
} }
static void __dec_queued(void) static void __dec_queued(void)
@ -3791,12 +3799,14 @@ bool queue_request(struct thr_info *thr, bool needed)
bool lag, ret, qing; bool lag, ret, qing;
int ps, ts, maxq; int ps, ts, maxq;
inc_queued();
maxq = opt_queue + mining_threads; maxq = opt_queue + mining_threads;
lag = ret = qing = false; lag = ret = qing = false;
ps = pending_staged();
ts = total_staged(); mutex_lock(stgd_lock);
__inc_queued();
ps = __pending_staged();
ts = __total_staged();
mutex_unlock(stgd_lock);
if (ps >= maxq) { if (ps >= maxq) {
ret = true; ret = true;