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

Only internally test for block changes when the work matches the current pool to prevent interleaved block change timing on multipools.

Browse Source
This commit is contained in:
Con Kolivas 2011-07-22 12:02:04 +10:00
parent b0a8f279f7
commit b534ad0aad
1 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
main.c
View File

@ -1095,6 +1095,11 @@ static bool stale_work(struct work *work)
bool ret = false; bool ret = false;
char *hexstr; char *hexstr;
/* Only use the primary pool for determination as the work may
* interleave at times of new blocks */
if (work->pool != current_pool())
return ret;
if (!strncmp(blank, current_block, 36)) if (!strncmp(blank, current_block, 36))
return ret; return ret;
@ -1304,6 +1309,40 @@ static void set_curblock(char *hexstr)
tm.tm_sec); tm.tm_sec);
} }
static void test_work_current(struct work *work)
{
char *hexstr;
/* Only use the primary pool for determination */
if (work->pool != current_pool())
return;
hexstr = bin2hex(work->data, 36);
if (unlikely(!hexstr)) {
applog(LOG_ERR, "stage_thread OOM");
return;
}
/* current_block is blanked out on successful longpoll */
if (likely(strncmp(current_block, blank, 36))) {
if (unlikely(strncmp(hexstr, current_block, 36))) {
new_blocks++;
if (have_longpoll)
applog(LOG_WARNING, "New block detected on network before longpoll, waiting on fresh work");
else
applog(LOG_WARNING, "New block detected on network, waiting on fresh work");
/* As we can't flush the work from here, signal the
* wakeup thread to restart all the threads */
work_restart[watchdog_thr_id].restart = 1;
set_curblock(hexstr);
}
} else {
set_curblock(hexstr);
memcpy(longpoll_block, hexstr, 36);
}
free(hexstr);
}
static void *stage_thread(void *userdata) static void *stage_thread(void *userdata)
{ {
struct thr_info *mythr = userdata; struct thr_info *mythr = userdata;
@ -1313,7 +1352,6 @@ static void *stage_thread(void *userdata)
while (ok) { while (ok) {
struct work *work = NULL; struct work *work = NULL;
char *hexstr;
work = tq_pop(mythr->q, NULL); work = tq_pop(mythr->q, NULL);
if (unlikely(!work)) { if (unlikely(!work)) {
@ -1322,31 +1360,7 @@ static void *stage_thread(void *userdata)
break; break;
} }
hexstr = bin2hex(work->data, 36); test_work_current(work);
if (unlikely(!hexstr)) {
applog(LOG_ERR, "stage_thread OOM");
break;
}
/* current_block is blanked out on successful longpoll */
if (likely(strncmp(current_block, blank, 36))) {
if (unlikely(strncmp(hexstr, current_block, 36))) {
new_blocks++;
if (have_longpoll)
applog(LOG_WARNING, "New block detected on network before longpoll, waiting on fresh work");
else
applog(LOG_WARNING, "New block detected on network, waiting on fresh work");
/* As we can't flush the work from here, signal
* the wakeup thread to restart all the
* threads */
work_restart[watchdog_thr_id].restart = 1;
set_curblock(hexstr);
}
} else {
set_curblock(hexstr);
memcpy(longpoll_block, hexstr, 36);
}
free(hexstr);
if (unlikely(!tq_push(getq, work))) { if (unlikely(!tq_push(getq, work))) {
applog(LOG_ERR, "Failed to tq_push work in stage_thread"); applog(LOG_ERR, "Failed to tq_push work in stage_thread");