Changeset 8649 in vbox for trunk/src/VBox/Runtime

Timestamp:

May 7, 2008 12:04:03 PM (17 years ago)

Author:

vboxsync

Message:

Count mutex locks.

Location:

trunk/src/VBox/Runtime/r3

Files:

• posix/semmutex-posix.cpp (modified) (5 diffs)
• win/sems-win.cpp (modified) (3 diffs)

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

@@ -35 +35 @@
 #include <iprt/assert.h>
 #include <iprt/alloc.h>
+#include <iprt/thread.h>
 #include <iprt/asm.h>
 #include <iprt/err.h>
@@ -42 +43 @@
 #include <unistd.h>
 #include <sys/time.h>
+
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+/** @def RTSEMMUTEX_STRICT
+ * Enables strictness checks and lock accounting.
+ */
+#ifndef RTSEMMUTEX_STRICT
+# if defined(RT_STRICT) || defined(RT_LOCK_STRICT) || defined(RTSEM_STRICT) || defined(DOXYGEN_RUNNING)
+#  define RTSEMMUTEX_STRICT
+# endif
+#endif
 
 
@@ -67 +81 @@
  * @param   pIntMutexSem    Pointer to the mutex semaphore to validate.
  */
-inline bool rtsemMutexValid(struct RTSEMMUTEXINTERNAL *pIntMutexSem)
+DECLINLINE(bool) rtsemMutexValid(struct RTSEMMUTEXINTERNAL *pIntMutexSem)
 {
     if ((uintptr_t)pIntMutexSem < 0x10000)
@@ -224 +238 @@
     pIntMutexSem->Owner = Self;
     ASMAtomicXchgU32(&pIntMutexSem->cNesting, 1);
+#ifdef RTSEMMUTEX_STRICT
+    RTTHREAD Thread = RTThreadSelf();
+    if (Thread != NIL_RTTHREAD)
+        RTThreadWriteLockInc(Thread);
+#endif
 
     return VINF_SUCCESS;
@@ -272 +291 @@
      * Clear the state. (cNesting == 1)
      */
+#ifdef RTSEMMUTEX_STRICT
+    RTTHREAD Thread = RTThreadSelf();
+    if (Thread != NIL_RTTHREAD)
+        RTThreadWriteLockDec(Thread);
+#endif
     pIntMutexSem->Owner    = (pthread_t)-1;
     ASMAtomicXchgU32(&pIntMutexSem->cNesting, 0);

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

@@ -37 +37 @@
 
 #include <iprt/semaphore.h>
+#include <iprt/thread.h>
 #include <iprt/assert.h>
 #include <iprt/err.h>
 
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+/** @def RTSEMMUTEX_STRICT
+ * Enables strictness checks and lock accounting.
+ */
+#ifndef RTSEMMUTEX_STRICT
+# if defined(RT_STRICT) || defined(RT_LOCK_STRICT) || defined(RTSEM_STRICT) || defined(DOXYGEN_RUNNING)
+#  define RTSEMMUTEX_STRICT
+# endif
+#endif
 
 /** Converts semaphore to win32 handle. */
@@ -230 +243 @@
     switch (rc)
     {
-        case WAIT_OBJECT_0:         return VINF_SUCCESS;
+        case WAIT_OBJECT_0:
+        {
+#ifdef RTSEMMUTEX_STRICT
+            RTTHREAD Thread = RTThreadSelf();
+            if (Thread != NIL_RTTHREAD)
+                RTThreadWriteLockInc(Thread);
+#endif
+            return VINF_SUCCESS;
+        }
+
         case WAIT_TIMEOUT:          return VERR_TIMEOUT;
         case WAIT_IO_COMPLETION:    return VERR_INTERRUPTED;
@@ -252 +274 @@
      * Unlock mutex semaphore.
      */
+#ifdef RTSEMMUTEX_STRICT
+    RTTHREAD Thread = RTThreadSelf();
+    if (Thread != NIL_RTTHREAD)
+        RTThreadWriteLockDec(Thread);
+#endif
     if (ReleaseMutex(SEM2HND(MutexSem)))
         return VINF_SUCCESS;
+
+#ifdef RTSEMMUTEX_STRICT
+    if (Thread != NIL_RTTHREAD)
+        RTThreadWriteLockInc(Thread);
+#endif
     AssertMsgFailed(("Release MutexSem %p failed, lasterr=%d\n", MutexSem, GetLastError()));
     return RTErrConvertFromWin32(GetLastError());