Changeset 8321 in vbox

Timestamp:

Apr 23, 2008 9:53:40 AM (17 years ago)

Author:

vboxsync

Message:

Main/AutoLock: Use RTThreadNativeSelf() instead of RTThredSelf() which currently returns NIL_RTTHREAD for alien threads.

Location:

trunk/src/VBox/Main

Files:

• AutoLock.cpp (modified) (7 diffs)
• include/AutoLock.h (modified) (1 diff)

trunk/src/VBox/Main/AutoLock.cpp

@@ -43 +43 @@
     AssertRC (vrc);
 
-    mWriteLockThread = NIL_RTTHREAD;
+    mWriteLockThread = NIL_RTNATIVETHREAD;
 
     mReadLockCount = 0;
@@ -76 +76 @@
 
     RTCritSectEnter (&mCritSect);
-    bool locked = mWriteLockThread == RTThreadSelf();
+    bool locked = mWriteLockThread == RTThreadNativeSelf();
     RTCritSectLeave (&mCritSect);
     return locked;
@@ -94 +94 @@
     RTCritSectEnter (&mCritSect);
 
-    if (mWriteLockThread != RTThreadSelf())
-    {
-        if (mReadLockCount != 0 || mWriteLockThread != NIL_RTTHREAD ||
+    if (mWriteLockThread != RTThreadNativeSelf())
+    {
+        if (mReadLockCount != 0 || mWriteLockThread != NIL_RTNATIVETHREAD ||
             mWriteLockPending != 0 /* respect other pending writers */)
         {
@@ -109 +109 @@
 
         Assert (mWriteLockLevel == 0);
-        Assert (mWriteLockThread == NIL_RTTHREAD);
-
-        mWriteLockThread = RTThreadSelf();
+        Assert (mWriteLockThread == NIL_RTNATIVETHREAD);
+
+        mWriteLockThread = RTThreadNativeSelf();
     }
 
@@ -139 +139 @@
         if (mWriteLockLevel == 0)
         {
-            mWriteLockThread = NIL_RTTHREAD;
+            mWriteLockThread = NIL_RTNATIVETHREAD;
 
             /* no write locks, let writers go if there are any (top priority),
@@ -172 +172 @@
     bool isFirstReadLock = mReadLockCount == 1;
 
-    if (isWriteLock && mWriteLockThread == RTThreadSelf())
+    if (isWriteLock && mWriteLockThread == RTThreadNativeSelf())
     {
         /* read lock nested into the write lock, cause return immediately */
@@ -225 +225 @@
             /* read unlock nested into the write lock, just decrease the
              * counter */
-            Assert (mWriteLockThread == RTThreadSelf()
+            Assert (mWriteLockThread == RTThreadNativeSelf()
                     /* unlockRead() after lockWrite()? */);
-            if (mWriteLockThread == RTThreadSelf())
+            if (mWriteLockThread == RTThreadNativeSelf())
                 -- mReadLockCount;
         }

trunk/src/VBox/Main/include/AutoLock.h

@@ -191 +191 @@
     RTSEMEVENTMULTI mGoReadSem;
 
-    RTTHREAD mWriteLockThread;
+    RTNATIVETHREAD mWriteLockThread;
 
     uint32_t mReadLockCount;