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

We now are guaranteed to have one fresh work item after a block change and we should only discard staged requests.

Browse Source
This commit is contained in:
Con Kolivas 2011-07-18 10:33:31 +10:00
parent d53ee8e71b
commit fc184625d2
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
main.c
View File

@ -1218,45 +1218,37 @@ static bool queue_request(void)
return true; return true;
} }
static bool discard_request(void) static void discard_staged(void)
{ {
struct work *work_heap; struct work *work_heap;
/* Just in case we fell in a hole and missed a queue filling */ /* Just in case we fell in a hole and missed a queue filling */
if (unlikely(!requests_queued())) { if (unlikely(!requests_staged()))
applog(LOG_WARNING, "Tried to discard_request with nil queued"); return;
return true;
}
work_heap = tq_pop(getq, NULL); work_heap = tq_pop(getq, NULL);
if (unlikely(!work_heap)) { if (unlikely(!work_heap))
applog(LOG_ERR, "Failed to tq_pop in discard_request"); return;
return false;
}
free(work_heap); free(work_heap);
dec_queued(); dec_queued();
discarded_work++; discarded_work++;
return true;
} }
static void flush_requests(bool longpoll) static void flush_requests(bool longpoll)
{ {
int i, extra; int i, stale;
extra = requests_queued(); /* We should have one fresh work item staged from the block change. */
/* When flushing from longpoll, we don't know the new work yet. When stale = requests_staged() - 1;
* not flushing from longpoll, the first work item is valid so do not
* discard it */
if (longpoll) if (longpoll)
memcpy(current_block, blank, 36); memcpy(current_block, blank, 36);
else
extra--;
/* Temporarily increase the staged count so that get_work thinks there /* Temporarily increase the staged count so that get_work thinks there
* is work available instead of making threads reuse existing work */ * is work available instead of making threads reuse existing work */
inc_staged(mining_threads, true); inc_staged(mining_threads, true);
for (i = 0; i < extra; 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())) { if (unlikely(!queue_request())) {
applog(LOG_ERR, "Failed to queue requests in flush_requests"); applog(LOG_ERR, "Failed to queue requests in flush_requests");
@ -1265,11 +1257,7 @@ static void flush_requests(bool longpoll)
} }
/* Pop off the old requests. Cancelling the requests would be better /* Pop off the old requests. Cancelling the requests would be better
* but is tricky */ * but is tricky */
if (unlikely(!discard_request())) { discard_staged();
applog(LOG_ERR, "Failed to discard requests in flush_requests");
kill_work();
break;
}
} }
} }