Commit ad787e1c2a55a6fccc835f57a3f8df2ec19b9aa1
2011-07-03T19:39:47
Move the flushing of old work into restart threads so it's done before any worker threads grab more work.
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 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82
diff --git a/cpu-miner.c b/cpu-miner.c
index b0593bd..13ee61b 100644
--- a/cpu-miner.c
+++ b/cpu-miner.c
@@ -713,6 +713,34 @@ static bool queue_request(void)
return true;
}
+static void flush_requests(void)
+{
+ struct thr_info *thr = &thr_info[0];
+ struct work *work_heap;
+ unsigned int i;
+
+ /* Queue a whole batch of new requests */
+ for (i = 0; i < opt_queue; i++) {
+ if (unlikely(!queue_request())) {
+ applog(LOG_ERR, "Failed to queue requests in flush_requests");
+ kill_work();
+ return;
+ }
+ }
+
+ /* Pop off the old requests. Cancelling the requests would be better
+ * but is tricky */
+ for (i = 0; i < opt_queue; i++) {
+ work_heap = tq_pop(thr->q, NULL);
+ if (unlikely(!work_heap)) {
+ applog(LOG_ERR, "Failed to pop requests in flush_requests");
+ kill_work();
+ return;
+ }
+ free(work_heap);
+ }
+}
+
static bool get_work(struct work *work)
{
struct thr_info *thr = &thr_info[0];
@@ -739,22 +767,6 @@ static bool get_work(struct work *work)
}
}
- if (unlikely(work_restart[opt_n_threads + gpu_threads].restart)) {
- work_restart[opt_n_threads + gpu_threads].restart = 0;
- if (opt_debug)
- applog(LOG_DEBUG, "New block detected, discarding old work");
- for (i = 1; i < opt_queue; i++) {
- free(work_heap);
- if (unlikely(!queue_request()))
- goto out;
- /* Pop off all the work. Cancelling the requests would
- * be better but tricky. */
- work_heap = tq_pop(thr->q, NULL);
- if (unlikely(!work_heap))
- goto out;
- }
- }
-
memcpy(work, work_heap, sizeof(*work));
memcpy(current_block, work->data, 36);
ret = true;
@@ -1135,7 +1147,9 @@ static void restart_threads(void)
{
int i;
- for (i = 0; i < opt_n_threads + gpu_threads + 1; i++)
+ /* Discard old queued requests and get new ones */
+ flush_requests();
+ for (i = 0; i < opt_n_threads + gpu_threads; i++)
work_restart[i].restart = 1;
}
@@ -1473,7 +1487,7 @@ int main (int argc, char *argv[])
openlog("cpuminer", LOG_PID, LOG_USER);
#endif
- work_restart = calloc(opt_n_threads + gpu_threads + 1, sizeof(*work_restart));
+ work_restart = calloc(opt_n_threads + gpu_threads, sizeof(*work_restart));
if (!work_restart)
return 1;