Commit c91148f193d3c93c389fa7f357b7a29e4e885596
2012-07-30T09:02:23
Remove the low hash count determinant of hardware being sick. A low hash rate can be for poor network connectivity or scrypt mining, neither of which are due to sick hardware.
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
diff --git a/cgminer.c b/cgminer.c
index 9fb1f1b..9108d1b 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -4567,7 +4567,6 @@ static void age_work(void)
#define WATCHDOG_DEAD_TIME 600
#define WATCHDOG_SICK_COUNT (WATCHDOG_SICK_TIME/WATCHDOG_INTERVAL)
#define WATCHDOG_DEAD_COUNT (WATCHDOG_DEAD_TIME/WATCHDOG_INTERVAL)
-#define WATCHDOG_LOW_HASH 1.0 /* consider < 1MH too low for any device */
static void *watchdog_thread(void __maybe_unused *userdata)
{
@@ -4648,9 +4647,6 @@ static void *watchdog_thread(void __maybe_unused *userdata)
struct cgpu_info *cgpu = devices[i];
struct thr_info *thr = cgpu->thr[0];
enum dev_enable *denable;
- bool dev_count_well;
- bool dev_count_sick;
- bool dev_count_dead;
char dev_str[8];
int gpu;
@@ -4682,21 +4678,12 @@ static void *watchdog_thread(void __maybe_unused *userdata)
if (!strcmp(cgpu->api->dname, "cpu"))
continue;
#endif
- if (cgpu->rolling < WATCHDOG_LOW_HASH)
- cgpu->low_count++;
- else
- cgpu->low_count = 0;
-
- dev_count_well = (cgpu->low_count < WATCHDOG_SICK_COUNT);
- dev_count_sick = (cgpu->low_count > WATCHDOG_SICK_COUNT);
- dev_count_dead = (cgpu->low_count > WATCHDOG_DEAD_COUNT);
-
- if (cgpu->status != LIFE_WELL && (now.tv_sec - thr->last.tv_sec < WATCHDOG_SICK_TIME) && dev_count_well) {
+ if (cgpu->status != LIFE_WELL && (now.tv_sec - thr->last.tv_sec < WATCHDOG_SICK_TIME)) {
if (cgpu->status != LIFE_INIT)
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 && ((now.tv_sec - thr->last.tv_sec > WATCHDOG_SICK_TIME) || dev_count_sick)) {
+ } else if (cgpu->status == LIFE_WELL && (now.tv_sec - thr->last.tv_sec > WATCHDOG_SICK_TIME)) {
thr->rolling = cgpu->rolling = 0;
cgpu->status = LIFE_SICK;
applog(LOG_ERR, "%s: Idle for more than 60 seconds, declaring SICK!", dev_str);
@@ -4715,7 +4702,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 && ((now.tv_sec - thr->last.tv_sec > WATCHDOG_DEAD_TIME) || dev_count_dead)) {
+ } else if (cgpu->status == LIFE_SICK && (now.tv_sec - thr->last.tv_sec > WATCHDOG_DEAD_TIME)) {
cgpu->status = LIFE_DEAD;
applog(LOG_ERR, "%s: Not responded for more than 10 minutes, declaring DEAD!", dev_str);
gettimeofday(&thr->sick, NULL);
diff --git a/miner.h b/miner.h
index 4f553cd..09cb503 100644
--- a/miner.h
+++ b/miner.h
@@ -336,7 +336,6 @@ struct cgpu_info {
int accepted;
int rejected;
int hw_errors;
- unsigned int low_count;
double rolling;
double total_mhashes;
double utility;