Ticket #3010: timer.diff

backends/timer/default/default-timer.cpp

@@ -29 +29 @@
 struct TimerSlot {
         Common::TimerManager::TimerProc callback;
         void *refCon;
-        int32 interval;
-        int32 nextFireTime;
+        uint32 interval;        // microseconds
+        uint32 nextFireTime;    // milliseconds
+        uint32 microsecs;
         
         TimerSlot *next;
 };
@@ -39 +40 @@
         // The head points to a fake anchor TimerSlot; this common
         // trick allows us to get rid of many special cases.
         
-        const int32 nextFireTime = newSlot->nextFireTime;
+        const uint32 nextFireTime = newSlot->nextFireTime;
         TimerSlot *slot = head;
         newSlot->next = 0;
 
@@ -80 +81 @@
 void DefaultTimerManager::handler() {
         Common::StackLock lock(_mutex);
 
-        const int32 curTime = g_system->getMillis() * 1000;
+        const uint32 curTime = g_system->getMillis();
         
         // Repeat as long as there is a TimerSlot that is scheduled to fire.
         TimerSlot *slot = _head->next;
@@ -92 +93 @@
                 // queue. Has to be done before the timer callback is invoked, in case
                 // the callback wants to remove itself.
                 assert(slot->interval > 0);
-                slot->nextFireTime += slot->interval;
+                slot->nextFireTime += (slot->interval / 1000);
+                slot->microsecs += (slot->interval % 1000);
+                if (slot->microsecs > 1000) {
+                        slot->nextFireTime++;
+                        slot->microsecs -= 1000;
+                }
                 insertPrioQueue(_head, slot);
 
                 // Invoke the timer callback
@@ -108 +114 @@
         assert(interval > 0);
         Common::StackLock lock(_mutex);
         
-        
         TimerSlot *slot = new TimerSlot;
         slot->callback = callback;
         slot->refCon = refCon;
         slot->interval = interval;
-        slot->nextFireTime = g_system->getMillis() * 1000 + interval;
+        slot->nextFireTime = g_system->getMillis() + interval / 1000;
+        slot->microsecs = interval % 1000;
         slot->next = 0;
         
         insertPrioQueue(_head, slot);