Discard all work on longpoll, not just work cgminer recognises as stale.
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
diff --git a/cgminer.c b/cgminer.c
index 6694ac1..07d99ee 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -3412,6 +3412,27 @@ static void discard_stale(void)
}
}
+static void discard_all(struct pool *pool)
+{
+ struct work *work, *tmp;
+ int discarded = 0;
+
+ mutex_lock(stgd_lock);
+ HASH_ITER(hh, staged_work, work, tmp) {
+ HASH_DEL(staged_work, work);
+ work->pool->staged--;
+ discard_work(work);
+ discarded++;
+ }
+ mutex_unlock(stgd_lock);
+
+ if (discarded) {
+ applog(LOG_DEBUG, "Discarded %d work items by pool %d request", discarded, pool->pool_no);
+ while (discarded-- > 0)
+ queue_request();
+ }
+}
+
/* A generic wait function for threads that poll that will wait a specified
* time tdiff waiting on the pthread conditional that is broadcast when a
* work restart is required. Returns the value of pthread_cond_timedwait
@@ -3446,8 +3467,8 @@ static void restart_threads(void)
* fast enough messages after every long poll */
pool_tset(cp, &cp->lagging);
- /* Discard staged work that is now stale */
- discard_stale();
+ /* Force discard all work even if not stale */
+ discard_all(cp);
for (i = 0; i < mining_threads; i++)
thr_info[i].work_restart = true;