Changeset 40806 in vbox for trunk/src/VBox/Runtime/common/misc/thread.cpp

Timestamp:

Apr 6, 2012 9:05:19 PM (13 years ago)

Author:

vboxsync

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

77321

Message:

RTSpinlock: Redid the interface, eliminating NoInts and Tmp. Whether a spinlock is interrupt safe or not is now defined at creation time, preventing stupid bugs arrising from calling the wrong acquire and/or release methods somewhere. The saved flags are stored in the spinlock strucutre, eliminating the annoying Tmp variable. Needs testing on each platform before fixing the build burn.

File:

• trunk/src/VBox/Runtime/common/misc/thread.cpp (modified) (11 diffs)

trunk/src/VBox/Runtime/common/misc/thread.cpp

@@ -58 +58 @@
 *******************************************************************************/
 #ifdef IN_RING0
-# define RT_THREAD_LOCK_TMP(Tmp)    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER
-# define RT_THREAD_LOCK_RW(Tmp)     RTSpinlockAcquireNoInts(g_ThreadSpinlock, &(Tmp))
-# define RT_THREAD_UNLOCK_RW(Tmp)   RTSpinlockReleaseNoInts(g_ThreadSpinlock, &(Tmp))
-# define RT_THREAD_LOCK_RD(Tmp)     RTSpinlockAcquireNoInts(g_ThreadSpinlock, &(Tmp))
-# define RT_THREAD_UNLOCK_RD(Tmp)   RTSpinlockReleaseNoInts(g_ThreadSpinlock, &(Tmp))
+# define RT_THREAD_LOCK_RW()        RTSpinlockAcquire(g_ThreadSpinlock)
+# define RT_THREAD_UNLOCK_RW()      RTSpinlockRelease(g_ThreadSpinlock)
+# define RT_THREAD_LOCK_RD()        RTSpinlockAcquire(g_ThreadSpinlock)
+# define RT_THREAD_UNLOCK_RD()      RTSpinlockRelease(g_ThreadSpinlock)
 #else
-# define RT_THREAD_LOCK_TMP(Tmp)
-# define RT_THREAD_LOCK_RW(Tmp)     rtThreadLockRW()
-# define RT_THREAD_UNLOCK_RW(Tmp)   rtThreadUnLockRW()
-# define RT_THREAD_LOCK_RD(Tmp)     rtThreadLockRD()
-# define RT_THREAD_UNLOCK_RD(Tmp)   rtThreadUnLockRD()
+# define RT_THREAD_LOCK_RW()        rtThreadLockRW()
+# define RT_THREAD_UNLOCK_RW()      rtThreadUnLockRW()
+# define RT_THREAD_LOCK_RD()        rtThreadLockRD()
+# define RT_THREAD_UNLOCK_RD()      rtThreadUnLockRD()
 #endif
 
@@ -167 +165 @@
      */
     Assert(g_ThreadSpinlock == NIL_RTSPINLOCK);
-    rc = RTSpinlockCreate(&g_ThreadSpinlock);
+    rc = RTSpinlockCreate(&g_ThreadSpinlock, RTSPINLOCK_FLAGS_INTERRUPT_SAFE, "RTThread");
     if (RT_SUCCESS(rc))
     {
@@ -406 +404 @@
 
     {
-        RT_THREAD_LOCK_TMP(Tmp);
-        RT_THREAD_LOCK_RW(Tmp);
+        RT_THREAD_LOCK_RW();
 
         /*
@@ -450 +447 @@
         }
 
-        RT_THREAD_UNLOCK_RW(Tmp);
+        RT_THREAD_UNLOCK_RW();
     }
 }
@@ -479 +476 @@
 static void rtThreadRemove(PRTTHREADINT pThread)
 {
-    RT_THREAD_LOCK_TMP(Tmp);
-    RT_THREAD_LOCK_RW(Tmp);
+    RT_THREAD_LOCK_RW();
     if (ASMAtomicBitTestAndClear(&pThread->fIntFlags, RTTHREADINT_FLAG_IN_TREE_BIT))
         rtThreadRemoveLocked(pThread);
-    RT_THREAD_UNLOCK_RW(Tmp);
+    RT_THREAD_UNLOCK_RW();
 }
 
@@ -512 +508 @@
      * Simple tree lookup.
      */
-    RT_THREAD_LOCK_TMP(Tmp);
-    RT_THREAD_LOCK_RD(Tmp);
+    RT_THREAD_LOCK_RD();
     pThread = (PRTTHREADINT)RTAvlPVGet(&g_ThreadTree, (void *)NativeThread);
-    RT_THREAD_UNLOCK_RD(Tmp);
+    RT_THREAD_UNLOCK_RD();
     return pThread;
 }
@@ -1241 +1236 @@
                  * Do the job.
                  */
-                RT_THREAD_LOCK_TMP(Tmp);
-                RT_THREAD_LOCK_RW(Tmp);
+                RT_THREAD_LOCK_RW();
                 rc = rtThreadNativeSetPriority(pThread, enmType);
                 if (RT_SUCCESS(rc))
                     ASMAtomicXchgSize(&pThread->enmType, enmType);
-                RT_THREAD_UNLOCK_RW(Tmp);
+                RT_THREAD_UNLOCK_RW();
                 if (RT_FAILURE(rc))
                     Log(("RTThreadSetType: failed on thread %p (%s), rc=%Rrc!!!\n", Thread, pThread->szName, rc));
@@ -1302 +1296 @@
 int rtThreadDoCalcDefaultPriority(RTTHREADTYPE enmType)
 {
-    RT_THREAD_LOCK_TMP(Tmp);
-    RT_THREAD_LOCK_RW(Tmp);
+    RT_THREAD_LOCK_RW();
     int rc = rtSchedNativeCalcDefaultPriority(enmType);
-    RT_THREAD_UNLOCK_RW(Tmp);
+    RT_THREAD_UNLOCK_RW();
     return rc;
 }
@@ -1350 +1343 @@
      * scheduling attributes defined by the specified process priority.
      */
-    RT_THREAD_LOCK_TMP(Tmp);
-    RT_THREAD_LOCK_RW(Tmp);
+    RT_THREAD_LOCK_RW();
     int rc = rtProcNativeSetPriority(enmPriority);
     if (RT_SUCCESS(rc))
@@ -1370 +1362 @@
         }
     }
-    RT_THREAD_UNLOCK_RW(Tmp);
+    RT_THREAD_UNLOCK_RW();
     LogFlow(("rtThreadDoSetProcPriority: returns %Rrc\n", rc));
     return rc;
@@ -1526 +1518 @@
 DECLHIDDEN(void) rtThreadClearTlsEntry(RTTLS iTls)
 {
-    RT_THREAD_LOCK_TMP(Tmp);
-    RT_THREAD_LOCK_RD(Tmp);
+    RT_THREAD_LOCK_RD();
     RTAvlPVDoWithAll(&g_ThreadTree, true /* fFromLeft*/, rtThreadClearTlsEntryCallback, (void *)(uintptr_t)iTls);
-    RT_THREAD_UNLOCK_RD(Tmp);
+    RT_THREAD_UNLOCK_RD();
 }