Changeset 37466 in vbox for trunk/src/VBox/Devices/Serial

Timestamp:

Jun 15, 2011 12:44:16 PM (14 years ago)

Author:

vboxsync

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

72280

Message:

VMM,Devices: Automatically use a per-device lock instead of the giant IOM lock. With exception of the PIC, APIC, IOAPIC and PCI buses which are all using the PDM crit sect, there should be no calls between devices. So, this change should be relatively safe.

File:

• trunk/src/VBox/Devices/Serial/DevSerial.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Serial/DevSerial.cpp

@@ -1190 +1190 @@
 
     /*
-     * We have a critical section make TM and IOM take it for callbacks.
-     */
-    pDevIns->pCritSectR3 = &pThis->CritSect;
-
-    /*
      * Validate and read the configuration.
      */
@@ -1270 +1265 @@
 
     /*
-     * Initialize critical section and the semaphore.
-     * This must of be done before attaching drivers or doing anything else
-     * which can call us back.
+     * Initialize critical section and the semaphore.  Change the default
+     * critical section to ours so that TM and IOM will enter it before
+     * calling us.
+     *
+     * Note! This must of be done BEFORE creating timers, registering I/O ports
+     *       and other things which might pick up the default CS or end up
+     *       calling back into the device.
      */
-    rc = PDMDevHlpCritSectInit(pDevIns, &pThis->CritSect, RT_SRC_POS, "Serial#%d", iInstance);
-    if (RT_FAILURE(rc))
-        return rc;
+    rc = PDMDevHlpCritSectInit(pDevIns, &pThis->CritSect, RT_SRC_POS, "Serial#%u", iInstance);
+    AssertRCReturn(rc, rc);
+
+    rc = PDMDevHlpSetDeviceCritSect(pDevIns, &pThis->CritSect);
+    AssertRCReturn(rc, rc);
 
     rc = RTSemEventCreate(&pThis->ReceiveSem);
     AssertRCReturn(rc, rc);
 
+    /*
+     * Create the timers.
+     */
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, serialFifoTimer, pThis,
                                 TMTIMER_FLAGS_DEFAULT_CRIT_SECT, "Serial Fifo Timer",