Commit efaa7398fb56a17ccfcb3645369ec1abba1dd6e6
2012-06-30T11:59:53
Tweak sick/dead logic (remove pre-computed time calculations)
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
diff --git a/cgminer.c b/cgminer.c
index 0e8e221..861332a 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -4534,19 +4534,15 @@ static void *watchdog_thread(void __maybe_unused *userdata)
else
cgpu->low_count = 0;
- uint64_t hashtime = now.tv_sec - thr->last.tv_sec;
- bool dev_time_well = hashtime < WATCHDOG_SICK_TIME;
- bool dev_time_sick = hashtime > WATCHDOG_SICK_TIME;
- bool dev_time_dead = hashtime > WATCHDOG_DEAD_TIME;
- bool dev_count_well = cgpu->low_count < WATCHDOG_SICK_COUNT;
- bool dev_count_sick = cgpu->low_count > WATCHDOG_SICK_COUNT;
- bool dev_count_dead = cgpu->low_count > WATCHDOG_DEAD_COUNT;
-
- if (cgpu->status != LIFE_WELL && dev_time_well && dev_count_well) {
+ bool dev_count_well = (cgpu->low_count < WATCHDOG_SICK_COUNT);
+ bool dev_count_sick = (cgpu->low_count > WATCHDOG_SICK_COUNT);
+ bool dev_count_dead = (cgpu->low_count > WATCHDOG_DEAD_COUNT);
+
+ if (gpus[gpu].status != LIFE_WELL && (now.tv_sec - thr->last.tv_sec < WATCHDOG_SICK_TIME) && dev_count_well) {
applog(LOG_ERR, "%s: Recovered, declaring WELL!", dev_str);
cgpu->status = LIFE_WELL;
cgpu->device_last_well = time(NULL);
- } else if (cgpu->status == LIFE_WELL && (dev_time_sick || dev_count_sick)) {
+ } else if (cgpu->status == LIFE_WELL && ((now.tv_sec - thr->last.tv_sec > WATCHDOG_SICK_TIME) || dev_count_sick)) {
thr->rolling = cgpu->rolling = 0;
cgpu->status = LIFE_SICK;
applog(LOG_ERR, "%s: Idle for more than 60 seconds, declaring SICK!", dev_str);
@@ -4565,7 +4561,7 @@ static void *watchdog_thread(void __maybe_unused *userdata)
applog(LOG_ERR, "%s: Attempting to restart", dev_str);
reinit_device(cgpu);
}
- } else if (cgpu->status == LIFE_SICK && (dev_time_dead || dev_count_dead)) {
+ } else if (cgpu->status == LIFE_SICK && ((now.tv_sec - thr->last.tv_sec > WATCHDOG_DEAD_TIME) || dev_count_dead)) {
cgpu->status = LIFE_DEAD;
applog(LOG_ERR, "%s: Not responded for more than 10 minutes, declaring DEAD!", dev_str);
gettimeofday(&thr->sick, NULL);