Commit 04a6c3b18847db1fa351e4a38c90efeeb38ed640
2012-07-01T21:47:18
More improvements to comms. BFL return nothing when throttling, so should not be considered an error. Instead repeat with a longer delay.
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
diff --git a/driver-bitforce.c b/driver-bitforce.c
index 4a60872..8f21a3e 100644
--- a/driver-bitforce.c
+++ b/driver-bitforce.c
@@ -251,15 +251,10 @@ re_send:
mutex_lock(&bitforce->device_mutex);
BFwrite(fdDev, "ZDX", 3);
BFgets(pdevbuf, sizeof(pdevbuf), fdDev);
- if (unlikely(!pdevbuf[0])) {
- applog(LOG_ERR, "BFL%i: Error: Send work returned empty string", bitforce->device_id);
- mutex_unlock(&bitforce->device_mutex);
- return false;
- } else if (pdevbuf[0] == 'B') {
- applog(LOG_DEBUG, "BFL%i: Busy", bitforce->device_id);
+ if (!pdevbuf[0] || (pdevbuf[0] == 'B')) {
mutex_unlock(&bitforce->device_mutex);
- bitforce->wait_ms += BITFORCE_CHECK_INTERVAL_MS;
- usleep(BITFORCE_CHECK_INTERVAL_MS*1000);
+ bitforce->wait_ms += WORK_CHECK_INTERVAL_MS;
+ usleep(WORK_CHECK_INTERVAL_MS*1000);
goto re_send;
} else if (unlikely(pdevbuf[0] != 'O' || pdevbuf[1] != 'K')) {
applog(LOG_ERR, "BFL%i: Error: Send work reports: %s", bitforce->device_id, pdevbuf);
@@ -296,6 +291,7 @@ static uint64_t bitforce_get_result(struct thr_info *thr, struct work *work)
char pdevbuf[0x100];
char *pnoncebuf;
uint32_t nonce;
+ unsigned int delay_time_ms = BITFORCE_CHECK_INTERVAL_MS;
if (!fdDev)
return 0;
@@ -305,14 +301,12 @@ static uint64_t bitforce_get_result(struct thr_info *thr, struct work *work)
BFwrite(fdDev, "ZFX", 3);
BFgets(pdevbuf, sizeof(pdevbuf), fdDev);
mutex_unlock(&bitforce->device_mutex);
- if (unlikely(!pdevbuf[0])) {
- applog(LOG_ERR, "BFL%i: Error: Get result returned empty string", bitforce->device_id);
- return 0;
- }
- if (pdevbuf[0] != 'B')
+ if (pdevbuf[0] && pdevbuf[0] != 'B') /* BFL does not respond during throttling */
break;
- usleep(BITFORCE_CHECK_INTERVAL_MS*1000);
- bitforce->wait_ms += BITFORCE_CHECK_INTERVAL_MS;
+ /* if BFL is throttling, no point checking so quickly */
+ delay_time_ms = (pdevbuf[0] ? BITFORCE_CHECK_INTERVAL_MS : 2*WORK_CHECK_INTERVAL_MS);
+ usleep(delay_time_ms*1000);
+ bitforce->wait_ms += delay_time_ms;
}
if (bitforce->wait_ms >= BITFORCE_TIMEOUT_MS) {
applog(LOG_ERR, "BFL%i: took longer than 10s", bitforce->device_id);
@@ -376,9 +370,9 @@ static void biforce_thread_enable(struct thr_info *thr)
static uint64_t bitforce_scanhash(struct thr_info *thr, struct work *work, uint64_t __maybe_unused max_nonce)
{
struct cgpu_info *bitforce = thr->cgpu;
- bitforce->wait_ms = 0;
uint64_t ret;
+ bitforce->wait_ms = 0;
ret = bitforce_send_work(thr, work);
while (bitforce->wait_ms < bitforce->sleep_ms) {