Changeset 2a72f38548208044dc3aa62681419d006c35732d in libusb

Timestamp:

02/15/10 21:07:44 (7 months ago)

Author:

Daniel Drake <dan@…>

Children:

161893cfbefefe315f657677705abe090fc526f2

Parents:

a4186794d87124503db2f5f51f51ce90bb95daa7

git-author:

Nathan Hjelm <hjelmn@mac.com> / 2010-02-15T14:07:44Z-0600

git-committer:

Daniel Drake <dan@reactivated.net> / 2010-02-15T14:07:44Z-0600

Message:

Darwin: support multiple calls to libusb_init

Credit to Orin Eman for finding this bug.

File:

• libusb/os/darwin_usb.c (modified) (3 diffs)

libusb/os/darwin_usb.c

@@ -45 +45 @@
 static mach_port_t  libusb_darwin_mp = 0; /* master port */
 static CFRunLoopRef libusb_darwin_acfl = NULL; /* async cf loop */
+static int initCount = 0;
 
 /* async event thread */
@@ -310 +311 @@
   IOReturn kresult;
 
-  /* Create the master port for talking to IOKit */
-  if (!libusb_darwin_mp) {
-    kresult = IOMasterPort (MACH_PORT_NULL, &libusb_darwin_mp);
-
-    if (kresult != kIOReturnSuccess || !libusb_darwin_mp)
-      return darwin_to_libusb (kresult);
-  }
-
-  pthread_create (&libusb_darwin_at, NULL, event_thread_main, (void *)ctx);
-
-  while (!libusb_darwin_acfl)
-    usleep (10);
+  if (!(initCount++)) {
+    /* Create the master port for talking to IOKit */
+    if (!libusb_darwin_mp) {
+      kresult = IOMasterPort (MACH_PORT_NULL, &libusb_darwin_mp);
+
+      if (kresult != kIOReturnSuccess || !libusb_darwin_mp)
+        return darwin_to_libusb (kresult);
+    }
+
+    pthread_create (&libusb_darwin_at, NULL, event_thread_main, (void *)ctx);
+
+    while (!libusb_darwin_acfl)
+      usleep (10);
+  }
 
   return 0;
@@ -327 +330 @@
 
 static void darwin_exit (void) {
-  void *ret;
-
-  /* stop the async runloop */
-  CFRunLoopStop (libusb_darwin_acfl);
-  pthread_join (libusb_darwin_at, &ret);
-
-  if (libusb_darwin_mp)
-    mach_port_deallocate(mach_task_self(), libusb_darwin_mp);
-
-  libusb_darwin_mp = 0;
+  if (!(--initCount)) {
+    void *ret;
+
+    /* stop the async runloop */
+    CFRunLoopStop (libusb_darwin_acfl);
+    pthread_join (libusb_darwin_at, &ret);
+
+    if (libusb_darwin_mp)
+      mach_port_deallocate(mach_task_self(), libusb_darwin_mp);
+
+    libusb_darwin_mp = 0;
+  }
 }