Changeset 93 for trunk/src/helpers/timer.c

Timestamp:

Aug 3, 2001, 8:52:44 PM (24 years ago)

Author:

umoeller

Message:

Misc changes

File:

• trunk/src/helpers/timer.c (modified) (10 diffs)

trunk/src/helpers/timer.c

@@ -250 +250 @@
     PLINKLIST pllXTimers = (PLINKLIST)pSet->pvllXTimers;
     ULONG   cTimers = lstCountItems(pllXTimers);
+
+    #ifdef DEBUG_XTIMERS
+        _Pmpf((__FUNCTION__ ": entering"));
+    #endif
+
     if (!cTimers)
     {
@@ -278 +283 @@
             // only one timer:
             // that's easy
+            #ifdef DEBUG_XTIMERS
+                _Pmpf(("  got 1 timer"));
+            #endif
+
             pSet->ulPMTimeout = pTimer1->ulTimeout;
         }
@@ -285 +294 @@
             // find the greatest common denominator
             PXTIMER pTimer2 = (PXTIMER)pNode->pNext->pItemData;
+            #ifdef DEBUG_XTIMERS
+                _Pmpf(("  got 2 timers"));
+            #endif
 
             pSet->ulPMTimeout = mathGCD(pTimer1->ulTimeout,
@@ -297 +309 @@
                     i = 0;
 
-            // _Pmpf(("Recalculating, got %d timers", cTimers));
+            #ifdef DEBUG_XTIMERS
+                _Pmpf(("  got %d timers", cTimers));
+            #endif
 
             // fill an array of integers with the
@@ -305 +319 @@
                 pTimer1 = (PXTIMER)pNode->pItemData;
 
-                // _Pmpf(("  timeout %d is %d", i, pTimer1->ulTimeout));
+                #ifdef DEBUG_XTIMERS
+                    _Pmpf(("    timeout %d is %d", i, pTimer1->ulTimeout));
+                #endif
 
                 paInts[i++] = pTimer1->ulTimeout;
@@ -314 +330 @@
             pSet->ulPMTimeout = mathGCDMulti(paInts,
                                              cTimers);
-            // _Pmpf(("--> GCD is %d", pSet->ulPMTimeout));
-        }
+        }
+
+        #ifdef DEBUG_XTIMERS
+            _Pmpf(("--> GCD is %d", pSet->ulPMTimeout));
+        #endif
 
         if (    (!pSet->idPMTimerRunning)       // timer not running?
              || (pSet->ulPMTimeout != ulOldPMTimeout) // timeout changed?
            )
+        {
             // start or restart PM timer
             pSet->idPMTimerRunning = WinStartTimer(pSet->hab,
@@ -325 +345 @@
                                                    pSet->idPMTimer,
                                                    pSet->ulPMTimeout);
+        }
     }
 }
@@ -434 +455 @@
  *@@changed V0.9.12 (2001-05-24) [umoeller]: fixed crash if this got called during tmrTimerTick
  *@@changed V0.9.14 (2001-08-01) [umoeller]: fixed mem overwrite which might have caused crashes if this got called during tmrTimerTick
+ *@@changed V0.9.14 (2001-08-03) [umoeller]: fixed "half frequency" regression caused by frequency optimizations
  */
 
@@ -475 +497 @@
                                     &ulTimeNow, sizeof(ulTimeNow));
 
+                    #ifdef DEBUG_XTIMERS
+                        _Pmpf((__FUNCTION__ ": ulTimeNow = %d", ulTimeNow));
+                    #endif
+
                     while (pTimerNode)
                     {
@@ -484 +510 @@
                         PXTIMER pTimer = (PXTIMER)pTimerNode->pItemData;
 
+                        #ifdef DEBUG_XTIMERS
+                            _Pmpf(("   timer %d: ulNextFire = %d",
+                                    lstIndexFromItem(pllXTimers, pTimer),
+                                    pTimer->ulNextFire));
+                        #endif
+
                         if (    (pTimer)
-                             && (pTimer->ulNextFire < ulTimeNow)
+                             // && (pTimer->ulNextFire < ulTimeNow)
+                                // V0.9.14 (2001-08-01) [umoeller]
+                                // use <= because otherwise we'll get
+                                // only half the frequency...
+                                // we get here frequently where the
+                                // two values are EXACTLY equal due
+                                // to the above optimization (DosQuerySysInfo
+                                // called once only for the entire loop)
+                             && (pTimer->ulNextFire <= ulTimeNow)
                            )
                         {
                             // this timer has elapsed:
                             // fire!
+
+                            #ifdef DEBUG_XTIMERS
+                                _Pmpf(("   --> fire!"));
+                            #endif
+
                             if (WinIsWindow(pSet->hab,
                                             pTimer->hwndTarget))