GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-09-14 15:11:56 +00:00
Code Issues Releases Wiki Activity

Abstract out the test for stale work and test for it in the actual mining threads as well.

Browse Source
This commit is contained in:
Con Kolivas 2011-07-16 00:34:05 +10:00
parent 6dcf05ffaf
commit 4a94199246
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
main.c
View File

@ -865,36 +865,48 @@ static bool workio_get_work(struct workio_cmd *wc)
return true; return true;
} }
static bool stale_work(struct work *work)
{
bool ret = false;
char *hexstr;
hexstr = bin2hex(work->data, 36);
if (unlikely(!hexstr)) {
applog(LOG_ERR, "submit_work_thread OOM");
return false;
}
if (strncmp(hexstr, current_block, 36))
ret = true;
free(hexstr);
return ret;
}
static void *submit_work_thread(void *userdata) static void *submit_work_thread(void *userdata)
{ {
struct workio_cmd *wc = (struct workio_cmd *)userdata; struct workio_cmd *wc = (struct workio_cmd *)userdata;
int failures = 0; int failures = 0;
char *hexstr;
pthread_detach(pthread_self()); pthread_detach(pthread_self());
hexstr = bin2hex(wc->u.work->data, 36); if (stale_work(wc->u.work)) {
if (unlikely(!hexstr)) { applog(LOG_WARNING, "Stale share detected, discarding");
applog(LOG_ERR, "submit_work_thread OOM");
goto out;
}
if (unlikely(strncmp(hexstr, current_block, 36))) {
applog(LOG_WARNING, "Stale work detected, discarding");
stale_shares++; stale_shares++;
goto out_free; goto out;
} }
/* submit solution to bitcoin via JSON-RPC */ /* submit solution to bitcoin via JSON-RPC */
while (!submit_upstream_work(wc->u.work)) { while (!submit_upstream_work(wc->u.work)) {
if (unlikely(strncmp(hexstr, current_block, 36))) { if (stale_work(wc->u.work)) {
applog(LOG_WARNING, "Stale work detected, discarding"); applog(LOG_WARNING, "Stale share detected, discarding");
stale_shares++; stale_shares++;
goto out_free; break;
} }
if (unlikely((opt_retries >= 0) && (++failures > opt_retries))) { if (unlikely((opt_retries >= 0) && (++failures > opt_retries))) {
applog(LOG_ERR, "Failed %d retries ...terminating workio thread", opt_retries); applog(LOG_ERR, "Failed %d retries ...terminating workio thread", opt_retries);
kill_work(); kill_work();
goto out_free; break;
} }
/* pause, then restart work-request loop */ /* pause, then restart work-request loop */
@ -902,8 +914,6 @@ static void *submit_work_thread(void *userdata)
opt_fail_pause); opt_fail_pause);
sleep(opt_fail_pause); sleep(opt_fail_pause);
} }
out_free:
free(hexstr);
out: out:
workio_cmd_free(wc); workio_cmd_free(wc);
return NULL; return NULL;
@ -1508,7 +1518,8 @@ static void *miner_thread(void *userdata)
} }
if (diff.tv_sec > opt_scantime || work_restart[thr_id].restart || if (diff.tv_sec > opt_scantime || work_restart[thr_id].restart ||
work.blk.nonce >= MAXTHREADS - hashes_done) work.blk.nonce >= MAXTHREADS - hashes_done ||
stale_work(&work))
needs_work = true; needs_work = true;
} }
@ -1668,7 +1679,10 @@ static void *gpuminer_thread(void *userdata)
} }
} }
if (diff.tv_sec > opt_scantime || work->blk.nonce >= MAXTHREADS - hashes || work_restart[thr_id].restart) { if (diff.tv_sec > opt_scantime ||
work->blk.nonce >= MAXTHREADS - hashes ||
work_restart[thr_id].restart ||
stale_work(work)) {
/* Ignore any reads since we're getting new work and queue a clean buffer */ /* Ignore any reads since we're getting new work and queue a clean buffer */
status = clEnqueueWriteBuffer(clState->commandQueue, clState->outputBuffer, CL_FALSE, 0, status = clEnqueueWriteBuffer(clState->commandQueue, clState->outputBuffer, CL_FALSE, 0,
BUFFERSIZE, blank_res, 0, NULL, NULL); BUFFERSIZE, blank_res, 0, NULL, NULL);