GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-11 07:17:58 +00:00
Code Issues Releases Wiki Activity

BFL minimise first initialisation failure delay since it is common

Browse Source
This commit is contained in:
Kano 2013-01-10 11:27:51 +11:00
parent 0b3d8c89c2
commit f53549a861
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
driver-bitforce.c
View File

@ -58,9 +58,11 @@
// If initialisation fails the first time, // If initialisation fails the first time,
// sleep this amount (ms) and try again // sleep this amount (ms) and try again
#define REINIT_TIME_MS 1000 #define REINIT_TIME_FIRST_MS 100
// But try this many times // Max ms per sleep
#define REINIT_COUNT 6 #define REINIT_TIME_MAX_MS 800
// Keep trying up to this many us
#define REINIT_TIME_MAX 3000000
static const char *blank = ""; static const char *blank = "";
@ -133,6 +135,8 @@ static bool bitforce_detect_one(struct libusb_device *dev, struct usb_find_devic
char devpath[20]; char devpath[20];
int err, amount; int err, amount;
char *s; char *s;
struct timeval init_start, init_now;
int init_sleep, init_count;
struct cgpu_info *bitforce = NULL; struct cgpu_info *bitforce = NULL;
bitforce = calloc(1, sizeof(*bitforce)); bitforce = calloc(1, sizeof(*bitforce));
@ -152,7 +156,10 @@ static bool bitforce_detect_one(struct libusb_device *dev, struct usb_find_devic
(int)(bitforce->usbdev->bus_number), (int)(bitforce->usbdev->bus_number),
(int)(bitforce->usbdev->device_address)); (int)(bitforce->usbdev->device_address));
int init_count = 0;
init_count = 0;
init_sleep = REINIT_TIME_FIRST_MS;
gettimeofday(&init_start, NULL);
reinit: reinit:
bitforce_initialise(bitforce, false); bitforce_initialise(bitforce, false);
@ -164,19 +171,22 @@ reinit:
} }
if ((err = usb_ftdi_read_nl(bitforce, buf, sizeof(buf)-1, &amount, C_GETIDENTIFY)) < 0 || amount < 1) { if ((err = usb_ftdi_read_nl(bitforce, buf, sizeof(buf)-1, &amount, C_GETIDENTIFY)) < 0 || amount < 1) {
// Maybe it was still processing previous work? init_count++;
if (++init_count <= REINIT_COUNT) { gettimeofday(&init_now, NULL);
if (init_count < 2) { if (us_tdiff(&init_now, &init_start) <= REINIT_TIME_MAX) {
applog(LOG_WARNING, "%s detect (%s) 1st init failed - retrying (%d:%d)", if (init_count == 2) {
applog(LOG_WARNING, "%s detect (%s) 2nd init failed (%d:%d) - retrying",
bitforce->drv->dname, devpath, amount, err); bitforce->drv->dname, devpath, amount, err);
} }
nmsleep(REINIT_TIME_MS); nmsleep(init_sleep);
if ((init_sleep * 2) <= REINIT_TIME_MAX_MS)
init_sleep *= 2;
goto reinit; goto reinit;
} }
if (init_count > 0) if (init_count > 0)
applog(LOG_WARNING, "%s detect (%s) init failed %d times", applog(LOG_WARNING, "%s detect (%s) init failed %d times %.2fs",
bitforce->drv->dname, devpath, init_count); bitforce->drv->dname, devpath, init_count, tdiff(&init_now, &init_start));
if (err < 0) { if (err < 0) {
applog(LOG_ERR, "%s detect (%s) error identify reply (%d:%d)", applog(LOG_ERR, "%s detect (%s) error identify reply (%d:%d)",