Changeset 32670 in vbox

Timestamp:

Sep 21, 2010 4:21:55 PM (14 years ago)

Author:

vboxsync

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

66085

Message:

timer-r0drv-linux.c: bug fixes. The ugly guest debugging tracking will be removed when fully debugged.

File:

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

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

@@ -209 +209 @@
 #endif
 
+#if 0
+#define DEBUG_HACKING
+#include <iprt/string.h>
+#include <iprt/asm-amd64-x86.h>
+static void myLogBackdoorPrintf(const char *pszFormat, ...)
+{
+    char        szTmp[256];
+    va_list     args;
+    size_t      cb;
+
+    cb = RTStrPrintf(szTmp, sizeof(szTmp) - 10, "%d: ", RTMpCpuId());
+    va_start(args, pszFormat);
+    cb += RTStrPrintfV(&szTmp[cb], sizeof(szTmp) - cb, pszFormat, args);
+    va_end(args);
+
+    ASMOutStrU8(0x504, (uint8_t *)&szTmp[0], cb);
+}
+#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
+#else
+#define dprintf(a)          do { } while (0)
+#endif
 
 /**
@@ -215 +239 @@
 DECLINLINE(void) rtTimerLnxSetState(RTTIMERLNXSTATE volatile *penmState, RTTIMERLNXSTATE enmNewState)
 {
+#ifdef DEBUG_HACKING
+    dprintf(("set %d -> %d\n", *penmState, enmNewState));
+#endif
     ASMAtomicWriteU32((uint32_t volatile *)penmState, enmNewState);
 }
@@ -225 +252 @@
  * @return false if xchg wasn't done.
  */
-DECLINLINE(bool) rtTimerLnxCmpXchgState(RTTIMERLNXSTATE volatile *penmState, RTTIMERLNXSTATE enmNewState, RTTIMERLNXSTATE enmCurState)
+#ifdef DEBUG_HACKING
+#define rtTimerLnxCmpXchgState(penmState, enmNewState, enmCurState) rtTimerLnxCmpXchgStateDebug(penmState, enmNewState, enmCurState, __LINE__)
+static bool rtTimerLnxCmpXchgStateDebug(RTTIMERLNXSTATE volatile *penmState, RTTIMERLNXSTATE enmNewState,
+                                        RTTIMERLNXSTATE enmCurState, uint32_t uLine)
+{
+    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));
+    return fRc;
+}
+#else
+DECLINLINE(bool) rtTimerLnxCmpXchgState(RTTIMERLNXSTATE volatile *penmState, RTTIMERLNXSTATE enmNewState,
+                                        RTTIMERLNXSTATE enmCurState)
 {
     return ASMAtomicCmpXchgU32((uint32_t volatile *)penmState, enmNewState, enmCurState);
 }
+#endif
 
 
@@ -312 +352 @@
         pSubTimer->u.Std.u64NextTS  = u64NextTS;
     }
+    dprintf(("startsubtimer %p\n", pSubTimer->pParent));
 
     pSubTimer->iTick = 0;
@@ -349 +390 @@
 static void rtTimerLnxStopSubTimer(PRTTIMERLNXSUBTIMER pSubTimer, bool fHighRes)
 {
+    dprintf(("stopsubtimer %p %d\n", pSubTimer->pParent, fHighRes));
 #ifdef RTTIMER_LINUX_WITH_HRTIMER
     if (fHighRes)
@@ -372 +414 @@
     RTSPINLOCK hSpinlock = pTimer->hSpinlock;
     Assert(pTimer->fSuspended);
+    dprintf(("destroyit %p\n", pTimer));
 
     /*
@@ -391 +434 @@
      */
     ASMAtomicWriteU32(&pTimer->u32Magic, ~RTTIMER_MAGIC);
+#if 0 /*fixme*/
+    rtR0MemFreeNoCtxCheck(pTimer);
+#else
     RTMemFree(pTimer);
+#endif
     if (hSpinlock != NIL_RTSPINLOCK)
         RTSpinlockDestroy(hSpinlock);
@@ -548 +595 @@
 
 
+    dprintf(("hrcallback %p\n", pTimer));
     if (RT_UNLIKELY(!rtTimerLnxChangeToCallbackState(pSubTimer)))
         return HRTIMER_NORESTART;
@@ -634 +682 @@
     PRTTIMER            pTimer    = pSubTimer->pParent;
 
+    dprintf(("hrcallback %p\n", pTimer));
     if (RT_UNLIKELY(!rtTimerLnxChangeToCallbackState(pSubTimer)))
         return;
@@ -1094 +1143 @@
     if (!ASMAtomicUoReadBool(&pTimer->fSuspended))
         return VERR_TIMER_ACTIVE;
+    dprintf(("start %p\n", pTimer));
 
     Args.u64First = u64First;
@@ -1138 +1188 @@
             case RTTIMERLNXSTATE_CALLBACK:
             case RTTIMERLNXSTATE_CB_STOPPING:
-                if (rtTimerLnxCmpXchgState(&pTimer->aSubTimers[0].enmState, RTTIMERLNXSTATE_ACTIVE, enmState))
+                if (rtTimerLnxCmpXchgState(&pTimer->aSubTimers[0].enmState, RTTIMERLNXSTATE_CB_RESTARTING, enmState))
                 {
                     ASMAtomicWriteBool(&pTimer->fSuspended, false);
@@ -1164 +1214 @@
 static bool rtTimerLnxStop(PRTTIMER pTimer, bool fForDestroy)
 {
+    dprintf(("lnxstop %p %d\n", pTimer, fForDestroy));
 #ifdef CONFIG_SMP
     /*
@@ -1228 +1279 @@
     AssertPtrReturn(pTimer, VERR_INVALID_HANDLE);
     AssertReturn(pTimer->u32Magic == RTTIMER_MAGIC, VERR_INVALID_HANDLE);
+    dprintf(("stop %p\n", pTimer));
 
     if (ASMAtomicUoReadBool(&pTimer->fSuspended))
@@ -1246 +1298 @@
     AssertReturn(pTimer->u32Magic == RTTIMER_MAGIC, VERR_INVALID_HANDLE);
     AssertReturn(u64NanoInterval, VERR_INVALID_PARAMETER);
+    dprintf(("change %p %llu\n", pTimer, u64NanoInterval));
 
 #ifdef RTTIMER_LINUX_WITH_HRTIMER
@@ -1282 +1335 @@
     AssertPtrReturn(pTimer, VERR_INVALID_HANDLE);
     AssertReturn(pTimer->u32Magic == RTTIMER_MAGIC, VERR_INVALID_HANDLE);
+    dprintf(("destroy %p\n", pTimer));
 
     /*
@@ -1439 +1493 @@
 #endif /* CONFIG_SMP */
 
+    dprintf(("create %p\n", pTimer));
     *ppTimer = pTimer;
     return VINF_SUCCESS;