issue 76 fix. Using SplQueue for

Author: cameronjacobson

LibEventLoop.php

@@ -10,7 +10,7 @@ class LibEventLoop implements LoopInterface
     private $callback;
 
     private $timers = array();
-    private $timersGc = array();
+    private $timersGc;
 
     private $events = array();
     private $flags = array();
@@ -21,24 +21,18 @@ public function __construct()
     {
         $this->base = event_base_new();
         $this->callback = $this->createLibeventCallback();
+        $this->timersGc = new \SplQueue();
+        $this->timersGc->setIteratorMode(\SplQueue::IT_MODE_DELETE);
     }
 
     protected function createLibeventCallback()
     {
-        $timersGc = &$this->timersGc;
         $readCallbacks = &$this->readCallbacks;
         $writeCallbacks = &$this->writeCallbacks;
 
-        return function ($stream, $flags, $loop) use (&$timersGc, &$readCallbacks, &$writeCallbacks) {
+        return function ($stream, $flags, $loop) use (&$readCallbacks, &$writeCallbacks) {
             $id = (int) $stream;
 
-            if ($timersGc) {
-                foreach ($timersGc as $signature => $resource) {
-                   event_free($resource);
-                   unset($timersGc[$signature]);
-                }
-            }
-
             try {
                 if (($flags & EV_READ) === EV_READ && isset($readCallbacks[$id])) {
                     if (call_user_func($readCallbacks[$id], $stream, $loop) === false) {
@@ -167,6 +161,10 @@ protected function addTimerInternal($interval, $callback, $periodic = false)
             throw new \InvalidArgumentException('The callback must be a callable object.');
         }
 
+        while($resource = $this->timersGc->dequeue()){
+            event_free($resource);
+        }
+
         $timer = (object) array(
             'loop' => $this,
             'resource' => $resource = event_new(),
@@ -185,6 +183,9 @@ protected function addTimerInternal($interval, $callback, $periodic = false)
                 if ($timer->periodic === true) {
                     event_add($timer->resource, $timer->interval);
                 }
+                else {
+                    $this->cancelTimer($timer->signature);
+                }
             }
         };
 
@@ -214,7 +215,7 @@ public function cancelTimer($signature)
 
             $timer->cancelled = true;
             event_del($timer->resource);
-            $this->timersGc[$signature] = $timer->resource;
+            $this->timersGc->enqueue($timer->resource);
             unset($this->timers[$signature]);
         }
     }