Changeset 2468 in vbox for trunk

Timestamp:

May 3, 2007 4:43:10 PM (18 years ago)

Author:

vboxsync

Message:

Dropping the VBOX_WITH_VIRTUAL_SYNC_TIMERS #ifdefs, making it default.

Location:

trunk/src/VBox/Devices

Files:

• Makefile (modified) (1 diff)
• PC/DevACPI.cpp (modified) (1 diff)
• PC/DevAPIC.cpp (modified) (1 diff)
• PC/DevPit-i8254.cpp (modified) (7 diffs)
• PC/DevRTC.cpp (modified) (1 diff)
• testcase/Makefile (modified) (1 diff)
• testcase/tstDeviceStructSizeGC.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Makefile

@@ -54 +54 @@
  DEFS += VBOX_WITH_INTERNAL_NETWORKING
 endif
-#ifeq ($(USERNAME),bird)
- DEFS += VBOX_WITH_VIRTUAL_SYNC_TIMERS
-#endif
 
 # enable the pdm lock.

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -1595 +1595 @@
     }
 
-#ifdef VBOX_WITH_VIRTUAL_SYNC_TIMERS
     rc = PDMDevHlpTMTimerCreate (pDevIns, TMCLOCK_VIRTUAL_SYNC, acpiTimer, "ACPI Timer", &s->tsHC);
-#else
-    rc = PDMDevHlpTMTimerCreate (pDevIns, TMCLOCK_VIRTUAL, acpiTimer, "ACPI Timer", &s->tsHC);
-#endif 
     if (VBOX_FAILURE(rc))
     {

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -1725 +1725 @@
      * Create the APIC timer.
      */
-#ifdef VBOX_WITH_VIRTUAL_SYNC_TIMERS
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL_SYNC, apicTimer,
-#else
-    rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, apicTimer,
-#endif
                                 "APIC Timer", &pData->CTXSUFF(pTimer));
     if (VBOX_FAILURE(rc))

trunk/src/VBox/Devices/PC/DevPit-i8254.cpp

@@ -93 +93 @@
      * As apposed to the next_transition_time which contains the correct time of the next tick. */
     uint64_t            u64NextTS;
-#ifndef VBOX_WITH_VIRTUAL_SYNC_TIMERS
-    /** When to give up catching up. (negative number) */
-    int64_t             i64MaxCatchupTS;
-#endif
 
     /** (count_load_time is only set by TMTimerGet() which returns uint64_t) */
@@ -138 +134 @@
     /** Profiling the timer callback handler. */
     STAMPROFILEADV          StatPITHandler;
-#ifndef VBOX_WITH_VIRTUAL_SYNC_TIMERS
-    /** The number of times we've had to speed up the time because we lagged too far behind. */
-    STAMCOUNTER             StatPITCatchup;
-    /** The number of times we've lagged too far behind for it to be worth trying to catch up. */
-    STAMCOUNTER             StatPITGiveup;
-#endif
 } PITState;
 
@@ -404 +394 @@
     }
 
-#ifdef VBOX_WITH_VIRTUAL_SYNC_TIMERS
     if (expire_time != -1)
     {
@@ -410 +399 @@
         TMTimerSet(s->CTXSUFF(pTimer), s->u64NextTS);
     }
-#else
-    /* check if it expires too soon - move at 4x rate if it does. */
-    if (expire_time != -1)
-    {
-        int64_t delta = expire_time - now;
-        const int64_t quarter = (expire_time - s->next_transition_time) >> 2;
-        if (delta <= quarter && s->next_transition_time != -1)
-        {
-            if (delta >= s->i64MaxCatchupTS)
-            {
-                /* If we set the timer to 'expire_time' we could end up with flooding the guest
-                 * with timer interrupts because the next interrupt(s) would probably raise
-                 * immediately. Therefore we set the timer to 'now + quarter' with quarter>0.
-                 * This delays the adaption a little bit. */
-                STAM_COUNTER_INC(&s->CTXSUFF(pPit)->StatPITCatchup);
-                s->u64NextTS = now + quarter;
-                LogFlow(("PIT: m=%d cnt=%#4x irq=%#x delay=%8RI64 next=%20RI64 now=%20RI64 load=%20RI64 %9RI64 delta=%9RI64\n",
-                         s->mode, s->count, irq_level, quarter, s->u64NextTS, now, s->count_load_time,
-                         ASMMultU64ByU32DivByU32(s->u64NextTS - s->count_load_time, PIT_FREQ, TMTimerGetFreq(pTimer)), delta));
-            }
-            else
-            {
-                /* We are too far away from the real time. Hard synchronize. */
-                STAM_COUNTER_INC(&s->CTXSUFF(pPit)->StatPITGiveup);
-                s->u64NextTS = expire_time = pit_get_next_transition_time(s, now);
-                LogFlow(("PIT: m=%d cnt=%#4x irq=%#x delay=%8RI64 next=%20RI64 now=%20RI64 load=%20RI64 %9RI64 delta=%9RI64 giving up!\n",
-                         s->mode, s->count, irq_level, quarter, s->u64NextTS, now, s->count_load_time,
-                         ASMMultU64ByU32DivByU32(s->u64NextTS - s->count_load_time, PIT_FREQ, TMTimerGetFreq(pTimer)), delta));
-            }
-        }
-        else
-        {
-            /* Everything is fine, just set the timer to the regular next expire_time. */
-            s->u64NextTS = expire_time;
-            LogFlow(("PIT: m=%d cnt=%#4x irq=%#x delay=%8RI64 next=%20RI64 now=%20RI64 load=%20RI64 %9RI64\n",
-                     s->mode, s->count, irq_level, expire_time - now, expire_time, now, s->count_load_time,
-                     ASMMultU64ByU32DivByU32(expire_time - s->count_load_time, PIT_FREQ, TMTimerGetFreq(pTimer))));
-        }
-        TMTimerSet(s->CTXSUFF(pTimer), s->u64NextTS);
-    }
-#endif 
     else
     {
@@ -993 +941 @@
      * Create timer, register I/O Ports and save state.
      */
-#ifdef VBOX_WITH_VIRTUAL_SYNC_TIMERS
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL_SYNC, pitTimer, "i8254 Programmable Interval Timer",
-#else
-    rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, pitTimer, "i8254 Programmable Interval Timer",
-#endif
                                 &pData->channels[0].CTXSUFF(pTimer));
     if (VBOX_FAILURE(rc))
