1
0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-22 20:44:19 +00:00

We should check for a restart message before checking for a timeout in avalon scanhash.

This commit is contained in:
Con Kolivas 2013-04-07 14:45:54 +10:00
parent 8e69d75f36
commit 0da8868799

View File

@ -884,12 +884,6 @@ static int64_t avalon_scanhash(struct thr_info *thr)
dev_error(avalon, REASON_DEV_COMMS_ERROR); dev_error(avalon, REASON_DEV_COMMS_ERROR);
return 0; return 0;
} }
if (unlikely(ret == AVA_GETS_TIMEOUT)) {
timersub(&tv_finish, &tv_start, &elapsed);
applog(LOG_DEBUG, "Avalon: no nonce in (%ld.%06lds)",
elapsed.tv_sec, elapsed.tv_usec);
continue;
}
if (unlikely(ret == AVA_GETS_RESTART)) { if (unlikely(ret == AVA_GETS_RESTART)) {
/* Reset the wrong count in case there has only been /* Reset the wrong count in case there has only been
* a small number of nonces tested before the restart. * a small number of nonces tested before the restart.
@ -897,6 +891,12 @@ static int64_t avalon_scanhash(struct thr_info *thr)
result_wrong = 0; result_wrong = 0;
break; break;
} }
if (unlikely(ret == AVA_GETS_TIMEOUT)) {
timersub(&tv_finish, &tv_start, &elapsed);
applog(LOG_DEBUG, "Avalon: no nonce in (%ld.%06lds)",
elapsed.tv_sec, elapsed.tv_usec);
continue;
}
result_count++; result_count++;
if (!avalon_decode_nonce(thr, &ar, &nonce)) { if (!avalon_decode_nonce(thr, &ar, &nonce)) {