Commit 1d9f90b256b5e56a33fcb699f2d6d911bda11417
2013-10-14T11:39:15
Revert "Convert the usb callback function to use a cgsem_t using the timedwait code to avoid races with mutexes/conditionals." This reverts commit 433465bcfcd8d9a2270cb27dd0ea933e9fefa829. Not ready yet.
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
diff --git a/usbutils.c b/usbutils.c
index cd7152d..f9cb228 100644
--- a/usbutils.c
+++ b/usbutils.c
@@ -2194,13 +2194,15 @@ static char *find_end(unsigned char *buf, unsigned char *ptr, int ptrlen, int to
#define USB_RETRY_MAX 5
struct usb_transfer {
- cgsem_t cgsem;
+ pthread_mutex_t mutex;
+ pthread_cond_t cond;
struct libusb_transfer *transfer;
};
static void init_usb_transfer(struct usb_transfer *ut)
{
- cgsem_init(&ut->cgsem);
+ mutex_init(&ut->mutex);
+ pthread_cond_init(&ut->cond, NULL);
ut->transfer = libusb_alloc_transfer(0);
if (unlikely(!ut->transfer))
quit(1, "Failed to libusb_alloc_transfer");
@@ -2211,7 +2213,7 @@ static void LIBUSB_CALL transfer_callback(struct libusb_transfer *transfer)
{
struct usb_transfer *ut = transfer->user_data;
- cgsem_post(&ut->cgsem);
+ pthread_cond_signal(&ut->cond);
}
/* Wait for callback function to tell us it has finished the USB transfer, but
@@ -2219,15 +2221,21 @@ static void LIBUSB_CALL transfer_callback(struct libusb_transfer *transfer)
static int callback_wait(struct usb_transfer *ut, int *transferred, unsigned int timeout)
{
struct libusb_transfer *transfer= ut->transfer;
+ struct timespec ts_now, ts_end;
+ struct timeval tv_now;
int ret;
- ret = cgsem_mswait(&ut->cgsem, timeout);
- if (ret == ETIMEDOUT) {
+ cgtime(&tv_now);
+ ms_to_timespec(&ts_end, timeout);
+ timeval_to_spec(&ts_now, &tv_now);
+ timeraddspec(&ts_end, &ts_now);
+ ret = pthread_cond_timedwait(&ut->cond, &ut->mutex, &ts_end);
+ if (ret) {
/* We are emulating a timeout ourself here */
libusb_cancel_transfer(transfer);
/* Now wait for the callback function to be invoked. */
- cgsem_wait(&ut->cgsem);
+ pthread_cond_wait(&ut->cond, &ut->mutex);
}
ret = transfer->status;
if (ret == LIBUSB_TRANSFER_CANCELLED)
@@ -2273,6 +2281,7 @@ usb_bulk_transfer(struct libusb_device_handle *dev_handle, int intinfo,
USBDEBUG("USB debug: @usb_bulk_transfer(%s (nodev=%s),intinfo=%d,epinfo=%d,data=%p,length=%d,timeout=%u,mode=%d,cmd=%s,seq=%d) endpoint=%d", cgpu->drv->name, bool_str(cgpu->usbinfo.nodev), intinfo, epinfo, data, length, timeout, mode, usb_cmdname(cmd), seq, (int)endpoint);
init_usb_transfer(&ut);
+ mutex_lock(&ut.mutex);
/* We give the transfer no timeout since we manage timeouts ourself */
libusb_fill_bulk_transfer(ut.transfer, dev_handle, endpoint, buf, length,
transfer_callback, &ut, 0);
@@ -2705,6 +2714,7 @@ static int usb_control_transfer(libusb_device_handle *dev_handle, uint8_t bmRequ
int err, transferred;
init_usb_transfer(&ut);
+ mutex_lock(&ut.mutex);
libusb_fill_control_setup(buf, bmRequestType, bRequest, wValue,
wIndex, wLength);
libusb_fill_control_transfer(ut.transfer, dev_handle, buf, transfer_callback,