Changeset 32748 in vbox for trunk/src/VBox/Runtime

Timestamp:

Sep 24, 2010 9:28:02 AM (14 years ago)

Author:

vboxsync

Message:

r0drv/linux/timer-r0drv-linux.c: fixes for cpu specific timers.

File:

• trunk/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c (modified) (18 diffs)

trunk/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c

@@ -228 +228 @@
     ASMOutStrU8(0x504, (uint8_t *)&szTmp[0], cb);
 }
-#define RTAssertMsg1Weak(pszExpr, uLine, pszFile, pszFunction) \
+# define RTAssertMsg1Weak(pszExpr, uLine, pszFile, pszFunction) \
     myLogBackdoorPrintf("\n!!Guest Assertion failed!!\n%s(%d) %s\n%s\n", uLine, pszFile, pszFunction, (pszExpr))
-#define RTAssertMsg2Weak myLogBackdoorPrintf
-#define dprintf(a)          myLogBackdoorPrintf a
+# define RTAssertMsg2Weak myLogBackdoorPrintf
+# define RTTIMERLNX_LOG(a)          myLogBackdoorPrintf a
 #else
-#define dprintf(a)          do { } while (0)
+# define RTTIMERLNX_LOG(a)          do { } while (0)
 #endif
 
@@ -242 +242 @@
 {
 #ifdef DEBUG_HACKING
-    dprintf(("set %d -> %d\n", *penmState, enmNewState));
+    RTTIMERLNX_LOG(("set %d -> %d\n", *penmState, enmNewState));
 #endif
     ASMAtomicWriteU32((uint32_t volatile *)penmState, enmNewState);
@@ -261 +261 @@
     RTTIMERLNXSTATE enmOldState = enmCurState;
     bool fRc = ASMAtomicCmpXchgExU32((uint32_t volatile *)penmState, enmNewState, enmCurState, (uint32_t *)&enmOldState);
-    dprintf(("cxg %d -> %d - %d at %u\n", enmOldState, enmNewState, fRc, uLine));
+    RTTIMERLNX_LOG(("cxg %d -> %d - %d at %u\n", enmOldState, enmNewState, fRc, uLine));
     return fRc;
 }
@@ -351 +351 @@
     if (fHighRes)
         pSubTimer->u.Std.u64NextTS = u64NextTS;
-    dprintf(("startsubtimer %p\n", pSubTimer->pParent));
+    RTTIMERLNX_LOG(("startsubtimer %p\n", pSubTimer->pParent));
 
     pSubTimer->iTick = 0;
