Commit 17ba2dca63fdef062c63b8532b9ec7fdedd57caa
2012-06-25T10:51:45
Logic fail on queueing multiple requests at once. Just queue one at a time.
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
diff --git a/cgminer.c b/cgminer.c
index a186ff1..a6232a4 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -3550,7 +3550,7 @@ static bool queue_request(struct thr_info *thr, bool needed)
struct workio_cmd *wc;
struct timeval now;
time_t scan_post;
- int toq, rq, rs;
+ int rq, rs;
bool ret = true;
/* Prevent multiple requests being executed at once */
@@ -3577,42 +3577,33 @@ static bool queue_request(struct thr_info *thr, bool needed)
requested_tv_sec = now.tv_sec;
- if (rq > rs)
- toq = rq - mining_threads;
- else
- toq = rs - mining_threads;
+ inc_queued();
- do {
- inc_queued();
-
- /* fill out work request message */
- wc = calloc(1, sizeof(*wc));
- if (unlikely(!wc)) {
- applog(LOG_ERR, "Failed to calloc wc in queue_request");
- ret = false;
- break;
- }
-
- wc->cmd = WC_GET_WORK;
- wc->thr = thr;
+ /* fill out work request message */
+ wc = calloc(1, sizeof(*wc));
+ if (unlikely(!wc)) {
+ applog(LOG_ERR, "Failed to calloc wc in queue_request");
+ ret = false;
+ goto out;
+ }
- /* If we're queueing work faster than we can stage it, consider the
- * system lagging and allow work to be gathered from another pool if
- * possible */
- if (rq && needed && !rs && !opt_fail_only)
- wc->lagging = true;
+ wc->cmd = WC_GET_WORK;
+ wc->thr = thr;
- applog(LOG_DEBUG, "Queueing getwork request to work thread");
+ /* If we're queueing work faster than we can stage it, consider the
+ * system lagging and allow work to be gathered from another pool if
+ * possible */
+ if (rq && needed && !rs && !opt_fail_only)
+ wc->lagging = true;
- /* send work request to workio thread */
- if (unlikely(!tq_push(thr_info[work_thr_id].q, wc))) {
- applog(LOG_ERR, "Failed to tq_push in queue_request");
- workio_cmd_free(wc);
- ret = false;
- break;
- }
+ applog(LOG_DEBUG, "Queueing getwork request to work thread");
- } while (--toq > 0);
+ /* send work request to workio thread */
+ if (unlikely(!tq_push(thr_info[work_thr_id].q, wc))) {
+ applog(LOG_ERR, "Failed to tq_push in queue_request");
+ workio_cmd_free(wc);
+ ret = false;
+ }
out:
control_tclear(&queueing);