summaryrefslogtreecommitdiff
path: root/libusb/libusbi.h
diff options
context:
space:
mode:
authorToby Gray <toby.gray@realvnc.com>2012-05-03 11:25:11 +0100
committerPete Batard <pete@akeo.ie>2012-05-03 21:54:07 +0100
commit1ed09c7b2a5fc27c3cfea21740584879781bff67 (patch)
tree621da73f9bdf7c4f2df10583ab109c14665d8fb4 /libusb/libusbi.h
parent939a4782b28c36dfddb68585c4b027a4d5494a5b (diff)
downloadlibusbx-1ed09c7b2a5fc27c3cfea21740584879781bff67.tar.gz
Windows: Fix deadlock in backend when submitting transfers.
Without this change the Windows backend needed to call usbi_fd_notification() from within the backend's submit_transfer. This can cause deadlock when attempting to lock the event lock if another thread was processing events on the just-submitted transfer. The deadlock comes about as the thread calling libusb_submit_transfer acquires the transfer mutex before trying to acquire the event lock; this is the other order of lock acquisition from an event thread handling activity on the just submitted transfer. This could lead to one of two deadlocks: 1) If the transfer completes while usbi_fd_notification() is waiting for the event lock and the callback attempts to resubmit the transfer. 2) If the transfer timeout is hit while usbi_fd_notification() is waiting for the event lock then the attempt to cancel the transfer will deadlock. This patch fixes both of these deadlocks by having libusb_submit_transfer() only call usbi_fd_notification() after having released the transfer mutex.
Diffstat (limited to 'libusb/libusbi.h')
-rw-r--r--libusb/libusbi.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/libusb/libusbi.h b/libusb/libusbi.h
index c3d2158..0aa6bf9 100644
--- a/libusb/libusbi.h
+++ b/libusb/libusbi.h
@@ -347,6 +347,9 @@ enum usbi_transfer_flags {
/* Operation on the transfer failed because the device disappeared */
USBI_TRANSFER_DEVICE_DISAPPEARED = 1 << 3,
+
+ /* Set by backend submit_transfer() if the fds in use have been updated */
+ USBI_TRANSFER_UPDATED_FDS = 1 << 4,
};
#define USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer) \