Changeset 8664 in vbox

Timestamp:

May 7, 2008 3:17:32 PM (17 years ago)

Author:

vboxsync

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

30595

Message:

Lock counting. Correct #else/#endif comments (gnu convention).

File:

• trunk/src/VBox/Main/AutoLock.cpp (modified) (17 diffs)

trunk/src/VBox/Main/AutoLock.cpp

@@ -141 +141 @@
     AssertRC (vrc);
 
-#else /* VBOX_MAIN_USE_SEMRW */
+#else /* !VBOX_MAIN_USE_SEMRW */
 
     int vrc = RTCritSectInit (&mCritSect);
@@ -158 +158 @@
     mWriteLockPending = 0;
 
-#endif /* VBOX_MAIN_USE_SEMRW */
+#endif /* !VBOX_MAIN_USE_SEMRW */
 }
 
@@ -168 +168 @@
     RTSemRWDestroy (mSemRW);
 
-#else /* VBOX_MAIN_USE_SEMRW */
+#else /* !VBOX_MAIN_USE_SEMRW */
 
     RTSemEventMultiDestroy (mGoReadSem);
@@ -174 +174 @@
     RTCritSectDelete (&mCritSect);
 
-#endif /* VBOX_MAIN_USE_SEMRW */
+#endif /* !VBOX_MAIN_USE_SEMRW */
 }
 
@@ -184 +184 @@
     return RTSemRWIsWriteOwner (mSemRW);
 
-#else /* VBOX_MAIN_USE_SEMRW */
+#else /* !VBOX_MAIN_USE_SEMRW */
 
     RTCritSectEnter (&mCritSect);
@@ -191 +191 @@
     return locked;
 
-#endif /* VBOX_MAIN_USE_SEMRW */
+#endif /* !VBOX_MAIN_USE_SEMRW */
 }
 
@@ -202 +202 @@
     AssertRC (vrc);
 
-#else /* VBOX_MAIN_USE_SEMRW */
+#else /* !VBOX_MAIN_USE_SEMRW */
 
     RTCritSectEnter (&mCritSect);
@@ -267 +267 @@
     RTCritSectLeave (&mCritSect);
 
-#endif /* VBOX_MAIN_USE_SEMRW */
+# ifdef DEBUG
+    if (mWriteLockLevel == 1)
+    {
+        RTTHREAD iprtThreadSelf = RTThreadSelf();
+        if (iprtThreadSelf != NIL_RTTHREAD)
+            RTThreadWriteLockInc (iprtThreadSelf);
+    }
+# endif
+
+#endif /* !VBOX_MAIN_USE_SEMRW */
 }
 
@@ -278 +287 @@
     AssertRC (vrc);
 
-#else /* VBOX_MAIN_USE_SEMRW */
+#else /* !VBOX_MAIN_USE_SEMRW */
 
     RTCritSectEnter (&mCritSect);
@@ -299 +308 @@
             else if (mReadLockCount != 0)
                 RTSemEventMultiSignal (mGoReadSem);
+
+# ifdef DEBUG
+            RTTHREAD iprtThreadSelf = RTThreadSelf();
+            if (iprtThreadSelf != NIL_RTTHREAD)
+                RTThreadWriteLockDec (iprtThreadSelf);
+# endif
         }
     }
@@ -308 +323 @@
     RTCritSectLeave (&mCritSect);
 
-#endif /* VBOX_MAIN_USE_SEMRW */
+#endif /* !VBOX_MAIN_USE_SEMRW */
 }
 
@@ -319 +334 @@
     AssertRC (vrc);
 
-#else /* VBOX_MAIN_USE_SEMRW */
+#else /* !VBOX_MAIN_USE_SEMRW */
 
     RTCritSectEnter (&mCritSect);
@@ -373 +388 @@
         RTSemEventMultiWait (mGoReadSem, RT_INDEFINITE_WAIT);
 
-#endif /* VBOX_MAIN_USE_SEMRW */
+# ifdef DEBUG
+    RTTHREAD iprtThreadSelf = RTThreadSelf();
+    if (iprtThreadSelf != NIL_RTTHREAD)
+        RTThreadReadLockInc (iprtThreadSelf);
+# endif
+
+#endif /* !VBOX_MAIN_USE_SEMRW */
 }
 
@@ -384 +405 @@
     AssertRC (vrc);
 
-#else /* VBOX_MAIN_USE_SEMRW */
+#else /* !VBOX_MAIN_USE_SEMRW */
 
     RTCritSectEnter (&mCritSect);
@@ -431 +452 @@
     RTCritSectLeave (&mCritSect);
 
-#endif /* VBOX_MAIN_USE_SEMRW */
+# ifdef DEBUG
+    RTTHREAD iprtThreadSelf = RTThreadSelf();
+    if (iprtThreadSelf != NIL_RTTHREAD)
+        RTThreadReadLockDec (iprtThreadSelf);
+# endif
+
+#endif /* !VBOX_MAIN_USE_SEMRW */
 }
 
@@ -441 +468 @@
     return RTSemRWGetWriteRecursion (mSemRW);
 
-#else /* VBOX_MAIN_USE_SEMRW */
+#else /* !VBOX_MAIN_USE_SEMRW */
 
     Assert (mWriteLockLevel != 0);
@@ -447 +474 @@
     return mWriteLockLevel;
 
-#endif /* VBOX_MAIN_USE_SEMRW */
+#endif /* !VBOX_MAIN_USE_SEMRW */
 }