Changeset 41528 in vbox for trunk/src/VBox/Main/src-server/os2

Timestamp:

May 31, 2012 4:48:33 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

78291

Message:

Main/HostUSBDevice(all platforms)+USBProxyService: redo USB locking, fixes major regression, added lots of assertions to catch locking flaws early, whitespace cleanup
Main/Machine: small USB locking fix to be consistent with the remaining code
Main/Host+glue/AutoLock: replace USB list lock by host lock, small numbering cleanup
Main/Console: redo USB locking, do less in USB callbacks/EMT (addresses long standing todo items), eliminate unsafe iterator parameters

File:

• trunk/src/VBox/Main/src-server/os2/USBProxyServiceOs2.cpp (modified) (13 diffs)

trunk/src/VBox/Main/src-server/os2/USBProxyServiceOs2.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2005-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -38 +38 @@
  * Initialize data members.
  */
-USBProxyServiceOs2::USBProxyServiceOs2 (Host *aHost)
-    : USBProxyService (aHost), mhev (NULLHANDLE), mhmod (NULLHANDLE),
-    mpfnUsbRegisterChangeNotification (NULL), mpfnUsbDeregisterNotification (NULL),
-    mpfnUsbQueryNumberDevices (NULL), mpfnUsbQueryDeviceReport (NULL)
+USBProxyServiceOs2::USBProxyServiceOs2(Host *aHost)
+    : USBProxyService(aHost), mhev(NULLHANDLE), mhmod(NULLHANDLE),
+    mpfnUsbRegisterChangeNotification(NULL), mpfnUsbDeregisterNotification(NULL),
+    mpfnUsbQueryNumberDevices(NULL), mpfnUsbQueryDeviceReport(NULL)
 {
     LogFlowThisFunc(("aHost=%p\n", aHost));
@@ -48 +48 @@
      * Try initialize the usbcalls stuff.
      */
-    int rc = DosCreateEventSem (NULL, &mhev, 0, FALSE);
-    rc = RTErrConvertFromOS2 (rc);
+    int rc = DosCreateEventSem(NULL, &mhev, 0, FALSE);
+    rc = RTErrConvertFromOS2(rc);
     if (RT_SUCCESS(rc))
     {
-        rc = DosLoadModule (NULL, 0, (PCSZ)"usbcalls", &mhmod);
-        rc = RTErrConvertFromOS2 (rc);
+        rc = DosLoadModule(NULL, 0, (PCSZ)"usbcalls", &mhmod);
+        rc = RTErrConvertFromOS2(rc);
         if (RT_SUCCESS(rc))
         {
-            if (    (rc = DosQueryProcAddr (mhmod, 0, (PCSZ)"UsbQueryNumberDevices",            (PPFN)&mpfnUsbQueryNumberDevices))          == NO_ERROR
-                &&  (rc = DosQueryProcAddr (mhmod, 0, (PCSZ)"UsbQueryDeviceReport",             (PPFN)&mpfnUsbQueryDeviceReport))           == NO_ERROR
-                &&  (rc = DosQueryProcAddr (mhmod, 0, (PCSZ)"UsbRegisterChangeNotification",    (PPFN)&mpfnUsbRegisterChangeNotification))  == NO_ERROR
-                &&  (rc = DosQueryProcAddr (mhmod, 0, (PCSZ)"UsbDeregisterNotification",        (PPFN)&mpfnUsbDeregisterNotification))      == NO_ERROR
+            if (    (rc = DosQueryProcAddr(mhmod, 0, (PCSZ)"UsbQueryNumberDevices",         (PPFN)&mpfnUsbQueryNumberDevices))          == NO_ERROR
+                &&  (rc = DosQueryProcAddr(mhmod, 0, (PCSZ)"UsbQueryDeviceReport",          (PPFN)&mpfnUsbQueryDeviceReport))           == NO_ERROR
+                &&  (rc = DosQueryProcAddr(mhmod, 0, (PCSZ)"UsbRegisterChangeNotification", (PPFN)&mpfnUsbRegisterChangeNotification))  == NO_ERROR
+                &&  (rc = DosQueryProcAddr(mhmod, 0, (PCSZ)"UsbDeregisterNotification",     (PPFN)&mpfnUsbDeregisterNotification))      == NO_ERROR
                )
             {
-                rc = mpfnUsbRegisterChangeNotification (&mNotifyId, mhev, mhev);
+                rc = mpfnUsbRegisterChangeNotification(&mNotifyId, mhev, mhev);
                 if (!rc)
                 {
@@ -77 +77 @@
                 }
 
-                LogRel (("USBProxyServiceOs2: failed to register change notification, rc=%d\n", rc));
+                LogRel(("USBProxyServiceOs2: failed to register change notification, rc=%d\n", rc));
             }
             else
-                LogRel (("USBProxyServiceOs2: failed to load usbcalls\n"));
-
-            DosFreeModule (mhmod);
+                LogRel(("USBProxyServiceOs2: failed to load usbcalls\n"));
+
+            DosFreeModule(mhmod);
         }
         else
-            LogRel (("USBProxyServiceOs2: failed to load usbcalls, rc=%d\n", rc));
+            LogRel(("USBProxyServiceOs2: failed to load usbcalls, rc=%d\n", rc));
         mhmod = NULLHANDLE;
     }
@@ -115 +115 @@
     {
         if (mpfnUsbDeregisterNotification)
-            mpfnUsbDeregisterNotification (mNotifyId);
+            mpfnUsbDeregisterNotification(mNotifyId);
 
         mpfnUsbRegisterChangeNotification = NULL;
@@ -122 +122 @@
         mpfnUsbQueryDeviceReport = NULL;
 
-        DosFreeModule (mhmod);
+        DosFreeModule(mhmod);
         mhmod = NULLHANDLE;
     }
@@ -128 +128 @@
 
 
-int USBProxyServiceOs2::captureDevice (HostUSBDevice *aDevice)
-{
-    Log (("USBProxyServiceOs2::captureDevice: %p\n", aDevice));
+int USBProxyServiceOs2::captureDevice(HostUSBDevice *aDevice)
+{
     AssertReturn(aDevice, VERR_GENERAL_FAILURE);
-    AssertReturn(aDevice->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
+    AssertReturn(!aDevice->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
+
+    AutoReadLock devLock(aDevice COMMA_LOCKVAL_SRC_POS);
+    LogFlowThisFunc(("aDevice=%s\n", aDevice->getName().c_str()));
 
     /*
@@ -138 +140 @@
      */
     Assert(aDevice->isStatePending());
+    devLock.release();
     interruptWait();
 
@@ -144 +147 @@
 
 
-int USBProxyServiceOs2::releaseDevice (HostUSBDevice *aDevice)
-{
-    Log (("USBProxyServiceOs2::releaseDevice: %p\n", aDevice));
+int USBProxyServiceOs2::releaseDevice(HostUSBDevice *aDevice)
+{
     AssertReturn(aDevice, VERR_GENERAL_FAILURE);
-    AssertReturn(aDevice->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
+    AssertReturn(!aDevice->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
+
+    AutoReadLock devLock(aDevice COMMA_LOCKVAL_SRC_POS);
+    LogFlowThisFunc(("aDevice=%s\n", aDevice->getName().c_str()));
 
     /*
@@ -154 +159 @@
      */
     Assert(aDevice->isStatePending());
+    devLock.release();
     interruptWait();
 
@@ -162 +168 @@
 bool USBProxyServiceOs2::updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters, SessionMachine **aIgnoreMachine)
 {
+    AssertReturn(aDevice, false);
+    AssertReturn(!aDevice->isWriteLockOnCurrentThread(), false);
     return updateDeviceStateFake(aDevice, aUSBDevice, aRunFilters, aIgnoreMachine);
 }
@@ -174 +182 @@
 
 
-int USBProxyServiceOs2::interruptWait (void)
-{
-    int rc = DosPostEventSem (mhev);
+int USBProxyServiceOs2::interruptWait(void)
+{
+    int rc = DosPostEventSem(mhev);
     return rc == NO_ERROR || rc == ERROR_ALREADY_POSTED
          ? VINF_SUCCESS
-         : RTErrConvertFromOS2 (rc);
+         : RTErrConvertFromOS2(rc);
 }
 
 #include <stdio.h>
 
-PUSBDEVICE USBProxyServiceOs2::getDevices (void)
+PUSBDEVICE USBProxyServiceOs2::getDevices(void)
 {
     /*
@@ -190 +198 @@
      */
     ULONG cDevices = 0;
-    int rc = mpfnUsbQueryNumberDevices ((PULONG)&cDevices); /* Thanks to com/xpcom, PULONG and ULONG * aren't the same. */
+    int rc = mpfnUsbQueryNumberDevices((PULONG)&cDevices); /* Thanks to com/xpcom, PULONG and ULONG * aren't the same. */
     if (rc)
         return NULL;