Changeset 25704 in vbox for trunk/src/VBox/Runtime/common/misc

Timestamp:

Jan 10, 2010 8:12:30 PM (15 years ago)

Author:

vboxsync

Message:

iprt,pdmcritsect: More flexible lock naming, added RTCritSectSetSubClass and made some RTCritSectInitEx.

File:

• trunk/src/VBox/Runtime/common/misc/lockvalidator.cpp (modified) (14 diffs)

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

@@ -509 +509 @@
 #else
             RTAssertMsg2AddWeak("%s%p %s own=%s nest=%u pos={%Rbn(%u) %Rfn %p}%s%s", pszPrefix,
-                                pRec->Excl.hLock, pRec->Excl.pszName,
+                                pRec->Excl.hLock, pRec->Excl.szName,
                                 rtLockValidatorNameThreadHandle(&pRec->Excl.hThread), cRecursion,
                                 pSrcPos->pszFile, pSrcPos->uLine, pSrcPos->pszFunction, pSrcPos->uId,
@@ -518 +518 @@
         case RTLOCKVALRECSHRD_MAGIC:
             RTAssertMsg2AddWeak("%s%p %s srec=%p%s", pszPrefix,
-                                pRec->Shared.hLock, pRec->Shared.pszName, pRec,
+                                pRec->Shared.hLock, pRec->Shared.szName, pRec,
                                 pszSuffix);
             break;
@@ -535 +535 @@
 #else
                 RTAssertMsg2AddWeak("%s%p %s thr=%s nest=%u pos={%Rbn(%u) %Rfn %p}%s%s", pszPrefix,
-                                    pShared->hLock, pShared->pszName,
+                                    pShared->hLock, pShared->szName,
                                     rtLockValidatorNameThreadHandle(&pRec->ShrdOwner.hThread), cRecursion,
                                     pSrcPos->pszFile, pSrcPos->uLine, pSrcPos->pszFunction, pSrcPos->uId,
@@ -1024 +1024 @@
 
 
-RTDECL(int) RTLockValidatorClassCreate(PRTLOCKVALCLASS phClass, bool fAutodidact, RT_SRC_POS_DECL)
+RTDECL(int) RTLockValidatorClassCreate(PRTLOCKVALCLASS phClass, bool fAutodidact, RT_SRC_POS_DECL, const char *pszNameFmt, ...)
 {
     RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_POS_NO_ID();
-    return RTLockValidatorClassCreateEx(phClass, &SrcPos,
-                                        fAutodidact, true /*fRecursionOk*/, false /*fStrictReleaseOrder*/,
-                                        1 /*cMsMinDeadlock*/, 1 /*cMsMinOrder*/,
-                                        NULL /*pszName*/);
+    va_list va;
+    va_start(va, pszNameFmt);
+    int rc = RTLockValidatorClassCreateExV(phClass, &SrcPos,
+                                           fAutodidact, true /*fRecursionOk*/, false /*fStrictReleaseOrder*/,
+                                           1 /*cMsMinDeadlock*/, 1 /*cMsMinOrder*/,
+                                           pszNameFmt, va);
+    va_end(va);
+    return rc;
 }
 
@@ -1456 +1460 @@
     {
         case RTLOCKVALRECEXCL_MAGIC:
-            return pRec->Excl.pszName;
+            return pRec->Excl.szName;
         case RTLOCKVALRECSHRD_MAGIC:
-            return pRec->Shared.pszName;
+            return pRec->Shared.szName;
         case RTLOCKVALRECSHRDOWN_MAGIC:
-            return pRec->ShrdOwner.pSharedRec ? pRec->ShrdOwner.pSharedRec->pszName : "orphaned";
+            return pRec->ShrdOwner.pSharedRec ? pRec->ShrdOwner.pSharedRec->szName : "orphaned";
         case RTLOCKVALRECNEST_MAGIC:
             pRec = rtLockValidatorReadRecUnionPtr(&pRec->Nest.pRec);
@@ -1468 +1472 @@
                 {
                     case RTLOCKVALRECEXCL_MAGIC:
-                        return pRec->Excl.pszName;
+                        return pRec->Excl.szName;
                     case RTLOCKVALRECSHRD_MAGIC:
-                        return pRec->Shared.pszName;
+                        return pRec->Shared.szName;
                     case RTLOCKVALRECSHRDOWN_MAGIC:
-                        return pRec->ShrdOwner.pSharedRec ? pRec->ShrdOwner.pSharedRec->pszName : "orphaned";
+                        return pRec->ShrdOwner.pSharedRec ? pRec->ShrdOwner.pSharedRec->szName : "orphaned";
                     default:
                         return "unknown-nested";
@@ -2798 +2802 @@
 
 
-RTDECL(void) RTLockValidatorRecExclInit(PRTLOCKVALRECEXCL pRec, RTLOCKVALCLASS hClass, uint32_t uSubClass,
-                                        const char *pszName, void *hLock, bool fEnabled)
+RTDECL(void) RTLockValidatorRecExclInitV(PRTLOCKVALRECEXCL pRec, RTLOCKVALCLASS hClass, uint32_t uSubClass,
+                                         void *hLock, bool fEnabled, const char *pszNameFmt, va_list va)
 {
     RTLOCKVAL_ASSERT_PTR_ALIGN(pRec);
@@ -2816 +2820 @@
     pRec->cRecursion    = 0;
     pRec->hLock         = hLock;
-    pRec->pszName       = pszName;
     pRec->pSibling      = NULL;
+    if (pszNameFmt)
+        RTStrPrintfV(pRec->szName, sizeof(pRec->szName), pszNameFmt, va);
+    else
+    {
+        static uint32_t volatile s_cAnonymous = 0;
+        uint32_t i = ASMAtomicIncU32(&s_cAnonymous) - 1;
+        RTStrPrintf(pRec->szName, sizeof(pRec->szName), "anon-excl-%u", i);
+    }
 
     /* Lazy initialization. */
@@ -2825 +2836 @@
 
 
-RTDECL(int)  RTLockValidatorRecExclCreate(PRTLOCKVALRECEXCL *ppRec, RTLOCKVALCLASS hClass,
-                                          uint32_t uSubClass, const char *pszName, void *pvLock, bool fEnabled)
+RTDECL(void) RTLockValidatorRecExclInit(PRTLOCKVALRECEXCL pRec, RTLOCKVALCLASS hClass, uint32_t uSubClass,
+                                        void *hLock, bool fEnabled, const char *pszNameFmt, ...)
+{
+    va_list va;
+    va_start(va, pszNameFmt);
+    RTLockValidatorRecExclInitV(pRec, hClass, uSubClass, hLock, fEnabled, pszNameFmt, va);
+    va_end(va);
+}
+
+
+RTDECL(int)  RTLockValidatorRecExclCreateV(PRTLOCKVALRECEXCL *ppRec, RTLOCKVALCLASS hClass,
+                                           uint32_t uSubClass, void *pvLock, bool fEnabled,
+                                           const char *pszNameFmt, va_list va)
 {
     PRTLOCKVALRECEXCL pRec;
@@ -2832 +2854 @@
     if (!pRec)
         return VERR_NO_MEMORY;
-
-    RTLockValidatorRecExclInit(pRec, hClass, uSubClass, pszName, pvLock, fEnabled);
-
+    RTLockValidatorRecExclInitV(pRec, hClass, uSubClass, pvLock, fEnabled, pszNameFmt, va);
     return VINF_SUCCESS;
+}
+
+
+RTDECL(int)  RTLockValidatorRecExclCreate(PRTLOCKVALRECEXCL *ppRec, RTLOCKVALCLASS hClass,
+                                          uint32_t uSubClass, void *pvLock, bool fEnabled,
+                                          const char *pszNameFmt, ...)
+{
+    va_list va;
+    va_start(va, pszNameFmt);
+    int rc = RTLockValidatorRecExclCreateV(ppRec, hClass, uSubClass, pvLock, fEnabled, pszNameFmt, va);
+    va_end(va);
+    return rc;
 }
 
@@ -2866 +2898 @@
         RTMemFree(pRec);
     }
+}
+
+
+RTDECL(uint32_t) RTLockValidatorRecExclSetSubClass(PRTLOCKVALRECEXCL pRec, uint32_t uSubClass)
+{
+    AssertPtrReturn(pRec, RTLOCKVAL_SUB_CLASS_INVALID);
+    AssertReturn(pRec->Core.u32Magic == RTLOCKVALRECEXCL_MAGIC, RTLOCKVAL_SUB_CLASS_INVALID);
+    AssertReturn(   uSubClass >= RTLOCKVAL_SUB_CLASS_USER
+                 || uSubClass == RTLOCKVAL_SUB_CLASS_NONE
+                 || uSubClass == RTLOCKVAL_SUB_CLASS_ANY,
+                 RTLOCKVAL_SUB_CLASS_INVALID);
+    return ASMAtomicXchgU32(&pRec->uSubClass, uSubClass);
 }
 
@@ -3180 +3224 @@
 
 
-RTDECL(void) RTLockValidatorRecSharedInit(PRTLOCKVALRECSHRD pRec, RTLOCKVALCLASS hClass, uint32_t uSubClass,
-                                          const char *pszName, void *hLock, bool fSignaller, bool fEnabled)
+RTDECL(void) RTLockValidatorRecSharedInitV(PRTLOCKVALRECSHRD pRec, RTLOCKVALCLASS hClass, uint32_t uSubClass,
+                                           void *hLock, bool fSignaller, bool fEnabled, const char *pszNameFmt, va_list va)
 {
     RTLOCKVAL_ASSERT_PTR_ALIGN(pRec);
@@ -3190 +3234 @@
     pRec->hClass        = rtLockValidatorClassValidateAndRetain(hClass);
     pRec->hLock         = hLock;
-    pRec->pszName       = pszName;
     pRec->fEnabled      = fEnabled && RTLockValidatorIsEnabled();
     pRec->fSignaller    = fSignaller;
@@ -3202 +3245 @@
     pRec->fPadding      = false;
     pRec->papOwners     = NULL;
-#if HC_ARCH_BITS == 32
-    pRec->u32Alignment  = UINT32_MAX;
-#endif
+
+    /* the name */
+    if (pszNameFmt)
+        RTStrPrintfV(pRec->szName, sizeof(pRec->szName), pszNameFmt, va);
+    else
+    {
+        static uint32_t volatile s_cAnonymous = 0;
+        uint32_t i = ASMAtomicIncU32(&s_cAnonymous) - 1;
+        RTStrPrintf(pRec->szName, sizeof(pRec->szName), "anon-shrd-%u", i);
+    }
+}
+
+
+RTDECL(void) RTLockValidatorRecSharedInit(PRTLOCKVALRECSHRD pRec, RTLOCKVALCLASS hClass, uint32_t uSubClass,
+                                          void *hLock, bool fSignaller, bool fEnabled, const char *pszNameFmt, ...)
+{
+    va_list va;
+    va_start(va, pszNameFmt);
+    RTLockValidatorRecSharedInitV(pRec, hClass, uSubClass, hLock, fSignaller, fEnabled, pszNameFmt, va);
+    va_end(va);
 }