Changeset 25436 in vbox

Timestamp:

Dec 16, 2009 3:22:40 PM (15 years ago)

Author:

vboxsync

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

56085

Message:

RTLockValidator,RTThread: Serialize deadlock detection and RTTHREAD/RTLOCKVALIDATORREC destruction.

Location:

trunk/src/VBox/Runtime

Files:

• common/misc/lockvalidator.cpp (modified) (6 diffs)
• common/misc/thread.cpp (modified) (1 diff)
• include/internal/lockvalidator.h (modified) (1 diff)
• testcase/tstRTSemXRoads.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/misc/lockvalidator.cpp

@@ -56 +56 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-
+/** Serializing object destruction and deadlock detection.
+ * NS: RTLOCKVALIDATORREC and RTTHREADINT destruction.
+ * EW: Deadlock detection.
+ */
+static RTSEMXROADS g_hLockValidatorXRoads = NIL_RTSEMXROADS;
+
+
+
+/**
+ * Serializes destruction of RTLOCKVALIDATORREC and RTTHREADINT structures.
+ */
+DECLHIDDEN(void) rtLockValidatorSerializeDestructEnter(void)
+{
+    RTSEMXROADS hXRoads = g_hLockValidatorXRoads;
+    if (hXRoads != NIL_RTSEMXROADS)
+        RTSemXRoadsNSEnter(hXRoads);
+}
+
+
+/**
+ * Call after rtLockValidatorSerializeDestructEnter.
+ */
+DECLHIDDEN(void) rtLockValidatorSerializeDestructLeave(void)
+{
+    RTSEMXROADS hXRoads = g_hLockValidatorXRoads;
+    if (hXRoads != NIL_RTSEMXROADS)
+        RTSemXRoadsNSLeave(hXRoads);
+}
+
+
+/**
+ * Serializes deadlock detection against destruction of the objects being
+ * inspected.
+ */
+DECLINLINE(void) rtLockValidatorSerializeDetectionEnter(void)
+{
+    RTSEMXROADS hXRoads = g_hLockValidatorXRoads;
+    if (hXRoads != NIL_RTSEMXROADS)
+        RTSemXRoadsEWEnter(hXRoads);
+}
+
+
+/**
+ * Call after rtLockValidatorSerializeDetectionEnter.
+ */
+DECLHIDDEN(void) rtLockValidatorSerializeDetectionLeave(void)
+{
+    RTSEMXROADS hXRoads = g_hLockValidatorXRoads;
+    if (hXRoads != NIL_RTSEMXROADS)
+        RTSemXRoadsEWLeave(hXRoads);
+}
 
 
@@ -74 +124 @@
     pRec->hLock         = hLock;
     pRec->pszName       = pszName;
+
+    /* Lazily initialize the crossroads semaphore. */
+    static uint32_t volatile s_fInitializing = false;
+    if (RT_UNLIKELY(    g_hLockValidatorXRoads == NIL_RTSEMXROADS
+                    &&  ASMAtomicCmpXchgU32(&s_fInitializing, true, false)))
+    {
+        RTSEMXROADS hXRoads;
+        int rc = RTSemXRoadsCreate(&hXRoads);
+        if (RT_SUCCESS(rc))
+            ASMAtomicWriteHandle(&g_hLockValidatorXRoads, hXRoads);
+        ASMAtomicWriteU32(&s_fInitializing, false);
+    }
 }
 
 
 RTDECL(int)  RTLockValidatorCreate(PRTLOCKVALIDATORREC *ppRec, RTLOCKVALIDATORCLASS hClass,
-                                   uint32_t uSubClass, const char *pszName, void *pvLock)
+                                  uint32_t uSubClass, const char *pszName, void *pvLock)
 {
     PRTLOCKVALIDATORREC pRec;
@@ -95 +157 @@
     Assert(pRec->u32Magic == RTLOCKVALIDATORREC_MAGIC);
 
+    rtLockValidatorSerializeDestructEnter();
+
     ASMAtomicWriteU32(&pRec->u32Magic, RTLOCKVALIDATORREC_MAGIC_DEAD);
     ASMAtomicWriteHandle(&pRec->hThread, NIL_RTTHREAD);
     ASMAtomicWriteHandle(&pRec->hClass, NIL_RTLOCKVALIDATORCLASS);
+
+    rtLockValidatorSerializeDestructLeave();
 }
 
@@ -413 +479 @@
          * races on SMP boxes.
          */
+        rtLockValidatorSerializeDetectionEnter();
+
         PRTTHREADINT    pCur;
         unsigned        cPrevLength = ~0U;
@@ -466 +534 @@
                 pCur = pNext;
                 if (!pCur)
+                {
+                    rtLockValidatorSerializeDetectionLeave();
                     return;
+                }
 
                 /*
@@ -500 +571 @@
          */
         rtLockValidatorComplainAboutDeadlock(pRec, pThread, enmState, pCur, uId, RT_SRC_POS_ARGS);
+
+        rtLockValidatorSerializeDetectionLeave();
     }
 }

trunk/src/VBox/Runtime/common/misc/thread.cpp

@@ -577 +577 @@
         ASMAtomicDecU32(&pThread->cRefs);
     }
+
+    /*
+     * Invalidate the thread structure and free it.
+     */
+#ifdef IN_RING3
+    rtLockValidatorSerializeDestructEnter();
+#endif
+
     ASMAtomicXchgU32(&pThread->u32Magic, RTTHREADINT_MAGIC_DEAD);
-
-    /*
-     * Free resources.
-     */
     ASMAtomicWritePtr(&pThread->Core.Key, (void *)NIL_RTTHREAD);
-    pThread->enmType    = RTTHREADTYPE_INVALID;
-    RTSemEventMultiDestroy(pThread->EventUser);
-    pThread->EventUser  = NIL_RTSEMEVENTMULTI;
-    if (pThread->EventTerminated != NIL_RTSEMEVENTMULTI)
-    {
-        RTSemEventMultiDestroy(pThread->EventTerminated);
-        pThread->EventTerminated = NIL_RTSEMEVENTMULTI;
-    }
+    pThread->enmType         = RTTHREADTYPE_INVALID;
+    RTSEMEVENTMULTI hEvt1    = pThread->EventUser;
+    pThread->EventUser       = NIL_RTSEMEVENTMULTI;
+    RTSEMEVENTMULTI hEvt2    = pThread->EventTerminated;
+    pThread->EventTerminated = NIL_RTSEMEVENTMULTI;
+
     RTMemFree(pThread);
+
+#ifdef IN_RING3
+    rtLockValidatorSerializeDestructLeave();
+#endif
+
+    /*
+     * Destroy semaphore resources.
+     */
+    RTSemEventMultiDestroy(hEvt1);
+    if (hEvt2 != NIL_RTSEMEVENTMULTI)
+        RTSemEventMultiDestroy(hEvt2);
 }
 

trunk/src/VBox/Runtime/include/internal/lockvalidator.h

@@ -63 +63 @@
 } RTLOCKVALIDATORPERTHREAD;
 
+
+DECLHIDDEN(void)    rtLockValidatorSerializeDestructEnter(void);
+DECLHIDDEN(void)    rtLockValidatorSerializeDestructLeave(void);
+
 RT_C_DECLS_END
 

trunk/src/VBox/Runtime/testcase/tstRTSemXRoads.cpp

@@ -80 +80 @@
 }
 
+
 static DECLCALLBACK(int) tstTrafficNSThread(RTTHREAD hSelf, void *pvUser)
 {