mirror of
https://github.com/GOSTSec/sgminer
synced 2025-01-11 07:17:58 +00:00
Logic fail on queueing multiple requests at once. Just queue one at a time.
This commit is contained in:
parent
42ea29ca4e
commit
17ba2dca63
55
cgminer.c
55
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;
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* 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;
|
||||
|
||||
wc->cmd = WC_GET_WORK;
|
||||
wc->thr = thr;
|
||||
/* 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;
|
||||
|
||||
/* 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;
|
||||
applog(LOG_DEBUG, "Queueing getwork request to work thread");
|
||||
|
||||
applog(LOG_DEBUG, "Queueing getwork request to work thread");
|
||||
|
||||
/* 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;
|
||||
}
|
||||
|
||||
} 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);
|
||||
|
Loading…
Reference in New Issue
Block a user