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

Timestamp:

Aug 2, 2001, 10:36:35 PM (24 years ago)

Author:

umoeller

Message:

Misc changes

File:

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

trunk/src/helpers/timer.c

@@ -110 +110 @@
 #include "helpers\linklist.h"
 #include "helpers\math.h"
+#include "helpers\standards.h"
 #include "helpers\threads.h"
 #include "helpers\timer.h"
@@ -248 +249 @@
 {
     PLINKLIST pllXTimers = (PLINKLIST)pSet->pvllXTimers;
-    PLISTNODE pNode = lstQueryFirstNode(pllXTimers);
-    if (!pNode)
+    ULONG   cTimers = lstCountItems(pllXTimers);
+    if (!cTimers)
     {
         // no XTimers running:
@@ -268 +269 @@
         // we have timers:
 
-        ULONG ulOldPMTimeout = pSet->ulPMTimeout;
-
-        if (!pNode->pNext)
+        ULONG       ulOldPMTimeout = pSet->ulPMTimeout;
+
+        PLISTNODE   pNode = lstQueryFirstNode(pllXTimers);
+        PXTIMER     pTimer1 = (PXTIMER)pNode->pItemData;
+
+        if (cTimers == 1)
         {
             // only one timer:
             // that's easy
-            PXTIMER pTimer = (PXTIMER)pNode->pItemData;
-            pSet->ulPMTimeout = pTimer->ulTimeout;
-        }
-        else if (!pNode->pNext->pNext)
+            pSet->ulPMTimeout = pTimer1->ulTimeout;
+        }
+        else if (cTimers == 2)
         {
             // exactly two timers:
             // find the greatest common denominator
-            PXTIMER pTimer1 = (PXTIMER)pNode->pItemData,
-                    pTimer2 = (PXTIMER)pNode->pNext->pItemData;
+            PXTIMER pTimer2 = (PXTIMER)pNode->pNext->pItemData;
 
             pSet->ulPMTimeout = mathGCD(pTimer1->ulTimeout,
@@ -289 +291 @@
         else
         {
-            // several timers:
+            // more than two timers:
             // run through all timers and find the greatest
             // common denominator of all frequencies...
-
-            ULONG   cTimers = lstCountItems(pllXTimers);
             int     *paInts = (int*)_alloca(sizeof(int) * cTimers),
                     i = 0;
 
-            _Pmpf(("Recalculating, got %d timers %d", cTimers));
+            // _Pmpf(("Recalculating, got %d timers", cTimers));
 
             // fill an array of integers with the
@@ -303 +303 @@
             while (pNode)
             {
-                PXTIMER pTimer = (PXTIMER)pNode->pItemData;
-
-                _Pmpf(("  timeout %d is %d", i, pTimer->ulTimeout));
-
-                paInts[i++] = pTimer->ulTimeout;
+                pTimer1 = (PXTIMER)pNode->pItemData;
+
+                // _Pmpf(("  timeout %d is %d", i, pTimer1->ulTimeout));
+
+                paInts[i++] = pTimer1->ulTimeout;
 
                 pNode = pNode->pNext;
@@ -314 +314 @@
             pSet->ulPMTimeout = mathGCDMulti(paInts,
                                              cTimers);
-            _Pmpf(("--> GCD is %d", pSet->ulPMTimeout));
-        }
-
-        if (    (pSet->idPMTimerRunning == 0)       // timer not running?
+            // _Pmpf(("--> GCD is %d", pSet->ulPMTimeout));
+        }
+
+        if (    (!pSet->idPMTimerRunning)       // timer not running?
              || (pSet->ulPMTimeout != ulOldPMTimeout) // timeout changed?
            )
@@ -355 +355 @@
                         USHORT usPMTimerID)
 {
-    PXTIMERSET pSet = NULL;
-
-    pSet = (PXTIMERSET)malloc(sizeof(*pSet));
+    PXTIMERSET pSet = NEW(XTIMERSET);
     if (pSet)
     {
@@ -434 +432 @@
  *@@added V0.9.9 (2001-02-28) [umoeller]
  *@@changed V0.9.12 (2001-05-12) [umoeller]: added mutex protection
- *@@changed V0.9.12 (2001-05-24) [umoeller]: fixed crash if timer was deleted during winproc's WM_TIMER processing
+ *@@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
  */
 
@@ -498 +497 @@
                                 PFNWP pfnwp = (PFNWP)WinQueryWindowPtr(pTimer->hwndTarget,
                                                                        QWP_PFNWP);
+
+                                // moved this up V0.9.14 (2001-08-01) [umoeller]
+                                pTimer->ulNextFire = ulTimeNow + pTimer->ulTimeout;
+
                                 // call the window proc DIRECTLY
                                 pfnwp(pTimer->hwndTarget,
@@ -511 +514 @@
                                     //    the list, so we'll see it in this loop
 
-                                pTimer->ulNextFire = ulTimeNow + pTimer->ulTimeout;
+                                // V0.9.14 (2001-08-01) [umoeller]
+
+                                // DO NOT REFERENCE pTimer AFTER THIS CODE;
+                                // tmrTimerTick might have removed the timer,
+                                // and since the list is auto-free, pTimer
+                                // might have been freed!!
                             }
                             else
@@ -598 +606 @@
 
                 // fix the timeout... we allow only multiples of
-                // 20, and it must be at least 20 (otherwise our
+                // 25, and it must be at least 25 (otherwise our
                 // internal master timer calculations will fail)
                 // V0.9.14 (2001-07-07) [umoeller]
@@ -607 +615 @@
 
                 // check if this timer exists already
-                pTimer = FindTimer(pSet,
-                                   hwnd,
-                                   usTimerID);
-                if (pTimer)
+                if (pTimer = FindTimer(pSet,
+                                       hwnd,
+                                       usTimerID))
                 {
                     // exists already: reset only
@@ -617 +624 @@
                                     &ulTimeNow, sizeof(ulTimeNow));
                     pTimer->ulNextFire = ulTimeNow + ulTimeout;
-                    usrc = pTimer->usTimerID;
+                    usrc = usTimerID;
                 }
                 else
                 {
                     // new timer needed:
-                    pTimer = (PXTIMER)malloc(sizeof(XTIMER));
-                    if (pTimer)
+                    if (pTimer = NEW(XTIMER))
                     {
                         ULONG ulTimeNow;
@@ -635 +641 @@
                         lstAppendItem(pllXTimers,
                                       pTimer);
-                        usrc = pTimer->usTimerID;
+                        usrc = usTimerID;
                     }
                 }
@@ -673 +679 @@
         if (pSet && pSet->pvllXTimers)
         {
-            PLINKLIST pllXTimers = (PLINKLIST)pSet->pvllXTimers;
-            BOOL fLocked = FALSE;
+            // PLINKLIST pllXTimers = (PLINKLIST)pSet->pvllXTimers;
 
             PXTIMER pTimer = FindTimer(pSet,