Changeset 25604 in vbox

Timestamp:

Dec 31, 2009 2:25:17 AM (15 years ago)

Author:

vboxsync

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

56295

Message:

iprt: More deadlock hacking.

Location:

trunk/src/VBox/Runtime

Files:

• common/misc/lockvalidator.cpp (modified) (3 diffs)
• generic/critsect-generic.cpp (modified) (1 diff)
• r3/linux/semmutex-linux.cpp (modified) (1 diff)
• r3/posix/semmutex-posix.cpp (modified) (1 diff)
• r3/posix/semrw-posix.cpp (modified) (1 diff)
• r3/win/semmutex-win.cpp (modified) (1 diff)
• testcase/tstDeadlock.cpp (modified) (1 diff)

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

@@ -251 +251 @@
         RTAssertMsg1Weak("RTLockValidator", pSrcPos->uLine, pSrcPos->pszFile, pSrcPos->pszFunction);
         if (pSrcPos->uId)
-            RTAssertMsg2Weak("%s  [uId=%p thrd=%s]\n", pszWhat, pSrcPos->uId, VALID_PTR(pThreadSelf) ? pThreadSelf->szName : "<NIL>");
+            RTAssertMsg2Weak("%s  [uId=%p  thrd=%s]\n", pszWhat, pSrcPos->uId, VALID_PTR(pThreadSelf) ? pThreadSelf->szName : "<NIL>");
         else
             RTAssertMsg2Weak("%s\n", pszWhat, pSrcPos->uId);
@@ -1444 +1444 @@
  *
  * @param   pStack          The chain of locks causing the deadlock.
+ * @param   pRec            The record relating to the current thread's lock
+ *                          operation.
  * @param   pThreadSelf     This thread.
  * @param   pSrcPos         Where we are going to deadlock.
  * @param   rc              The return code.
  */
-static void rcLockValidatorDoDeadlockComplaining(PRTLOCKVALIDATORDDSTACK pStack, PRTTHREADINT pThreadSelf,
-                                                 PCRTLOCKVALIDATORSRCPOS pSrcPos, int rc)
+static void rcLockValidatorDoDeadlockComplaining(PRTLOCKVALIDATORDDSTACK pStack, PRTLOCKVALIDATORRECUNION pRec,
+                                                 PRTTHREADINT pThreadSelf, PCRTLOCKVALIDATORSRCPOS pSrcPos, int rc)
 {
     if (!ASMAtomicUoReadBool(&g_fLockValidatorQuiet))
     {
         rtLockValidatorComplainFirst(  rc == VERR_SEM_LV_DEADLOCK
-                                     ? "deadlock"
+                                     ? "Detected deadlock!"
                                      : rc == VERR_SEM_LV_EXISTING_DEADLOCK
-                                     ? "existing-deadlock"
+                                     ? "Found existing deadlock!"
                                      : "!unexpected rc!",
-                                     pSrcPos, pThreadSelf, NULL);
-        rtLockValidatorComplainMore("---- start of %u entry deadlock chain ----\n", pStack->c);
+                                     pSrcPos,
+                                     pThreadSelf,
+                                     pStack->a[0].pRec != pRec ? pRec : NULL);
+        rtLockValidatorComplainMore("---- start of deadlock chain - %u entries ----\n", pStack->c);
         for (uint32_t i = 0; i < pStack->c; i++)
         {
             char szPrefix[24];
-            RTStrPrintf(szPrefix, sizeof(szPrefix), "#%u: ", i);
+            RTStrPrintf(szPrefix, sizeof(szPrefix), "#%02u: ", i);
             PRTLOCKVALIDATORSHAREDONE pSharedOne = NULL;
             if (pStack->a[i].pRec->Core.u32Magic == RTLOCKVALIDATORSHARED_MAGIC)
@@ -1514 +1518 @@
     }
 
-    rcLockValidatorDoDeadlockComplaining(&Stack, pThreadSelf, pSrcPos, rc);
+    rcLockValidatorDoDeadlockComplaining(&Stack, pRec, pThreadSelf, pSrcPos, rc);
     return rc;
 #else

trunk/src/VBox/Runtime/generic/critsect-generic.cpp

@@ -69 +69 @@
     pCritSect->cLockers             = -1;
     pCritSect->NativeThreadOwner    = NIL_RTNATIVETHREAD;
-    int rc = RTLockValidatorRecCreate(&pCritSect->pValidatorRec, NIL_RTLOCKVALIDATORCLASS, 0, NULL, pCritSect);
+    int rc = RTLockValidatorRecCreate(&pCritSect->pValidatorRec, NIL_RTLOCKVALIDATORCLASS, 0, "RTCritSect", pCritSect);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Runtime/r3/linux/semmutex-linux.cpp

@@ -120 +120 @@
         pThis->cNesting = 0;
 #ifdef RTSEMMUTEX_STRICT
-        RTLockValidatorRecInit(&pThis->ValidatorRec, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, NULL, pThis);
+        RTLockValidatorRecInit(&pThis->ValidatorRec, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemMutex", pThis);
 #endif
 

trunk/src/VBox/Runtime/r3/posix/semmutex-posix.cpp

@@ -102 +102 @@
                 pThis->u32Magic = RTSEMMUTEX_MAGIC;
 #ifdef RTSEMMUTEX_STRICT
-                RTLockValidatorRecInit(&pThis->ValidatorRec, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, NULL, pThis);
+                RTLockValidatorRecInit(&pThis->ValidatorRec, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemMutex", pThis);
 #endif
 

trunk/src/VBox/Runtime/r3/posix/semrw-posix.cpp

@@ -119 +119 @@
                 pThis->Writer       = (pthread_t)-1;
 #ifdef RTSEMRW_STRICT
-                RTLockValidatorRecInit(&pThis->ValidatorWrite, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, NULL, pThis);
-                RTLockValidatorSharedRecInit(&pThis->ValidatorRead,  NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, NULL, pThis);
+                RTLockValidatorRecInit(&pThis->ValidatorWrite, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemRW", pThis);
+                RTLockValidatorSharedRecInit(&pThis->ValidatorRead,  NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemRW", pThis);
                 RTLockValidatorMakeSiblings(&pThis->ValidatorWrite.Core, &pThis->ValidatorRead.Core);
 #endif

trunk/src/VBox/Runtime/r3/win/semmutex-win.cpp

@@ -87 +87 @@
             pThis->hMtx = hMtx;
 #ifdef RTSEMMUTEX_STRICT
-            RTLockValidatorRecInit(&pThis->ValidatorRec,  NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, NULL, pThis);
+            RTLockValidatorRecInit(&pThis->ValidatorRec,  NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemMutex", pThis);
 #endif
             *pMutexSem = pThis;

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

@@ -136 +136 @@
     for (i = 0; i < cThreads && RT_SUCCESS(rc); i++)
         RTTEST_CHECK_RC_OK(g_hTest, rc = RTThreadCreateF(&g_ahThreads[i], test1Thread, (void *)(uintptr_t)i, 0,
-                                                         RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, "test1-%u", i));
+                                                         RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, "test1-%02u", i));
     if (RT_SUCCESS(rc))
     {