Revert "Temporary workaround for event handling serialization issue"
authorDaniel Drake <dsd@gentoo.org>
Wed, 25 Jun 2008 02:31:13 +0000 (21:31 -0500)
committerDaniel Drake <dsd@gentoo.org>
Wed, 25 Jun 2008 02:31:13 +0000 (21:31 -0500)
This reverts commit 2d3a1111caff40ebb87983c861ff548cdc9e5946.
This was based on the assumption that dying threads would automatically
release mutexes, which is not the case.

libusb/io.c

index 9760432..5f3d617 100644 (file)
@@ -1196,21 +1196,7 @@ API_EXPORTED void libusb_unlock_events(void)
  */
 API_EXPORTED int libusb_event_handler_active(void)
 {
-       int r;
-
-       if (!event_handler_active)
-               return 0;
-
-       /* FIXME: temporary hack to ensure thread didn't quit (e.g. due to signal)
-        * without libusb_unlock_events being triggered */
-       r = pthread_mutex_trylock(&events_lock);
-       if (r == 0) {
-               event_handler_active = 0;
-               pthread_mutex_unlock(&events_lock);
-               return 0;
-       }
-
-       return 1;
+       return event_handler_active;
 }
 
 /** \ingroup poll