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

Only consider a pool lagging if we actually need the work and we have none staged despite queue requests stacking up.

Browse Source
This commit is contained in:
Con Kolivas 2011-08-12 20:34:51 +10:00
parent a466942fd8
commit 17e5e17e88
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main.c
View File

@ -2302,7 +2302,7 @@ static void pool_resus(struct pool *pool)
switch_pools(NULL); switch_pools(NULL);
} }
static bool queue_request(struct thr_info *thr) static bool queue_request(struct thr_info *thr, bool needed)
{ {
int maxq = opt_queue + mining_threads; int maxq = opt_queue + mining_threads;
struct workio_cmd *wc; struct workio_cmd *wc;
@ -2332,7 +2332,7 @@ static bool queue_request(struct thr_info *thr)
/* If we're queueing work faster than we can stage it, consider the /* If we're queueing work faster than we can stage it, consider the
* system lagging and allow work to be gathered from another pool if * system lagging and allow work to be gathered from another pool if
* possible */ * possible */
if (rq > rs) if (!rs && rq && needed)
wc->lagging = true; wc->lagging = true;
if (opt_debug) if (opt_debug)
@ -2399,7 +2399,7 @@ static void flush_requests(void)
for (i = 0; i < stale; i++) { for (i = 0; i < stale; i++) {
/* Queue a whole batch of new requests */ /* Queue a whole batch of new requests */
if (unlikely(!queue_request(NULL))) { if (unlikely(!queue_request(NULL, true))) {
applog(LOG_ERR, "Failed to queue requests in flush_requests"); applog(LOG_ERR, "Failed to queue requests in flush_requests");
kill_work(); kill_work();
break; break;
@ -2481,7 +2481,7 @@ static bool get_work(struct work *work, bool requested, struct thr_info *thr,
thread_reportout(thr); thread_reportout(thr);
retry: retry:
pool = current_pool(); pool = current_pool();
if (unlikely(!requested && !queue_request(thr))) { if (unlikely(!requested && !queue_request(thr, true))) {
applog(LOG_WARNING, "Failed to queue_request in get_work"); applog(LOG_WARNING, "Failed to queue_request in get_work");
goto out; goto out;
} }
@ -2824,7 +2824,7 @@ static void *miner_thread(void *userdata)
timeval_subtract(&diff, &tv_end, &tv_workstart); timeval_subtract(&diff, &tv_end, &tv_workstart);
if (!requested && (diff.tv_sec >= request_interval)) { if (!requested && (diff.tv_sec >= request_interval)) {
thread_reportout(mythr); thread_reportout(mythr);
if (unlikely(!queue_request(mythr))) { if (unlikely(!queue_request(mythr, false))) {
applog(LOG_ERR, "Failed to queue_request in miner_thread %d", thr_id); applog(LOG_ERR, "Failed to queue_request in miner_thread %d", thr_id);
goto out; goto out;
} }
@ -3133,7 +3133,7 @@ static void *gpuminer_thread(void *userdata)
#endif #endif
if (diff.tv_sec > request_interval || work->blk.nonce > request_nonce) { if (diff.tv_sec > request_interval || work->blk.nonce > request_nonce) {
thread_reportout(mythr); thread_reportout(mythr);
if (unlikely(!queue_request(mythr))) { if (unlikely(!queue_request(mythr, false))) {
applog(LOG_ERR, "Failed to queue_request in gpuminer_thread %d", thr_id); applog(LOG_ERR, "Failed to queue_request in gpuminer_thread %d", thr_id);
goto out; goto out;
} }
@ -3506,7 +3506,7 @@ static void *watchdog_thread(void *userdata)
sleep(interval); sleep(interval);
if (requests_queued() < opt_queue) if (requests_queued() < opt_queue)
queue_request(NULL); queue_request(NULL, false);
hashmeter(-1, &zero_tv, 0); hashmeter(-1, &zero_tv, 0);