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

Give a longpoll message for any longpoll that detects a block change, primary or backup, and also display which pool it was.

Browse Source
This commit is contained in:
Con Kolivas 2012-04-28 13:31:27 +10:00
parent e1cf5029d4
commit 3362a2a447
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cgminer.c
View File

@ -2376,7 +2376,8 @@ static void test_work_current(struct work *work)
work_block++; work_block++;
if (work->longpoll) { if (work->longpoll) {
applog(LOG_NOTICE, "LONGPOLL detected new block on network, waiting on fresh work"); applog(LOG_NOTICE, "LONGPOLL from pool %d detected new block, waiting on fresh work",
work->pool->pool_no);
work->longpoll = false; work->longpoll = false;
} else if (have_longpoll) } else if (have_longpoll)
applog(LOG_NOTICE, "New block detected on network before longpoll, waiting on fresh work"); applog(LOG_NOTICE, "New block detected on network before longpoll, waiting on fresh work");
@ -2385,9 +2386,11 @@ static void test_work_current(struct work *work)
restart_threads(); restart_threads();
} else if (work->longpoll) { } else if (work->longpoll) {
work->longpoll = false; work->longpoll = false;
applog(LOG_NOTICE, "LONGPOLL requested work restart, waiting on fresh work"); if (work->pool == current_pool()) {
work_block++; applog(LOG_NOTICE, "LONGPOLL requested work restart, waiting on fresh work");
restart_threads(); work_block++;
restart_threads();
}
} }
out_free: out_free:
free(hexstr); free(hexstr);
@ -3810,10 +3813,7 @@ static void convert_to_work(json_t *val, bool rolltime, struct pool *pool)
} }
work->pool = pool; work->pool = pool;
work->rolltime = rolltime; work->rolltime = rolltime;
work->longpoll = true;
/* Only flag this as longpoll work if the pool is the current pool */
if (pool == cp)
work->longpoll = true;
/* We'll be checking this work item twice, but we already know it's /* We'll be checking this work item twice, but we already know it's
* from a new block so explicitly force the new block detection now * from a new block so explicitly force the new block detection now
@ -3821,8 +3821,8 @@ static void convert_to_work(json_t *val, bool rolltime, struct pool *pool)
* allows testwork to know whether LP discovered the block or not. */ * allows testwork to know whether LP discovered the block or not. */
test_work_current(work); test_work_current(work);
/* Don't use as work if we have failover-only enabled */ /* Don't use backup LPs as work if we have failover-only enabled */
if (pool != cp && opt_fail_only) { if (pool != current_pool() && opt_fail_only) {
free_work(work); free_work(work);
return; return;
} }