[EventLoop] Do not invoke callback of cancelled timers in LibEventLoop.

nrk · nrk · commit c2bd6da361d8 · 2012-05-23T21:48:09.000+02:00
This bug was preventing periodic timers from being properly cancelled.
diff --git a/LibEventLoop.php b/LibEventLoop.php
@@ -173,15 +173,18 @@ protected function addTimerInternal($interval, $callback, $periodic = false)
             'callback' => $callback,
             'interval' => $interval * 1000000,
             'periodic' => $periodic,
+            'cancelled' => false,
         );
 
         $timer->signature = spl_object_hash($timer);
 
         $callback = function () use ($timer) {
-            call_user_func($timer->callback, $timer->signature, $timer->loop);
+            if ($timer->cancelled === false) {
+                call_user_func($timer->callback, $timer->signature, $timer->loop);
 
-            if ($timer->periodic === true) {
-                event_add($timer->resource, $timer->interval);
+                if ($timer->periodic === true) {
+                    event_add($timer->resource, $timer->interval);
+                }
             }
         };
 
@@ -207,8 +210,11 @@ public function addPeriodicTimer($interval, $callback)
     public function cancelTimer($signature)
     {
         if (isset($this->timers[$signature])) {
-            event_del($resource = $this->timers[$signature]->resource);
-            $this->timersGc[$signature] = $resource;
+            $timer = $this->timers[$signature];
+
+            $timer->cancelled = true;
+            event_del($timer->resource);
+            $this->timersGc[$signature] = $timer->resource;
             unset($this->timers[$signature]);
         }
     }
