Changeset 37517 in vbox for trunk/include/VBox/vmm

Timestamp:

Jun 16, 2011 7:24:00 PM (14 years ago)

Author:

vboxsync

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

72345

Message:

TM: Simplified the virtual sync timers by requiring changes to be done while holding the virtual sync lock. This means we can skip all the pending states and move timers on and off the active list immediately, avoiding the problems with timers being on the pending-scheduling list. Also made u64VirtualSync keep track of the last time stamp all the time (when under the lock) and thus really making sure time does not jump backwards.

Location:

trunk/include/VBox/vmm

Files:

• tm.h (modified) (2 diffs)
• vm.h (modified) (2 diffs)

trunk/include/VBox/vmm/tm.h

@@ -217 +217 @@
 VMMDECL(int)            TMTimerSet(PTMTIMER pTimer, uint64_t u64Expire);
 VMMDECL(int)            TMTimerSetRelative(PTMTIMER pTimer, uint64_t cTicksToNext, uint64_t *pu64Now);
+VMMDECL(int)            TMTimerSetFrequencyHint(PTMTIMER pTimer, uint32_t uHz);
+VMMDECL(uint64_t)       TMTimerGet(PTMTIMER pTimer);
+VMMDECL(int)            TMTimerStop(PTMTIMER pTimer);
+VMMDECL(bool)           TMTimerIsActive(PTMTIMER pTimer);
+
 VMMDECL(int)            TMTimerSetMillies(PTMTIMER pTimer, uint32_t cMilliesToNext);
 VMMDECL(int)            TMTimerSetMicro(PTMTIMER pTimer, uint64_t cMicrosToNext);
 VMMDECL(int)            TMTimerSetNano(PTMTIMER pTimer, uint64_t cNanosToNext);
-VMMDECL(int)            TMTimerSetFrequencyHint(PTMTIMER pTimer, uint32_t uHz);
-VMMDECL(uint64_t)       TMTimerGet(PTMTIMER pTimer);
 VMMDECL(uint64_t)       TMTimerGetNano(PTMTIMER pTimer);
 VMMDECL(uint64_t)       TMTimerGetMicro(PTMTIMER pTimer);
@@ -227 +230 @@
 VMMDECL(uint64_t)       TMTimerGetFreq(PTMTIMER pTimer);
 VMMDECL(uint64_t)       TMTimerGetExpire(PTMTIMER pTimer);
-VMMDECL(uint64_t)       TMTimerToNano(PTMTIMER pTimer, uint64_t u64Ticks);
-VMMDECL(uint64_t)       TMTimerToMicro(PTMTIMER pTimer, uint64_t u64Ticks);
-VMMDECL(uint64_t)       TMTimerToMilli(PTMTIMER pTimer, uint64_t u64Ticks);
-VMMDECL(uint64_t)       TMTimerFromNano(PTMTIMER pTimer, uint64_t u64NanoTS);
-VMMDECL(uint64_t)       TMTimerFromMicro(PTMTIMER pTimer, uint64_t u64MicroTS);
-VMMDECL(uint64_t)       TMTimerFromMilli(PTMTIMER pTimer, uint64_t u64MilliTS);
-VMMDECL(int)            TMTimerStop(PTMTIMER pTimer);
-VMMDECL(bool)           TMTimerIsActive(PTMTIMER pTimer);
+VMMDECL(uint64_t)       TMTimerToNano(PTMTIMER pTimer, uint64_t cTicks);
+VMMDECL(uint64_t)       TMTimerToMicro(PTMTIMER pTimer, uint64_t cTicks);
+VMMDECL(uint64_t)       TMTimerToMilli(PTMTIMER pTimer, uint64_t cTicks);
+VMMDECL(uint64_t)       TMTimerFromNano(PTMTIMER pTimer, uint64_t cNanoSecs);
+VMMDECL(uint64_t)       TMTimerFromMicro(PTMTIMER pTimer, uint64_t cMicroSecs);
+VMMDECL(uint64_t)       TMTimerFromMilli(PTMTIMER pTimer, uint64_t cMilliSecs);
+
 VMMDECL(bool)           TMTimerPollBool(PVM pVM, PVMCPU pVCpu);
 VMM_INT_DECL(void)      TMTimerPollVoid(PVM pVM, PVMCPU pVCpu);

trunk/include/VBox/vmm/vm.h

@@ -1014 +1014 @@
         struct TM   s;
 #endif
-        uint8_t     padding[2176];      /* multiple of 64 */
+        uint8_t     padding[2432];      /* multiple of 64 */
     } tm;
 
@@ -1075 +1075 @@
 
     /** Padding for aligning the cpu array on a page boundary. */
-    uint8_t         abAlignment2[1118];
+    uint8_t         abAlignment2[862];
 
     /* ---- end small stuff ---- */