@@ -1040 +984 @@
         return rc;
 
-#ifndef VBOX_WITH_VIRTUAL_SYNC_TIMERS
-    /*
-     * Calculate max catchup time.
-     */
-    pData->channels[0].i64MaxCatchupTS = pData->channels[1].i64MaxCatchupTS
-        = pData->channels[2].i64MaxCatchupTS = -TMTimerFromMilli(pData->channels[0].CTXSUFF(pTimer), 1000*60*2); /* 2 min */
-#endif 
-
     /*
      * Initialize the device state.
@@ -1058 +994 @@
     PDMDevHlpSTAMRegister(pDevIns, &pData->StatPITIrq,      STAMTYPE_COUNTER, "/TM/PIT/Irq",      STAMUNIT_OCCURENCES,     "The number of times a timer interrupt was triggered.");
     PDMDevHlpSTAMRegister(pDevIns, &pData->StatPITHandler,  STAMTYPE_PROFILE, "/TM/PIT/Handler",  STAMUNIT_TICKS_PER_CALL, "Profiling timer callback handler.");
-#ifndef VBOX_WITH_VIRTUAL_SYNC_TIMERS
-    PDMDevHlpSTAMRegister(pDevIns, &pData->StatPITCatchup,  STAMTYPE_COUNTER, "/TM/PIT/Catchup",  STAMUNIT_OCCURENCES,     "The number of times we lagged too far behind.");
-    PDMDevHlpSTAMRegister(pDevIns, &pData->StatPITGiveup,   STAMTYPE_COUNTER, "/TM/PIT/Giveup",   STAMUNIT_OCCURENCES,     "The number of times we lagged so far behind that we simply gave up.");
-#endif 
 
     PDMDevHlpDBGFInfoRegister(pDevIns, "pit", "Display PIT (i8254) status. (no arguments)", pitInfo);

trunk/src/VBox/Devices/PC/DevRTC.cpp

@@ -165 +165 @@
         next_irq_clock = (cur_clock & ~(uint64_t)(period - 1)) + period;
         s->next_periodic_time = ASMMultU64ByU32DivByU32(next_irq_clock, freq, 32768) + 1;
-#ifdef VBOX_WITH_VIRTUAL_SYNC_TIMERS
         TMTimerSet(s->CTXSUFF(pPeriodicTimer), s->next_periodic_time);
         
-#else
-        /* fiddly bits for dealing with running to keep up and losing interrupts. */
-        uint64_t quarter_period_time = ASMMultU64ByU32DivByU32(period, freq, 32768 * 4);
-        uint64_t now = TMTimerGet(s->CTXSUFF(pPeriodicTimer));
-        int64_t delta = s->next_periodic_time - now;
-        if (delta >= (int64_t)quarter_period_time)
-        {
-            TMTimerSet(s->CTXSUFF(pPeriodicTimer), s->next_periodic_time);
-            Log2(("period=%d current_time=%RU64 next=%RU64 delta=%-10RI64\n", period, current_time, s->next_periodic_time, delta));
-        }
-        else
-        {
-            uint64_t next = now + quarter_period_time; /* 4x speed */
-            TMTimerSet(s->CTXSUFF(pPeriodicTimer), next);
-            Log2(("period=%d current_time=%RU64 next=%RU64 delta=%-10RI64 now=%RU64 real_next=%RU64\n", period, current_time,
-                  s->next_periodic_time, delta, now, next));
-        }
-#endif
     } else {
         TMTimerStop(s->CTXSUFF(pPeriodicTimer));

trunk/src/VBox/Devices/testcase/Makefile

@@ -26 +26 @@
 #
 PROGRAMS = tstDeviceStructSize tstDeviceStructSizeGC
-
-## temp hack.
-#ifeq ($(USERNAME),bird)
- DEFS += VBOX_WITH_VIRTUAL_SYNC_TIMERS
-#endif
 
 

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp

@@ -447 +447 @@
     GEN_CHECK_OFF(PITChannelState, u64ReloadTS);
     GEN_CHECK_OFF(PITChannelState, u64NextTS);
-#ifndef VBOX_WITH_VIRTUAL_SYNC_TIMERS
-    GEN_CHECK_OFF(PITChannelState, i64MaxCatchupTS);
-#endif
     GEN_CHECK_OFF(PITChannelState, count_load_time);
     GEN_CHECK_OFF(PITChannelState, next_transition_time);
@@ -474 +471 @@
     GEN_CHECK_OFF(PITState, StatPITIrq);
     GEN_CHECK_OFF(PITState, StatPITHandler);
-#ifndef VBOX_WITH_VIRTUAL_SYNC_TIMERS
-    GEN_CHECK_OFF(PITState, StatPITCatchup);
-    GEN_CHECK_OFF(PITState, StatPITGiveup);
-#endif
 
     /* PC/DevRTC.cpp */