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

Timestamp:

Dec 31, 2009 3:06:05 PM (15 years ago)

Author:

vboxsync

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

56303

Message:

semrw-generic.cpp: unfinished instrumentation of the code, but gotta run now...

File:

• trunk/src/VBox/Runtime/generic/semrw-generic.cpp (modified) (4 diffs)

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

@@ -39 +39 @@
 #include "internal/iprt.h"
 
-#include <iprt/critsect.h>
-#include <iprt/alloc.h>
-#include <iprt/time.h>
 #include <iprt/asm.h>
 #include <iprt/assert.h>
+#include <iprt/critsect.h>
+#include <iprt/err.h>
+#include <iprt/lockvalidator.h>
+#include <iprt/mem.h>
+#include <iprt/time.h>
 #include <iprt/thread.h>
-#include <iprt/err.h>
-#include <iprt/stream.h>
 
 #include "internal/magics.h"
+#include "internal/strict.h"
 
 
@@ -81 +82 @@
     /** Need to reset ReadEvent. */
     bool                fNeedResetReadEvent;
+#ifdef RTSEMRW_STRICT
+    /** The validator record for the writer. */
+    RTLOCKVALRECEXCL    ValidatorWrite;
+    /** The validator record for the readers. */
+    RTLOCKVALRECSHRD    ValidatorRead;
+#endif
 };
 
@@ -121 +128 @@
                         pThis->fNeedResetReadEvent  = true;
                         pThis->u32Magic             = RTSEMRW_MAGIC;
+#ifdef RTSEMRW_STRICT
+                        RTLockValidatorRecExclInit(&pThis->ValidatorWrite, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemRW", pThis);
+                        RTLockValidatorRecSharedInit(&pThis->ValidatorRead,  NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemRW", pThis);
+                        RTLockValidatorRecMakeSiblings(&pThis->ValidatorWrite.Core, &pThis->ValidatorRead.Core);
+#endif
                         *pRWSem = pThis;
                         return VINF_SUCCESS;
@@ -181 +193 @@
             AssertMsgRC(rc, ("RTCritSectDelete failed! rc=%Rrc\n", rc));
 
+#ifdef RTSEMRW_STRICT
+            RTLockValidatorRecSharedDelete(&pThis->ValidatorRead);
+            RTLockValidatorRecExclDelete(&pThis->ValidatorWrite);
+#endif
             RTMemFree(pThis);
             rc = VINF_SUCCESS;