Commit 294cda2eb28ac886fc630c9f45ddf013f493cb3c
2013-02-16T12:35:16
Flush queued work on a restart from the hash database and discard the work structs.
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 a562b3f..f01e9a3 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -5624,6 +5624,27 @@ void work_completed(struct cgpu_info *cgpu, struct work *work)
free_work(work);
}
+static void flush_queue(struct cgpu_info *cgpu)
+{
+ struct work *work, *tmp;
+ int discarded = 0;
+
+ wr_lock(&cgpu->qlock);
+ HASH_ITER(hh, cgpu->queued_work, work, tmp) {
+ /* Can only discard the work items if they're not physically
+ * queued on the device. */
+ if (!work->queued) {
+ HASH_DEL(cgpu->queued_work, work);
+ discard_work(work);
+ discarded++;
+ }
+ }
+ wr_unlock(&cgpu->qlock);
+
+ if (discarded)
+ applog(LOG_DEBUG, "Discarded %d queued work items", discarded);
+}
+
/* This version of hash work is for devices that are fast enough to always
* perform a full nonce range and need a queue to maintain the device busy.
* Work creation and destruction is not done from within this function
@@ -5663,8 +5684,8 @@ static void hash_queued_work(struct thr_info *mythr)
memcpy(&tv_start, &tv_end, sizeof(struct timeval));
}
- //if (unlikely(mythr->work_restart))
- // flush_queue(mythr, cgpu);
+ if (unlikely(mythr->work_restart))
+ flush_queue(cgpu);
if (unlikely(mythr->pause || cgpu->deven != DEV_ENABLED))
mt_disable(mythr, thr_id, drv);