Changeset 25570 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Dec 22, 2009 3:11:13 PM (15 years ago)

Author:

vboxsync

Message:

lockvalidator,semrw-posix.cpp: link the read and write records.

File:

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

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

@@ -159 +159 @@
     pRec->hLock         = hLock;
     pRec->pszName       = pszName;
+    pRec->pSibling      = NULL;
 
     /* Lazily initialize the crossroads semaphore. */
@@ -197 +198 @@
     ASMAtomicWriteHandle(&pRec->hThread, NIL_RTTHREAD);
     ASMAtomicWriteHandle(&pRec->hClass, NIL_RTLOCKVALIDATORCLASS);
+    if (pRec->pSibling)
+    {
+        /* ASSUMES sibling destruction doesn't involve any races.  */
+        ASMAtomicUoWritePtr((void * volatile *)&pRec->pSibling->pSibling, NULL);
+        ASMAtomicUoWritePtr((void * volatile *)&pRec->pSibling, NULL);
+    }
 
     rtLockValidatorSerializeDestructLeave();
@@ -223 +230 @@
     pRec->pszName       = pszName;
     pRec->fEnabled      = RTLockValidatorIsEnabled();
+    pRec->pSibling      = NULL;
 
     /* the table */
@@ -232 +240 @@
     pRec->afPadding[1]  = false;
     pRec->papOwners     = NULL;
-    pRec->u64Alignment  = UINT64_MAX;
+#if HC_ARCH_BITS == 32
+    pRec->u32Alignment  = UINT32_MAX;
+#endif
 }
 
@@ -263 +273 @@
 
         RTMemFree((void *)pRec->papOwners);
+    }
+    if (pRec->pSibling)
+    {
+        /* ASSUMES sibling destruction doesn't involve any races.  */
+        ASMAtomicUoWritePtr((void * volatile *)&pRec->pSibling->pSibling, NULL);
+        ASMAtomicUoWritePtr((void * volatile *)&pRec->pSibling, NULL);
     }
     ASMAtomicWriteBool(&pRec->fReallocating, false);
@@ -510 +526 @@
 
 
+RTDECL(int) RTLockValidatorMakeSiblings(void *pvRec1, void *pvRec2)
+{
+    /*
+     * Validate input.
+     */
+    union
+    {
+        PRTLOCKVALIDATORREC     pRec;
+        PRTLOCKVALIDATORSHARED  pShared;
+        uint32_t               *pu32Magic;
+        void                   *pv;
+    } u1, u2;
+    u1.pv = pvRec1;
+    u2.pv = pvRec2;
+
+    AssertPtrReturn(u1.pv, VERR_SEM_LV_INVALID_PARAMETER);
+    AssertReturn(   *u1.pu32Magic == RTLOCKVALIDATORREC_MAGIC
+                 || *u1.pu32Magic == RTLOCKVALIDATORSHARED_MAGIC
+                 , VERR_SEM_LV_INVALID_PARAMETER);
+
+    AssertPtrReturn(u2.pv, VERR_SEM_LV_INVALID_PARAMETER);
+    AssertReturn(   *u2.pu32Magic == RTLOCKVALIDATORREC_MAGIC
+                 || *u2.pu32Magic == RTLOCKVALIDATORSHARED_MAGIC
+                 , VERR_SEM_LV_INVALID_PARAMETER);
+
+    /*
+     * Link them.
+     */
+    if (    *u1.pu32Magic == RTLOCKVALIDATORREC_MAGIC
+        &&  *u2.pu32Magic == RTLOCKVALIDATORSHARED_MAGIC)
+    {
+        u1.pRec->pSibling    = u2.pShared;
+        u2.pShared->pSibling = u1.pRec;
+    }
+    else if (    *u1.pu32Magic == RTLOCKVALIDATORSHARED_MAGIC
+             &&  *u2.pu32Magic == RTLOCKVALIDATORREC_MAGIC)
+    {
+        u1.pShared->pSibling = u2.pRec;
+        u2.pRec->pSibling    = u1.pShared;
+    }
+    else
+        AssertFailedReturn(VERR_SEM_LV_INVALID_PARAMETER); /* unsupported mix */
+
+    return VINF_SUCCESS;
+}
+
+
 RTDECL(int) RTLockValidatorCheckOrder(PRTLOCKVALIDATORREC pRec, RTTHREAD hThread, PCRTLOCKVALIDATORSRCPOS pSrcPos)
 {
@@ -860 +923 @@
             case RTTHREADSTATE_FAST_MUTEX:
             case RTTHREADSTATE_MUTEX:
-            case RTTHREADSTATE_RW_READ:
-            case RTTHREADSTATE_RW_WRITE:
             case RTTHREADSTATE_SPIN_MUTEX:
             {
@@ -889 +950 @@
             }
 
+#if 0
+            case RTTHREADSTATE_RW_READ:
+            case RTTHREADSTATE_RW_WRITE:
+            {
+            }
+#endif
+
             default:
                 RTAssertMsg2Weak(" Impossible!!! enmState=%s (%d)\n", RTThreadStateName(enmCurState), enmCurState);
@@ -1066 +1134 @@
                     case RTTHREADSTATE_FAST_MUTEX:
                     case RTTHREADSTATE_MUTEX:
-                    case RTTHREADSTATE_RW_WRITE:
                     case RTTHREADSTATE_SPIN_MUTEX:
                     {
@@ -1082 +1149 @@
                     }
 
+#if 0
+                    case RTTHREADSTATE_RW_WRITE:
+                    {
+                        PRTLOCKVALIDATORREC pCurRec = pCur->LockValidator.pRec;
+                        if (    rtThreadGetState(pCur) != enmCurState
+                            ||  !VALID_PTR(pCurRec)
+                            ||  pCurRec->u32Magic != RTLOCKVALIDATORREC_MAGIC)
+                            continue;
+
+                        break;
+                    }
+
                     case RTTHREADSTATE_RW_READ:
                     {
@@ -1096 +1175 @@
                         break;
                     }
-
+#endif
 
                     default: