Commit 0b5eb4369611e18149b1b591da5efa8dbae983a4
2013-06-19T10:46:28
Revert "Only wait in the bflsc scanwork loop if the queues are satisfactorily filled." This reverts commit a49969908cacbde175cc5d02d7a68f2d4e311e79. Makes the driver busy wait.
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
diff --git a/driver-bflsc.c b/driver-bflsc.c
index ca95d0a..95ab2fa 100644
--- a/driver-bflsc.c
+++ b/driver-bflsc.c
@@ -1796,10 +1796,10 @@ static int64_t bflsc_scanwork(struct thr_info *thr)
{
struct cgpu_info *bflsc = thr->cgpu;
struct bflsc_info *sc_info = (struct bflsc_info *)(bflsc->device_data);
- int dev, waited = 0, i, min_queued;
int64_t ret, unsent;
bool flushed, cleanup;
struct work *work, *tmp;
+ int dev, waited, i;
// Device is gone
if (bflsc->usbinfo.nodev)
@@ -1845,21 +1845,10 @@ static int64_t bflsc_scanwork(struct thr_info *thr)
}
}
- min_queued = sc_info->que_size;
-
- rd_lock(&sc_info->stat_lock);
- for (i = 0; i < sc_info->sc_count; i++) {
- if (sc_info->sc_devs[i].work_queued < min_queued)
- min_queued = sc_info->sc_devs[i].work_queued;
- }
- rd_unlock(&sc_info->stat_lock);
-
- if (min_queued >= sc_info->que_watermark)
- waited = restart_wait(sc_info->scan_sleep_time);
+ waited = restart_wait(sc_info->scan_sleep_time);
if (waited == ETIMEDOUT) {
unsigned int old_sleep_time, new_sleep_time = 0;
-
- min_queued = sc_info->que_size;
+ int min_queued = sc_info->que_size;
/* Only adjust the scan_sleep_time if we did not receive a
* restart message while waiting. Try to adjust sleep time
* so we drop to sc_info->que_watermark before getting more work.