Changeset 31606 in vbox for trunk/src/VBox

Timestamp:

Aug 12, 2010 3:22:39 PM (14 years ago)

Author:

vboxsync

Message:

Timer init changes

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (7 diffs)
• PGMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/PGM.cpp

@@ -633 +633 @@
 # ifdef DEBUG_sandervl
 static DECLCALLBACK(int)  pgmR3CmdCountPhysWrites(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult);
+static DECLCALLBACK(void) pgmR3PhysWriteCountTMCallback(PVM pVM, PTMTIMER pTimer, void *pvUser);
 # endif
 static DECLCALLBACK(int)  pgmR3CmdPhysToFile(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult);
@@ -2141 +2142 @@
     if (pVM->pgm.s.fRamPreAlloc)
         rc = pgmR3PhysRamPreAllocate(pVM);
+
+#ifdef DEBUG_sandervl
+    rc = TMR3TimerCreateInternal(pVM, TMCLOCK_REAL, pgmR3PhysWriteCountTMCallback, NULL, "Physical page write counting timer", &pVM->pgm.s.pPhysWritesCountTimer);
+    AssertRC(rc);
+#endif
 
     LogRel(("PGMR3InitFinalize: 4 MB PSE mask %RGp\n", pVM->pgm.s.GCPhys4MBPSEMask));
@@ -4308 +4314 @@
 }
 
+# ifdef DEBUG_sandervl
 /**
  * Internal timer callback function.
@@ -4315 +4322 @@
  * @param   pvUser          User argument specified upon timer creation.
  */
-DECLCALLBACK(void) pgmR3PhysWriteCountTMCallback(PVM pVM, PTMTIMER pTimer, void *pvUser)
-{
-    uint32_t uInterval = (uint32_t)(uintptr_t)pvUser;
-
+static DECLCALLBACK(void) pgmR3PhysWriteCountTMCallback(PVM pVM, PTMTIMER pTimer, void *pvUser)
+{
     if (pVM->pgm.s.fCountingPhysWrites)
     {
@@ -4324 +4329 @@
 
         /* Program next invocation. */
-        int rc = TMTimerSetMillies(pVM->pgm.s.pPhysWritesCountTimer, uInterval);
+        int rc = TMTimerSetMillies(pVM->pgm.s.pPhysWritesCountTimer, pVM->pgm.s.u32PhysWriteCountTimerInterval);
         AssertRC(rc);
     }
 }
 
-# ifdef DEBUG_sandervl
 /**
  * The '.pgmcountphyswrites' command.
@@ -4358 +4362 @@
 
         TMTimerStop(pVM->pgm.s.pPhysWritesCountTimer);
-        TMR3TimerDestroy(pVM->pgm.s.pPhysWritesCountTimer);
-        pVM->pgm.s.pPhysWritesCountTimer = NULL;
         pVM->pgm.s.fCountingPhysWrites = false;
         return VINF_SUCCESS;
@@ -4371 +4373 @@
         return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Invalid 2nd argument '%d', must be between 10 and 1000 ms.\n", paArgs[1].u.u64Number);
 
-    int rc = TMR3TimerCreateInternal(pVM, TMCLOCK_REAL, pgmR3PhysWriteCountTMCallback, (void *)(uint32_t)paArgs[1].u.u64Number, "Physical page write counting timer", &pVM->pgm.s.pPhysWritesCountTimer);
-    if (RT_FAILURE(rc))
-        return rc;
-
+    pVM->pgm.s.u32PhysWriteCountTimerInterval = paArgs[1].u.u64Number;
     pVM->pgm.s.fCountingPhysWrites = true;
-    rc = TMTimerSetMillies(pVM->pgm.s.pPhysWritesCountTimer, paArgs[1].u.u64Number);
+    int rc = TMTimerSetMillies(pVM->pgm.s.pPhysWritesCountTimer, paArgs[1].u.u64Number);
     AssertRC(rc);
     return VINF_SUCCESS;

trunk/src/VBox/VMM/PGMInternal.h

@@ -3141 +3141 @@
     /** @} */
 
-#ifdef VBOX_STRICT
+#ifdef DEBUG_sandervl
     PTMTIMERR3                      pPhysWritesCountTimer;
+    uint32_t                        u32PhysWriteCountTimerInterval;
     bool                            fCountingPhysWrites;
-    uint8_t                         u8Alignment[7];
+    uint8_t                         u8Alignment[3];
 
     STAMCOUNTER                     StatR3FTPhysPageWrite;              /**< R3: The number of times a physical page was written to (FT stats) */