Changeset 20784 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jun 22, 2009 2:37:39 PM (16 years ago)

Author:

vboxsync

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

48904

Message:

TM: Renamed the EmtLock to TimerCritSect as it's almost only used for timer list serialization and we want to let other threads do that too.

File:

• trunk/src/VBox/VMM/VMMAll/TMAll.cpp (modified) (16 diffs)

trunk/src/VBox/VMM/VMMAll/TMAll.cpp

@@ -66 +66 @@
 
 
-#ifndef tmLock
-
-/**
- * Try take the EMT/TM lock, wait in ring-3 return VERR_SEM_BUSY in R0/RC.
+#ifndef tmTimerLock
+
+/**
+ * Try take the timer lock, wait in ring-3 return VERR_SEM_BUSY in R0/RC.
  *
  * @retval  VINF_SUCCESS on success (always in ring-3).
@@ -75 +75 @@
  *
  * @param   pVM         The VM handle.
- */
-int tmLock(PVM pVM)
+ *
+ * @thread  EMTs for the time being.
+ */
+int tmTimerLock(PVM pVM)
 {
     VM_ASSERT_EMT(pVM);
-    int rc = PDMCritSectEnter(&pVM->tm.s.EmtLock, VERR_SEM_BUSY);
+    int rc = PDMCritSectEnter(&pVM->tm.s.TimerCritSect, VERR_SEM_BUSY);
     return rc;
 }
@@ -85 +87 @@
 
 /**
- * Try take the EMT/TM lock, no waiting.
+ * Try take the timer lock, no waiting.
  *
  * @retval  VINF_SUCCESS on success.
@@ -92 +94 @@
  * @param   pVM         The VM handle.
  */
-int tmTryLock(PVM pVM)
-{
-    VM_ASSERT_EMT(pVM);
-    int rc = PDMCritSectTryEnter(&pVM->tm.s.EmtLock);
+int tmTimerTryLock(PVM pVM)
+{
+    int rc = PDMCritSectTryEnter(&pVM->tm.s.TimerCritSect);
     return rc;
 }
@@ -105 +106 @@
  * @param   pVM         The VM handle.
  */
-void tmUnlock(PVM pVM)
-{
-    PDMCritSectLeave(&pVM->tm.s.EmtLock);
+void tmTimerUnlock(PVM pVM)
+{
+    PDMCritSectLeave(&pVM->tm.s.TimerCritSect);
 }
 
@@ -261 +262 @@
     PVM pVM = pTimer->CTX_SUFF(pVM);
     if (    VM_IS_EMT(pVM)
-        &&  RT_SUCCESS(tmTryLock(pVM)))
+        &&  RT_SUCCESS(tmTimerTryLock(pVM)))
     {
         STAM_PROFILE_START(&pVM->tm.s.CTX_SUFF_Z(StatScheduleOne), a);
@@ -270 +271 @@
 #endif
         STAM_PROFILE_STOP(&pVM->tm.s.CTX_SUFF_Z(StatScheduleOne), a);
-        tmUnlock(pVM);
+        tmTimerUnlock(pVM);
     }
     else
@@ -817 +818 @@
 
     STAM_COUNTER_INC(&pVM->tm.s.StatTimerSetOpt);
-    tmUnlock(pVM);
+    tmTimerUnlock(pVM);
     return VINF_SUCCESS;
 }
@@ -866 +867 @@
     {
         /* Try take the TM lock and check the state again. */
-        if (RT_SUCCESS_NP(tmTryLock(pVM)))
+        if (RT_SUCCESS_NP(tmTimerTryLock(pVM)))
         {
             if (RT_LIKELY(tmTimerTry(pTimer, TMTIMERSTATE_ACTIVE, enmState)))
@@ -874 +875 @@
                 return VINF_SUCCESS;
             }
-            tmUnlock(pVM);
+            tmTimerUnlock(pVM);
         }
     }
@@ -1041 +1042 @@
 
     STAM_COUNTER_INC(&pVM->tm.s.StatTimerSetRelativeOpt);
-    tmUnlock(pVM);
+    tmTimerUnlock(pVM);
     return VINF_SUCCESS;
 }
@@ -1092 +1093 @@
      *       get the innermost locks.
      */
-    bool fOwnTMLock = RT_SUCCESS_NP(tmTryLock(pVM));
+    bool fOwnTMLock = RT_SUCCESS_NP(tmTimerTryLock(pVM));
 #if 1
     if (    fOwnTMLock
@@ -1248 +1249 @@
         if (!fOwnTMLock)
         {
-            fOwnTMLock = RT_SUCCESS_NP(tmTryLock(pVM));
+            fOwnTMLock = RT_SUCCESS_NP(tmTimerTryLock(pVM));
             if (    !fOwnTMLock
                 &&  enmClock == TMCLOCK_VIRTUAL_SYNC
@@ -1263 +1264 @@
         tmVirtualSyncUnlock(pVM);
     if (fOwnTMLock)
-        tmUnlock(pVM);
+        tmTimerUnlock(pVM);
 
     if (    !fOwnTMLock
@@ -2035 +2036 @@
 void tmTimerQueueSchedule(PVM pVM, PTMTIMERQUEUE pQueue)
 {
-    TM_ASSERT_EMT_LOCK(pVM);
+    TM_ASSERT_LOCK(pVM);
 
     /*
@@ -2076 +2077 @@
 void tmTimerQueuesSanityChecks(PVM pVM, const char *pszWhere)
 {
-    TM_ASSERT_EMT_LOCK(pVM);
+    TM_ASSERT_LOCK(pVM);
 
     /*