Changeset 6183 in vbox

Timestamp:

Dec 24, 2007 9:03:59 AM (17 years ago)

Author:

vboxsync

Message:

Back out of r26783.

Location:

trunk/src/VBox/VMM

Files:

• TM.cpp (modified) (4 diffs)
• TMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/TM.cpp

@@ -1314 +1314 @@
 #endif
     if (    !VM_FF_ISSET(pVM, VM_FF_TIMER)
-        &&  !pVM->tm.s.fRunningTimers
         &&  (   pVM->tm.s.paTimerQueuesR3[TMCLOCK_VIRTUAL_SYNC].offSchedule
             ||  pVM->tm.s.paTimerQueuesR3[TMCLOCK_VIRTUAL].offSchedule
@@ -1322 +1321 @@
             )
         && !VM_FF_ISSET(pVM, VM_FF_TIMER)
-        && !pVM->tm.s.fRunningTimers
        )
     {
@@ -1349 +1347 @@
      */
     AssertCompile(TMCLOCK_MAX == 4);
-    ASMAtomicXchgBool(&pVM->tm.s.fRunningTimers, true);
-    VM_FF_CLEAR(pVM, VM_FF_TIMER);
 
     /* TMCLOCK_VIRTUAL_SYNC */
@@ -1387 +1383 @@
 
     /* done. */
-    ASMAtomicXchgBool(&pVM->tm.s.fRunningTimers, false);
+    VM_FF_CLEAR(pVM, VM_FF_TIMER);
 
 #ifdef VBOX_STRICT

trunk/src/VBox/VMM/TMInternal.h

@@ -413 +413 @@
     /** Interval in milliseconds of the pTimer timer. */
     uint32_t                    u32TimerMillies;
-    /** Indicate that we're running times and that the timer
-     * callback shouldn't set the FF. */ 
-    bool                        fRunningTimers;
-
-    bool                        afPadding[3]; /**< Alignment. */
+
+    /** Alignment padding to ensure that the statistics are 64-bit aligned when using GCC. */
+    uint32_t                    u32Padding1;
 
     /** TMR3TimerQueuesDo