Changeset 67721 in vbox

Timestamp:

Jun 30, 2017 10:17:01 AM (8 years ago)

Author:

vboxsync

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

116569

Message:

glue/AutoLock: Adding isReadLockedOnCurrentThread method for debug assertions.

Location:

trunk

Files:

• include/VBox/com/AutoLock.h (modified) (5 diffs)
• src/VBox/Main/glue/AutoLock.cpp (modified) (3 diffs)

trunk/include/VBox/com/AutoLock.h

@@ -125 +125 @@
 
     /**
+     * Returns @c true if the current thread holds a read lock on this
+     * read/write semaphore. Intended for debugging only as it isn't always
+     * accurate given @a fWannaHear.
+     */
+    virtual bool isReadLockedOnCurrentThread(bool fWannaHear = true) const = 0;
+
+    /**
      * Returns the current write lock level of this semaphore. The lock level
      * determines the number of nested #lockWrite() calls on the given
@@ -164 +171 @@
 
     virtual bool isWriteLockOnCurrentThread() const;
+    virtual bool isReadLockedOnCurrentThread(bool fWannaHear = true) const;
 
     virtual void lockWrite(LOCKVAL_SRC_POS_DECL);
@@ -202 +210 @@
     virtual ~WriteLockHandle();
     virtual bool isWriteLockOnCurrentThread() const;
+    virtual bool isReadLockedOnCurrentThread(bool fWannaHear = true) const;
 
     virtual void lockWrite(LOCKVAL_SRC_POS_DECL);
@@ -254 +263 @@
         LockHandle *h = lockHandle();
         return h ? h->isWriteLockOnCurrentThread() : false;
+    }
+
+    /**
+     * Equivalent to <tt>#lockHandle()->isReadLockedOnCurrentThread()</tt>.
+     * Returns @c false if lockHandle() returns @c NULL.
+     * @note Use with care, simple debug assertions and similar only.
+     */
+    bool isReadLockedOnCurrentThread(bool fWannaHear = true)
+    {
+        LockHandle *h = lockHandle();
+        return h ? h->isReadLockedOnCurrentThread(fWannaHear) : false;
     }
 };
@@ -573 +593 @@
     bool isWriteLockOnCurrentThread() const;
     uint32_t writeLockLevel() const;
+
+    bool isReadLockedOnCurrentThread(bool fWannaHear = true) const;
 
 private:

trunk/src/VBox/Main/glue/AutoLock.cpp

@@ -230 +230 @@
 }
 
+/*virtual*/ bool RWLockHandle::isReadLockedOnCurrentThread(bool fWannaHear) const
+{
+#ifdef GLUE_USE_CRITSECTRW
+    return RTCritSectRwIsReadOwner(&m->CritSect, fWannaHear);
+#else
+    return RTSemRWIsReadOwner(m->sem, fWannaHear);
+#endif
+}
+
 /*virtual*/ void RWLockHandle::lockRead(LOCKVAL_SRC_POS_DECL)
 {
@@ -327 +336 @@
     RTCritSectEnter(&m->sem);
 #endif
+}
+
+/*virtual*/ bool WriteLockHandle::isReadLockedOnCurrentThread(bool fWannaHear) const
+{
+    RT_NOREF(fWannaHear);
+    return RTCritSectIsOwner(&m->sem);
 }
 
@@ -661 +676 @@
 }
 
+/**
+ * Returns @c true if the current thread holds a write lock on the managed
+ * read/write semaphore. Returns @c false if the managed semaphore is @c
+ * NULL.
+ *
+ * @note Intended for debugging only (esp. considering fWannaHear).
+ */
+bool AutoWriteLock::isReadLockedOnCurrentThread(bool fWannaHear) const
+{
+    return m->aHandles[0] ? m->aHandles[0]->isReadLockedOnCurrentThread(fWannaHear) : false;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 //