Commit 0fe710c283a9bd19985a7464dd5d7516c2292cfd
2014-07-26T01:15:14
minion - reset if no nonces for too long
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 72 73 74 75
diff --git a/driver-minion.c b/driver-minion.c
index 707512b..7402282 100644
--- a/driver-minion.c
+++ b/driver-minion.c
@@ -3931,6 +3931,37 @@ retest:
return NONCE_BAD_NONCE;
}
+/* Check each chip how long since the last nonce
+ * Should normally be a fraction of a second
+ * so (MINION_RESET_s * 1.5) will certainly be long enough,
+ * but also will avoid lots of resets if there is trouble getting work
+ * Should be longer than MINION_RESET_s to avoid interfering with normal resets */
+static void check_last_nonce(struct cgpu_info *minioncgpu)
+{
+ struct minion_info *minioninfo = (struct minion_info *)(minioncgpu->device_data);
+ struct timeval now;
+ K_ITEM *head;
+ double howlong;
+ int chip;
+
+ cgtime(&now);
+ K_RLOCK(minioninfo->hfree_list);
+ for (chip = 0; chip < (int)MINION_CHIPS; chip++) {
+ if (minioninfo->has_chip[chip] && !(minioninfo->changing[chip])) {
+ head = minioninfo->hchip_list[chip]->head;
+ if (head) {
+ howlong = tdiff(&now, &(DATA_HIST(head)->when));
+ if (howlong > ((double)MINION_RESET_s * 1.5)) {
+ // Setup a reset
+ minioninfo->flag_reset[chip] = true;
+ minioninfo->do_reset[chip] = 0.0;
+ }
+ }
+ }
+ }
+ K_RUNLOCK(minioninfo->hfree_list);
+}
+
// Results checking thread
static void *minion_results(void *userdata)
{
@@ -3945,6 +3976,7 @@ static void *minion_results(void *userdata)
bool another;
uint32_t task_id2;
uint32_t nonce2;
+ int last_check;
applog(MINION_LOG, "%s%i: Results...",
minioncgpu->drv->name, minioncgpu->device_id);
@@ -3959,15 +3991,24 @@ static void *minion_results(void *userdata)
thr = minioninfo->thr;
+ last_check = 0;
while (minioncgpu->shutdown == false) {
if (!oldest_nonce(minioncgpu, &chip, &core, &task_id, &nonce,
&no_nonce, &when, &another, &task_id2, &nonce2)) {
+ check_last_nonce(minioncgpu);
+ last_check = 0;
cgsem_mswait(&(minioninfo->nonce_ready), MINION_NONCE_mS);
continue;
}
oknonce(thr, minioncgpu, chip, core, task_id, nonce, no_nonce, &when,
another, task_id2, nonce2);
+
+ // Interrupt nonce checking if low CPU and oldest_nonce() is always true
+ if (++last_check > 100) {
+ check_last_nonce(minioncgpu);
+ last_check = 0;
+ }
}
return NULL;