Commit 3362a2a447800a306a2790bae52c64ce106ccc92
2012-04-28T13:31:27
Give a longpoll message for any longpoll that detects a block change, primary or backup, and also display which pool it was.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
diff --git a/cgminer.c b/cgminer.c
index f475853..cd66c0b 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -2376,7 +2376,8 @@ static void test_work_current(struct work *work)
work_block++;
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;
} else if (have_longpoll)
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();
} else if (work->longpoll) {
work->longpoll = false;
- applog(LOG_NOTICE, "LONGPOLL requested work restart, waiting on fresh work");
- work_block++;
- restart_threads();
+ if (work->pool == current_pool()) {
+ applog(LOG_NOTICE, "LONGPOLL requested work restart, waiting on fresh work");
+ work_block++;
+ restart_threads();
+ }
}
out_free:
free(hexstr);
@@ -3810,10 +3813,7 @@ static void convert_to_work(json_t *val, bool rolltime, struct pool *pool)
}
work->pool = pool;
work->rolltime = rolltime;
-
- /* Only flag this as longpoll work if the pool is the current pool */
- if (pool == cp)
- work->longpoll = true;
+ work->longpoll = true;
/* 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
@@ -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. */
test_work_current(work);
- /* Don't use as work if we have failover-only enabled */
- if (pool != cp && opt_fail_only) {
+ /* Don't use backup LPs as work if we have failover-only enabled */
+ if (pool != current_pool() && opt_fail_only) {
free_work(work);
return;
}