Merge branch 'issue76'

igorw · igorw · commit 3fec69d19fd3 · 2012-12-23T10:49:05.000+01:00
* issue76:
  Add libevent timers fix to CHANGELOG
  Whitespace nitpick
  force travis retest.  Appears 5.3.3 timed out
  5.3 backward compatibility for -&gt;timersGc
  moved timersgc foreach loop into callback
  Fix timersGc iteration in LibEventLoop
  issue 76 fix.  Using SplQueue for
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 * 0.2.6 (2012-12-xx)
 
   * Bug fix: [Http] Emit end event when Response closes (@beaucollins)
+  * Bug fix: [EventLoop] Plug memory issue in libevent timers (@cameronjacobson)
 
 * 0.2.5 (2012-11-26)
 
diff --git a/src/React/EventLoop/LibEventLoop.php b/src/React/EventLoop/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) {
@@ -177,13 +171,19 @@ protected function addTimerInternal($interval, $callback, $periodic = false)
         );
 
         $timer->signature = spl_object_hash($timer);
+        $timersGc = $this->timersGc;
+        $callback = function () use ($timer, $timersGc) {
+            foreach ($timersGc as $resource) {
+                event_free($resource);
+            }
 
-        $callback = function () use ($timer) {
             if ($timer->cancelled === false) {
                 call_user_func($timer->callback, $timer->signature, $timer->loop);
 
                 if ($timer->periodic === true) {
                     event_add($timer->resource, $timer->interval);
+                } else {
+                    $this->cancelTimer($timer->signature);
                 }
             }
         };
@@ -214,7 +214,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]);
         }
     }
