Changeset 25373 in vbox for trunk/src/VBox/Runtime/generic

Timestamp:

Dec 14, 2009 7:20:27 PM (15 years ago)

Author:

vboxsync

Message:

IPRT,PDMCritSect: More validation changes. Validate posix and linux mutexes. Always update the thread state with critsects.

Location:

trunk/src/VBox/Runtime/generic

Files:

• critsect-generic.cpp (modified) (5 diffs)
• semnoint-generic.cpp (modified) (1 diff)

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

@@ -244 +244 @@
     ASMAtomicWriteHandle(&pCritSect->NativeThreadOwner, NativeThreadSelf);
 #ifdef RTCRITSECT_STRICT
-    RTLockValidatorSetOwner(pCritSect->pValidatorRec, ThreadSelf, uId, RT_SRC_POS_ARGS);
+    RTThreadWriteLockInc(RTLockValidatorSetOwner(pCritSect->pValidatorRec, ThreadSelf, uId, RT_SRC_POS_ARGS));
 #endif
 
@@ -283 +283 @@
     RTNATIVETHREAD  NativeThreadSelf = RTThreadNativeSelf();
 #ifdef RTCRITSECT_STRICT
-    RTTHREAD        ThreadSelf = RTThreadSelf();
-    if (ThreadSelf == NIL_RTTHREAD)
-        RTThreadAdopt(RTTHREADTYPE_DEFAULT, 0, NULL, &ThreadSelf);
-    RTLockValidatorCheckOrder(pCritSect->pValidatorRec, ThreadSelf, uId, RT_SRC_POS_ARGS);
+    RTTHREAD        hThreadSelf = RTThreadSelfAutoAdopt();
+    RTLockValidatorCheckOrder(pCritSect->pValidatorRec, hThreadSelf, uId, RT_SRC_POS_ARGS);
 #endif
 
@@ -315 +313 @@
         }
 
+        /*
+         * Wait for the current owner to release it.
+         */
+#ifndef RTCRITSECT_STRICT
+        RTTHREAD hThreadSelf = RTThreadSelf();
+#endif
         for (;;)
         {
-#ifdef RTCRITSECT_STRICT
-            RTThreadBlocking(ThreadSelf, RTTHREADSTATE_CRITSECT, pCritSect->pValidatorRec, uId, RT_SRC_POS_ARGS);
-#endif
+            RTThreadBlocking(hThreadSelf, RTTHREADSTATE_CRITSECT, RTCRITSECT_STRICT_BLOCK_ARGS(pCritSect->pValidatorRec));
             int rc = RTSemEventWait(pCritSect->EventSem, RT_INDEFINITE_WAIT);
-#ifdef RTCRITSECT_STRICT
-            RTThreadUnblocked(ThreadSelf, RTTHREADSTATE_CRITSECT);
-#endif
+            RTThreadUnblocked(hThreadSelf, RTTHREADSTATE_CRITSECT);
             if (pCritSect->u32Magic != RTCRITSECT_MAGIC)
                 return VERR_SEM_DESTROYED;
@@ -339 +339 @@
     ASMAtomicWriteHandle(&pCritSect->NativeThreadOwner, NativeThreadSelf);
 #ifdef RTCRITSECT_STRICT
-    RTLockValidatorSetOwner(pCritSect->pValidatorRec, ThreadSelf, uId, RT_SRC_POS_ARGS);
-    RTThreadWriteLockInc(ThreadSelf);
+    RTThreadWriteLockInc(RTLockValidatorSetOwner(pCritSect->pValidatorRec, hThreadSelf, uId, RT_SRC_POS_ARGS));
 #endif
 
@@ -393 +392 @@
          */
 #ifdef RTCRITSECT_STRICT
-        RTLockValidatorUnsetOwner(pCritSect->pValidatorRec);
+        RTThreadWriteLockInc(RTLockValidatorUnsetOwner(pCritSect->pValidatorRec));
 #endif
         ASMAtomicWriteHandle(&pCritSect->NativeThreadOwner, NIL_RTNATIVETHREAD);

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

@@ -126 +126 @@
 RT_EXPORT_SYMBOL(RTSemMutexRequest);
 
+
+RTDECL(int) RTSemMutexRequestDebug(RTSEMMUTEX Mutex, unsigned cMillies, RTHCUINTPTR uId, RT_SRC_POS_DECL)
+{
+    int rc;
+    if (cMillies == RT_INDEFINITE_WAIT)
+    {
+        do rc = RTSemMutexRequestNoResumeDebug(Mutex, cMillies, uId, RT_SRC_POS_ARGS);
+        while (rc == VERR_INTERRUPTED);
+    }
+    else
+    {
+        const uint64_t u64Start = RTTimeMilliTS();
+        rc = RTSemMutexRequestNoResumeDebug(Mutex, cMillies, uId, RT_SRC_POS_ARGS);
+        if (rc == VERR_INTERRUPTED)
+        {
+            do
+            {
+                uint64_t u64Elapsed = RTTimeMilliTS() - u64Start;
+                if (u64Elapsed >= cMillies)
+                    return VERR_TIMEOUT;
+                rc = RTSemMutexRequestNoResumeDebug(Mutex, cMillies - (unsigned)u64Elapsed, uId, RT_SRC_POS_ARGS);
+            } while (rc == VERR_INTERRUPTED);
+        }
+    }
+    return rc;
+}
+RT_EXPORT_SYMBOL(RTSemMutexRequestDebug);
+