Changeset 8652 in vbox for trunk/src/VBox/Runtime/r3/posix

Timestamp:

May 7, 2008 12:22:39 PM (17 years ago)

Author:

vboxsync

Message:

Lock counting.

File:

• trunk/src/VBox/Runtime/r3/posix/semrw-posix.cpp (modified) (10 diffs)

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

@@ -35 +35 @@
 #include <iprt/assert.h>
 #include <iprt/alloc.h>
+#include <iprt/thread.h>
 #include <iprt/asm.h>
 #include <iprt/err.h>
@@ -44 +45 @@
 
 #include "internal/magics.h"
-
+#include "internal/strict.h"
+
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
 /** @todo move this to r3/posix/something.h. */
 #ifdef RT_OS_SOLARIS
@@ -167 +173 @@
      * Check if it's the writer (implement write+read recursion).
      */
+#ifdef RTSEMRW_STRICT
+    RTTHREAD  ThreadSelf = RTThreadSelf();
+#endif
     pthread_t Self = pthread_self();
     pthread_t Writer;
@@ -174 +183 @@
         Assert(pThis->cWriterReads < INT32_MAX);
         pThis->cWriterReads++;
+#ifdef RTSEMRW_STRICT
+        if (ThreadSelf != NIL_RTTHREAD)
+            RTThreadReadLockInc(ThreadSelf);
+#endif
         return VINF_SUCCESS;
     }
@@ -223 +236 @@
     }
 
+#ifdef RTSEMRW_STRICT
+    if (ThreadSelf != NIL_RTTHREAD)
+        RTThreadReadLockInc(ThreadSelf);
+#endif
     return VINF_SUCCESS;
 }
@@ -248 +265 @@
      * Check if it's the writer.
      */
+#ifdef RTSEMRW_STRICT
+    RTTHREAD  ThreadSelf = RTThreadSelf();
+#endif
     pthread_t Self = pthread_self();
     pthread_t Writer;
@@ -256 +276 @@
                         ("pThis=%p\n", pThis), VERR_NOT_OWNER);
         pThis->cWriterReads--;
+#ifdef RTSEMRW_STRICT
+        if (ThreadSelf != NIL_RTTHREAD)
+            RTThreadReadLockDec(ThreadSelf);
+#endif
         return VINF_SUCCESS;
     }
@@ -269 +293 @@
     }
 
+#ifdef RTSEMRW_STRICT
+    if (ThreadSelf != NIL_RTTHREAD)
+        RTThreadReadLockDec(ThreadSelf);
+#endif
     return VINF_SUCCESS;
 }
@@ -344 +372 @@
     ATOMIC_SET_PTHREAD_T(&pThis->Writer, Self);
     pThis->cWrites = 1;
+#ifdef RTSEMRW_STRICT
+    RTTHREAD ThreadSelf = RTThreadSelf();
+    if (ThreadSelf != NIL_RTTHREAD)
+        RTThreadWriteLockInc(ThreadSelf);
+#endif
     return VINF_SUCCESS;
 }
@@ -389 +422 @@
     }
 
+#ifdef RTSEMRW_STRICT
+    RTTHREAD ThreadSelf = RTThreadSelf();
+    if (ThreadSelf != NIL_RTTHREAD)
+        RTThreadWriteLockDec(ThreadSelf);
+#endif
     return VINF_SUCCESS;
 }