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

Timestamp:

Dec 31, 2009 1:41:35 PM (15 years ago)

Author:

vboxsync

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

56300

Message:

lockvalidator.*: some more cleanup.

File:

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

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

@@ -212 +212 @@
             case RTLOCKVALRECSHRDOWN_MAGIC:
             {
-                PRTLOCKVALRECSHRD pShared = pRec->SharedOwn.pSharedRec;
+                PRTLOCKVALRECSHRD pShared = pRec->ShrdOwner.pSharedRec;
                 if (    VALID_PTR(pShared)
                     &&  pShared->Core.u32Magic == RTLOCKVALRECSHRD_MAGIC)
                     RTAssertMsg2AddWeak("%s%p %s srec=%p trec=%p thr=%s nest=%u pos={%Rbn(%u) %Rfn %p}%s", pszPrefix,
                                         pShared->hLock, pShared->pszName, pShared,
-                                        pRec, rtLockValidatorNameThreadHandle(&pRec->SharedOwn.hThread), pRec->SharedOwn.cRecursion,
-                                        pRec->SharedOwn.SrcPos.pszFile, pRec->SharedOwn.SrcPos.uLine, pRec->SharedOwn.SrcPos.pszFunction, pRec->SharedOwn.SrcPos.uId,
+                                        pRec, rtLockValidatorNameThreadHandle(&pRec->ShrdOwner.hThread), pRec->ShrdOwner.cRecursion,
+                                        pRec->ShrdOwner.SrcPos.pszFile, pRec->ShrdOwner.SrcPos.uLine, pRec->ShrdOwner.SrcPos.pszFunction, pRec->ShrdOwner.SrcPos.uId,
                                         pszSuffix);
                 else
                     RTAssertMsg2AddWeak("%sbad srec=%p trec=%p thr=%s nest=%u pos={%Rbn(%u) %Rfn %p}%s", pszPrefix,
                                         pShared,
-                                        pRec, rtLockValidatorNameThreadHandle(&pRec->SharedOwn.hThread), pRec->SharedOwn.cRecursion,
-                                        pRec->SharedOwn.SrcPos.pszFile, pRec->SharedOwn.SrcPos.uLine, pRec->SharedOwn.SrcPos.pszFunction, pRec->SharedOwn.SrcPos.uId,
+                                        pRec, rtLockValidatorNameThreadHandle(&pRec->ShrdOwner.hThread), pRec->ShrdOwner.cRecursion,
+                                        pRec->ShrdOwner.SrcPos.pszFile, pRec->ShrdOwner.SrcPos.uLine, pRec->ShrdOwner.SrcPos.pszFunction, pRec->ShrdOwner.SrcPos.uId,
                                         pszSuffix);
                 break;
@@ -549 +549 @@
 {
     rtLockValidatorSerializeDetectionEnter();
-    if (pShared->papOwners)
-    {
-        PRTLOCKVALRECSHRDOWN volatile *papOwners = pShared->papOwners;
-        uint32_t const                      cMax      = pShared->cAllocated;
+
+    PRTLOCKVALRECSHRDOWN volatile *papOwners = pShared->papOwners;
+    if (papOwners)
+    {
+        uint32_t const cMax = pShared->cAllocated;
         for (uint32_t iEntry = 0; iEntry < cMax; iEntry++)
         {
@@ -565 +566 @@
         }
     }
+
     rtLockValidatorSerializeDetectionLeave();
     return NULL;
@@ -659 +661 @@
                  */
 #if 0  /** @todo enable this after making sure growing works flawlessly. */
-                uint32_t                    cInc = RT_ALIGN_32(pShared->cEntries - cAllocated, 16);
+                uint32_t                cInc = RT_ALIGN_32(pShared->cEntries - cAllocated, 16);
 #else
-                uint32_t                    cInc = RT_ALIGN_32(pShared->cEntries - cAllocated, 1);
+                uint32_t                cInc = RT_ALIGN_32(pShared->cEntries - cAllocated, 1);
 #endif
-                PRTLOCKVALRECSHRDOWN  *papOwners;
+                PRTLOCKVALRECSHRDOWN   *papOwners;
                 papOwners = (PRTLOCKVALRECSHRDOWN *)RTMemRealloc((void *)pShared->papOwners,
-                                                                      (cAllocated + cInc) * sizeof(void *));
+                                                                 (cAllocated + cInc) * sizeof(void *));
                 if (!papOwners)
                 {
@@ -717 +719 @@
             return false; /* the worker leave the lock */
 
-        PRTLOCKVALRECSHRDOWN volatile *papOwners = pShared->papOwners;
-        uint32_t const                      cMax      = pShared->cAllocated;
+        PRTLOCKVALRECSHRDOWN volatile  *papOwners = pShared->papOwners;
+        uint32_t const                  cMax      = pShared->cAllocated;
         for (unsigned i = 0; i < 100; i++)
         {
@@ -758 +760 @@
         /* this shouldn't happen yet... */
         AssertFailed();
-        PRTLOCKVALRECSHRDOWN volatile *papOwners = pShared->papOwners;
-        uint32_t const                      cMax      = pShared->cAllocated;
+        PRTLOCKVALRECSHRDOWN volatile  *papOwners = pShared->papOwners;
+        uint32_t const                  cMax      = pShared->cAllocated;
         for (iEntry = 0; iEntry < cMax; iEntry++)
             if (ASMAtomicCmpXchgPtr((void * volatile *)&papOwners[iEntry], NULL, pEntry))
@@ -857 +859 @@
      * Locate the entry for this thread in the table.
      */
-    uint32_t                    iEntry = 0;
-    PRTLOCKVALRECSHRDOWN   pEntry = rtLockValidatorSharedRecFindThread(pRead, hThread, &iEntry);
+    uint32_t                iEntry = 0;
+    PRTLOCKVALRECSHRDOWN    pEntry = rtLockValidatorSharedRecFindThread(pRead, hThread, &iEntry);
     AssertReturn(pEntry, VERR_SEM_LV_NOT_OWNER);
 
@@ -1247 +1249 @@
          * Process the current record.
          */
-        /* Find the next relevan owner thread. */
+        /* Find the next relevant owner thread. */
         PRTTHREADINT pNextThread;
         switch (pRec->Core.u32Magic)
@@ -1294 +1296 @@
                 if (ASMAtomicUoReadU32(&pRec->Shared.cEntries) > 0)
                 {
-                    uint32_t                            cAllocated = ASMAtomicUoReadU32(&pRec->Shared.cAllocated);
-                    PRTLOCKVALRECSHRDOWN volatile *papOwners  = pRec->Shared.papOwners;
+                    uint32_t                        cAllocated = ASMAtomicUoReadU32(&pRec->Shared.cAllocated);
+                    PRTLOCKVALRECSHRDOWN volatile  *papOwners  = pRec->Shared.papOwners;
                     while (++iEntry < cAllocated)
                     {
@@ -1468 +1470 @@
             char szPrefix[24];
             RTStrPrintf(szPrefix, sizeof(szPrefix), "#%02u: ", i);
-            PRTLOCKVALRECSHRDOWN pSharedOwn = NULL;
+            PRTLOCKVALRECSHRDOWN pShrdOwner = NULL;
             if (pStack->a[i].pRec->Core.u32Magic == RTLOCKVALRECSHRD_MAGIC)
-                pSharedOwn = pStack->a[i].pRec->Shared.papOwners[pStack->a[i].iEntry];
-            if (VALID_PTR(pSharedOwn) && pSharedOwn->Core.u32Magic == RTLOCKVALRECSHRDOWN_MAGIC)
-                rtLockValidatorComplainAboutLock(szPrefix, (PRTLOCKVALRECUNION)pSharedOwn, "\n");
+                pShrdOwner = pStack->a[i].pRec->Shared.papOwners[pStack->a[i].iEntry];
+            if (VALID_PTR(pShrdOwner) && pShrdOwner->Core.u32Magic == RTLOCKVALRECSHRDOWN_MAGIC)
+                rtLockValidatorComplainAboutLock(szPrefix, (PRTLOCKVALRECUNION)pShrdOwner, "\n");
             else
                 rtLockValidatorComplainAboutLock(szPrefix, pStack->a[i].pRec, "\n");