Commit dddc2d1e60fa6cacd58baf2f3a3843d955d2fe06
2013-08-19T17:59:59
Revert "Reuse times extracted from the clock in bflsc_get_results." This reverts commit 1d8235334d0bac696e91dc246af2aab9f1d35d36. Monotonic clock does not return the same times as gettimeofday.
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
diff --git a/driver-bflsc.c b/driver-bflsc.c
index 7fb91f9..8b76f20 100644
--- a/driver-bflsc.c
+++ b/driver-bflsc.c
@@ -1387,7 +1387,6 @@ static void *bflsc_get_results(void *userdata)
struct cgpu_info *bflsc = (struct cgpu_info *)userdata;
struct bflsc_info *sc_info = (struct bflsc_info *)(bflsc->device_data);
struct timeval elapsed, now;
- cgtimer_t ts_start;
float oldest, f;
char buf[BFLSC_BUFSIZ+1];
int err, amount;
@@ -1402,13 +1401,14 @@ static void *bflsc_get_results(void *userdata)
}
while (sc_info->shutdown == false) {
+ cgtimer_t ts_start;
+
if (bflsc->usbinfo.nodev)
return NULL;
dev = -1;
oldest = FLT_MAX;
- cgsleep_prepare_r(&ts_start);
- cgtimer_to_timeval(&now, &ts_start);
+ cgtime(&now);
// Find the first oldest ... that also needs checking
for (i = 0; i < sc_info->sc_count; i++) {
@@ -1420,12 +1420,10 @@ static void *bflsc_get_results(void *userdata)
}
}
- if (bflsc->usbinfo.nodev) {
- /* To clean up the setup timer */
- cgsleep_ms_r(&ts_start, 0);
+ if (bflsc->usbinfo.nodev)
return NULL;
- }
+ cgsleep_prepare_r(&ts_start);
if (dev == -1) {
/* Sleep for only half a work period before checking
* again. */
@@ -1433,7 +1431,7 @@ static void *bflsc_get_results(void *userdata)
continue;
}
- copy_time(&sc_info->sc_devs[dev].last_check_result, &now);
+ cgtime(&(sc_info->sc_devs[dev].last_check_result));
readok = bflsc_qres(bflsc, buf, sizeof(buf), dev, &err, &amount, false);
if (err < 0 || (!readok && amount != BFLSC_QRES_LEN) || (readok && amount < 1)) {
@@ -1441,13 +1439,10 @@ static void *bflsc_get_results(void *userdata)
} else {
que = process_results(bflsc, dev, buf, &nonces);
sc_info->not_first_work = true; // in case it failed processing it
- if (que > 0 || nonces > 0) {
- cgtime(&now);
- if (que > 0)
- copy_time(&sc_info->sc_devs[dev].last_dev_result, &now);
- if (nonces > 0)
- copy_time(&sc_info->sc_devs[dev].last_nonce_result, &now);
- }
+ if (que > 0)
+ cgtime(&(sc_info->sc_devs[dev].last_dev_result));
+ if (nonces > 0)
+ cgtime(&(sc_info->sc_devs[dev].last_nonce_result));
// TODO: if not getting results ... reinit?
}