Changeset 28265 in vbox for trunk/src/VBox

Timestamp:

Apr 13, 2010 4:02:10 PM (15 years ago)

Author:

vboxsync

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

60007

Message:

PDMThread: serialize list manipulations using ListCritSect.

Location:

trunk/src/VBox/VMM

Files:

• PDMInternal.h (modified) (2 diffs)
• PDMThread.cpp (modified) (16 diffs)

trunk/src/VBox/VMM/PDMInternal.h

@@ -1026 +1026 @@
     R3PTRTYPE(struct PDMQUEUE *)    pQueuesForced;
 
-    /** Head of the PDM Thread list. (singly linked) */
-    R3PTRTYPE(PPDMTHREAD)           pThreads;
-    /** Tail of the PDM Thread list. (singly linked) */
-    R3PTRTYPE(PPDMTHREAD)           pThreadsTail;
-
     /** Lock protecting the lists below it. */
     RTCRITSECT                      ListCritSect;
@@ -1037 +1032 @@
     /** List of initialized critical sections. (LIFO) */
     R3PTRTYPE(PPDMCRITSECTINT)      pCritSects;
+    /** Head of the PDM Thread list. (singly linked) */
+    R3PTRTYPE(PPDMTHREAD)           pThreads;
+    /** Tail of the PDM Thread list. (singly linked) */
+    R3PTRTYPE(PPDMTHREAD)           pThreadsTail;
 
     /** @name   PDM Async Completion

trunk/src/VBox/VMM/PDMThread.cpp

@@ -166 +166 @@
                      * Insert it into the thread list.
                      */
+                    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
                     pThread->Internal.s.pNext = NULL;
                     if (pUVM->pdm.s.pThreadsTail)
@@ -172 +173 @@
                         pUVM->pdm.s.pThreads = pThread;
                     pUVM->pdm.s.pThreadsTail = pThread;
+                    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
 
                     rc = RTThreadUserReset(Thread);
@@ -432 +434 @@
 
         /* unlink */
+        RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
         if (pUVM->pdm.s.pThreads == pThread)
         {
@@ -450 +453 @@
         }
         pThread->Internal.s.pNext = NULL;
+        RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
 
         /* free the resources */
@@ -483 +487 @@
 
     AssertPtr(pDevIns);
+
+    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
     PPDMTHREAD pThread = pUVM->pdm.s.pThreads;
     while (pThread)
@@ -496 +502 @@
         pThread = pNext;
     }
-
+    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
     return rc;
 }
@@ -516 +522 @@
 
     AssertPtr(pUsbIns);
+
+    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
     PPDMTHREAD pThread = pUVM->pdm.s.pThreads;
     while (pThread)
@@ -529 +537 @@
         pThread = pNext;
     }
-
+    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
     return rc;
 }
@@ -549 +557 @@
 
     AssertPtr(pDrvIns);
+
+    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
     PPDMTHREAD pThread = pUVM->pdm.s.pThreads;
     while (pThread)
@@ -562 +572 @@
         pThread = pNext;
     }
-
+    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
     return rc;
 }
@@ -574 +584 @@
 void pdmR3ThreadDestroyAll(PVM pVM)
 {
-    PUVM        pUVM    = pVM->pUVM;
-    PPDMTHREAD  pThread = pUVM->pdm.s.pThreads;
+    PUVM pUVM = pVM->pUVM;
+    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
+    PPDMTHREAD pThread = pUVM->pdm.s.pThreads;
     while (pThread)
     {
@@ -584 +595 @@
     }
     Assert(!pUVM->pdm.s.pThreads && !pUVM->pdm.s.pThreadsTail);
+    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
 }
 
@@ -959 +971 @@
 int pdmR3ThreadSuspendAll(PVM pVM)
 {
-    for (PPDMTHREAD pThread = pVM->pUVM->pdm.s.pThreads; pThread; pThread = pThread->Internal.s.pNext)
+    PUVM pUVM = pVM->pUVM;
+    RTCritSectEnter(&pUVM->pdm.s.ListCritSect); /* This may cause deadlocks later... */
+    for (PPDMTHREAD pThread = pUVM->pdm.s.pThreads; pThread; pThread = pThread->Internal.s.pNext)
         switch (pThread->enmState)
         {
@@ -977 +991 @@
                 break;
         }
+    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
     return VINF_SUCCESS;
 }
@@ -1048 +1063 @@
 int pdmR3ThreadResumeAll(PVM pVM)
 {
-    for (PPDMTHREAD pThread = pVM->pUVM->pdm.s.pThreads; pThread; pThread = pThread->Internal.s.pNext)
+    PUVM pUVM = pVM->pUVM;
+    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
+    for (PPDMTHREAD pThread = pUVM->pdm.s.pThreads; pThread; pThread = pThread->Internal.s.pNext)
         switch (pThread->enmState)
         {
@@ -1062 +1079 @@
                 break;
         }
+    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
     return VINF_SUCCESS;
 }