@@ -390 +390 @@
 static void rtTimerLnxStopSubTimer(PRTTIMERLNXSUBTIMER pSubTimer, bool fHighRes)
 {
-    dprintf(("stopsubtimer %p %d\n", pSubTimer->pParent, fHighRes));
+    RTTIMERLNX_LOG(("stopsubtimer %p %d\n", pSubTimer->pParent, fHighRes));
 #ifdef RTTIMER_LINUX_WITH_HRTIMER
     if (fHighRes)
@@ -414 +414 @@
     RTSPINLOCK hSpinlock = pTimer->hSpinlock;
     Assert(pTimer->fSuspended);
-    dprintf(("destroyit %p\n", pTimer));
+    RTTIMERLNX_LOG(("destroyit %p\n", pTimer));
 
     /*
@@ -454 +454 @@
     if (pTimer->cCpus > 1)
     {
-        bool            fAllStopped = true;
         uint32_t        iCpu        = pTimer->cCpus;
         RTSPINLOCKTMP   Tmp         = RTSPINLOCKTMP_INITIALIZER;
@@ -591 +590 @@
 
 
-    dprintf(("hrcallback %p\n", pTimer));
+    RTTIMERLNX_LOG(("hrcallback %p\n", pTimer));
     if (RT_UNLIKELY(!rtTimerLnxChangeToCallbackState(pSubTimer)))
         return HRTIMER_NORESTART;
@@ -599 +598 @@
      * Check for unwanted migration.
      */
-    if (   (pTimer->fSpecificCpu || pTimer->fAllCpus)
-        && RT_UNLIKELY((RTCPUID)(pSubTimer - &pTimer->aSubTimers[0]) != RTMpCpuId()))
-    {
-        rtTimerLnxCallbackHandleMigration(pTimer, pSubTimer);
-        return HRTIMER_NORESTART;
+    if (pTimer->fAllCpus || pTimer->fSpecificCpu)
+    {
+        RTCPUID idCpu = RTMpCpuId();
+        if (RT_UNLIKELY(  pTimer->fAllCpus
+                        ? (RTCPUID)(pSubTimer - &pTimer->aSubTimers[0]) != idCpu
+                        : pTimer->idCpu != idCpu))
+        {
+            rtTimerLnxCallbackHandleMigration(pTimer, pSubTimer);
+            return HRTIMER_NORESTART;
+        }
     }
 #endif
@@ -678 +682 @@
     PRTTIMER            pTimer    = pSubTimer->pParent;
 
-    dprintf(("hrcallback %p\n", pTimer));
+    RTTIMERLNX_LOG(("stdcallback %p\n", pTimer));
     if (RT_UNLIKELY(!rtTimerLnxChangeToCallbackState(pSubTimer)))
         return;
@@ -686 +690 @@
      * Check for unwanted migration.
      */
-    if (   (pTimer->fSpecificCpu || pTimer->fAllCpus)
-        && RT_UNLIKELY((RTCPUID)(pSubTimer - &pTimer->aSubTimers[0]) != RTMpCpuId()))
-    {
-        rtTimerLnxCallbackHandleMigration(pTimer, pSubTimer);
-        return;
-    }
+    if (pTimer->fAllCpus || pTimer->fSpecificCpu)
+    {
+        RTCPUID idCpu = RTMpCpuId();
+        if (RT_UNLIKELY(  pTimer->fAllCpus
+                        ? (RTCPUID)(pSubTimer - &pTimer->aSubTimers[0]) != idCpu
+                        : pTimer->idCpu != idCpu))
+        {
+            rtTimerLnxCallbackHandleMigration(pTimer, pSubTimer);
+            return;
+        }
+    }
+
 #endif
 
@@ -910 +920 @@
              * them because of the STARTING state. This is an extremely unlikely case - not that
              * that means anything in my experience... ;-) */
+            RTTIMERLNX_LOG(("what!? iCpu=%u -> didn't start\n", iCpu));
         }
 
@@ -1152 +1163 @@
     if (!ASMAtomicUoReadBool(&pTimer->fSuspended))
         return VERR_TIMER_ACTIVE;
-    dprintf(("start %p\n", pTimer));
+    RTTIMERLNX_LOG(("start %p cCpus=%d\n", pTimer, pTimer->cCpus));
 
     Args.u64First = u64First;
@@ -1223 +1234 @@
 static bool rtTimerLnxStop(PRTTIMER pTimer, bool fForDestroy)
 {
-    dprintf(("lnxstop %p %d\n", pTimer, fForDestroy));
+    RTTIMERLNX_LOG(("lnxstop %p %d\n", pTimer, fForDestroy));
 #ifdef CONFIG_SMP
     /*
@@ -1288 +1299 @@
     AssertPtrReturn(pTimer, VERR_INVALID_HANDLE);
     AssertReturn(pTimer->u32Magic == RTTIMER_MAGIC, VERR_INVALID_HANDLE);
-    dprintf(("stop %p\n", pTimer));
+    RTTIMERLNX_LOG(("stop %p\n", pTimer));
 
     if (ASMAtomicUoReadBool(&pTimer->fSuspended))
@@ -1310 +1321 @@
     AssertReturn(pTimer->u32Magic == RTTIMER_MAGIC, VERR_INVALID_HANDLE);
     AssertReturn(u64NanoInterval, VERR_INVALID_PARAMETER);
-    dprintf(("change %p %llu\n", pTimer, u64NanoInterval));
+    RTTIMERLNX_LOG(("change %p %llu\n", pTimer, u64NanoInterval));
 
 #ifdef RTTIMER_LINUX_WITH_HRTIMER
@@ -1356 +1367 @@
     AssertPtrReturn(pTimer, VERR_INVALID_HANDLE);
     AssertReturn(pTimer->u32Magic == RTTIMER_MAGIC, VERR_INVALID_HANDLE);
-    dprintf(("destroy %p\n", pTimer));
+    RTTIMERLNX_LOG(("destroy %p\n", pTimer));
 
     /*
@@ -1516 +1527 @@
 #endif /* CONFIG_SMP */
 
-    dprintf(("create %p\n", pTimer));
+    RTTIMERLNX_LOG(("create %p hires=%d fFlags=%#x cCpus=%u\n", pTimer, pTimer->fHighRes, fFlags, cCpus));
     *ppTimer = pTimer;
     return VINF_SUCCESS;