Commit bfdf3af1a4346ff0bbce8d1d9a9b1f038b78bc26
2013-10-03T12:05:48
Store statistics on how often we have to cancel async bulk transfers and add a debug message whenever we do.
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
diff --git a/miner.h b/miner.h
index 7bafed0..8654b13 100644
--- a/miner.h
+++ b/miner.h
@@ -487,6 +487,7 @@ struct cgpu_info {
int usb_rlock_total_wait;
int usb_wlock_max_wait;
int usb_rlock_max_wait;
+ int usb_cancels;
#endif
#ifdef USE_MODMINER
char fpgaid;
diff --git a/usbutils.c b/usbutils.c
index dc983b0..db4f064 100644
--- a/usbutils.c
+++ b/usbutils.c
@@ -2226,7 +2226,8 @@ static void LIBUSB_CALL bulk_callback(struct libusb_transfer *transfer)
/* Wait for callback function to tell us it has finished the USB transfer, but
* use our own timer to cancel the request if we go beyond the timeout. */
-static int callback_wait(struct usb_transfer *ut, int *transferred, unsigned int timeout)
+static int callback_wait(struct cgpu_info *cgpu, struct usb_transfer *ut, int *transferred,
+ unsigned int timeout)
{
struct libusb_transfer *transfer= ut->transfer;
struct timespec ts_now, ts_end;
@@ -2246,6 +2247,9 @@ static int callback_wait(struct usb_transfer *ut, int *transferred, unsigned int
* it the same as a timeout. */
libusb_clear_halt(transfer->dev_handle, transfer->endpoint);
libusb_cancel_transfer(transfer);
+ applog(LOG_DEBUG, "%s%i: libusb cancelling async bulk transfer",
+ cgpu->drv->name, cgpu->device_id);
+ cgpu->usb_cancels++;
/* Now wait for the callback function to be invoked. */
pthread_cond_wait(&ut->cond, &ut->mutex);
@@ -2304,7 +2308,7 @@ usb_bulk_transfer(struct libusb_device_handle *dev_handle, int intinfo,
cg_runlock(&cgusb_fd_lock);
errn = errno;
if (!err)
- err = callback_wait(&ut, transferred, timeout);
+ err = callback_wait(cgpu, &ut, transferred, timeout);
STATS_TIMEVAL(&tv_finish);
USB_STATS(cgpu, &tv_start, &tv_finish, err, mode, cmd, seq, timeout);