Simplify checking signal watchers and remove circular reference

Author: clue

src/ExtEventLoop.php

@@ -41,7 +41,7 @@ public function __construct(EventBaseConfig $config = null)
         $this->eventBase = new EventBase($config);
         $this->futureTickQueue = new FutureTickQueue();
         $this->timerEvents = new SplObjectStorage();
-        $this->signals = new SignalsHandler($this);
+        $this->signals = new SignalsHandler();
 
         $this->createTimerCallback();
         $this->createStreamCallback();
@@ -181,7 +181,7 @@ public function run()
             $flags = EventBase::LOOP_ONCE;
             if (!$this->running || !$this->futureTickQueue->isEmpty()) {
                 $flags |= EventBase::LOOP_NONBLOCK;
-            } elseif (!$this->readEvents && !$this->writeEvents && !$this->timerEvents->count()) {
+            } elseif (!$this->readEvents && !$this->writeEvents && !$this->timerEvents->count() && $this->signals->isEmpty()) {
                 break;
             }
 

src/ExtLibevLoop.php

@@ -39,7 +39,7 @@ public function __construct()
         $this->loop = new EventLoop();
         $this->futureTickQueue = new FutureTickQueue();
         $this->timerEvents = new SplObjectStorage();
-        $this->signals = new SignalsHandler($this);
+        $this->signals = new SignalsHandler();
     }
 
     public function addReadStream($stream, $listener)
@@ -181,7 +181,7 @@ public function run()
             $flags = EventLoop::RUN_ONCE;
             if (!$this->running || !$this->futureTickQueue->isEmpty()) {
                 $flags |= EventLoop::RUN_NOWAIT;
-            } elseif (!$this->readEvents && !$this->writeEvents && !$this->timerEvents->count()) {
+            } elseif (!$this->readEvents && !$this->writeEvents && !$this->timerEvents->count() && $this->signals->isEmpty()) {
                 break;
             }
 

src/ExtLibeventLoop.php

@@ -55,7 +55,7 @@ public function __construct()
         $this->eventBase = event_base_new();
         $this->futureTickQueue = new FutureTickQueue();
         $this->timerEvents = new SplObjectStorage();
-        $this->signals = new SignalsHandler($this);
+        $this->signals = new SignalsHandler();
 
         $this->createTimerCallback();
         $this->createStreamCallback();
@@ -199,7 +199,7 @@ public function run()
             $flags = EVLOOP_ONCE;
             if (!$this->running || !$this->futureTickQueue->isEmpty()) {
                 $flags |= EVLOOP_NONBLOCK;
-            } elseif (!$this->readEvents && !$this->writeEvents && !$this->timerEvents->count()) {
+            } elseif (!$this->readEvents && !$this->writeEvents && !$this->timerEvents->count() && $this->signals->isEmpty()) {
                 break;
             }
 

src/SignalsHandler.php

@@ -7,24 +7,10 @@
  */
 final class SignalsHandler
 {
-    private $loop;
-    private $timer;
     private $signals = [];
 
-    public function __construct(LoopInterface $loop)
-    {
-        $this->loop = $loop;
-    }
-
     public function add($signal, $listener)
     {
-        if (empty($this->signals) && $this->timer === null) {
-            /**
-             * Timer to keep the loop alive as long as there are any signal handlers registered
-             */
-            $this->timer = $this->loop->addPeriodicTimer(300, function () {});
-        }
-
         if (!isset($this->signals[$signal])) {
             $this->signals[$signal] = [];
         }
@@ -48,11 +34,6 @@ public function remove($signal, $listener)
         if (isset($this->signals[$signal]) && \count($this->signals[$signal]) === 0) {
             unset($this->signals[$signal]);
         }
-
-        if (empty($this->signals) && $this->timer instanceof TimerInterface) {
-            $this->loop->cancelTimer($this->timer);
-            $this->timer = null;
-        }
     }
 
     public function call($signal)
@@ -74,4 +55,9 @@ public function count($signal)
 
         return \count($this->signals[$signal]);
     }
+
+    public function isEmpty()
+    {
+        return !$this->signals;
+    }
 }

src/StreamSelectLoop.php

@@ -69,7 +69,7 @@ public function __construct()
         $this->futureTickQueue = new FutureTickQueue();
         $this->timers = new Timers();
         $this->pcntl = extension_loaded('pcntl');
-        $this->signals = new SignalsHandler($this);
+        $this->signals = new SignalsHandler();
     }
 
     public function addReadStream($stream, $listener)
@@ -200,8 +200,8 @@ public function run()
                     $timeout = $timeout > PHP_INT_MAX ? PHP_INT_MAX : (int)$timeout;
                 }
 
-            // The only possible event is stream activity, so wait forever ...
-            } elseif ($this->readStreams || $this->writeStreams) {
+            // The only possible event is stream or signal activity, so wait forever ...
+            } elseif ($this->readStreams || $this->writeStreams || !$this->signals->isEmpty()) {
                 $timeout = null;
 
             // There's nothing left to do ...

tests/SignalsHandlerTest.php

@@ -2,7 +2,6 @@
 
 namespace React\Tests\EventLoop;
 
-use React\EventLoop\Factory;
 use React\EventLoop\SignalsHandler;
 
 final class SignalsHandlerTest extends TestCase
@@ -13,9 +12,7 @@ public function testEmittedEventsAndCallHandling()
         $func = function () use (&$callCount) {
             $callCount++;
         };
-        $signals = new SignalsHandler(
-            Factory::create()
-        );
+        $signals = new SignalsHandler();
 
         $this->assertSame(0, $callCount);