Use separate event listeners for readable and writable side

clue · clue · commit af897371802e · 2017-12-19T18:41:03.000+01:00
diff --git a/src/ExtEventLoop.php b/src/ExtEventLoop.php
@@ -27,11 +27,12 @@ final class ExtEventLoop implements LoopInterface
     private $timerCallback;
     private $timerEvents;
     private $streamCallback;
-    private $streamEvents = [];
-    private $streamFlags = [];
-    private $streamRefs = [];
+    private $readEvents = [];
+    private $writeEvents = [];
     private $readListeners = [];
     private $writeListeners = [];
+    private $readRefs = [];
+    private $writeRefs = [];
     private $running;
     private $signals;
     private $signalEvents = [];
@@ -70,56 +71,61 @@ function ($signal) {
     public function addReadStream($stream, callable $listener)
     {
         $key = (int) $stream;
+        if (isset($this->readListeners[$key])) {
+            return;
+        }
+
+        $this->readEvents[$key] = new Event($this->eventBase, $stream, Event::PERSIST | Event::READ, $this->streamCallback);
+        $this->readListeners[$key] = $listener;
 
-        if (!isset($this->readListeners[$key])) {
-            $this->readListeners[$key] = $listener;
-            $this->subscribeStreamEvent($stream, Event::READ);
+        // ext-event does not increase refcount on stream resources for PHP 7+
+        // manually keep track of stream resource to prevent premature garbage collection
+        if (PHP_VERSION_ID >= 70000) {
+            $this->readRefs[$key] = $stream;
         }
     }
 
     public function addWriteStream($stream, callable $listener)
     {
         $key = (int) $stream;
-
-        if (!isset($this->writeListeners[$key])) {
-            $this->writeListeners[$key] = $listener;
-            $this->subscribeStreamEvent($stream, Event::WRITE);
+        if (isset($this->writeListeners[$key])) {
+            return;
         }
-    }
 
-    public function removeReadStream($stream)
-    {
-        $key = (int) $stream;
+        $this->writeEvents[$key] = new Event($this->eventBase, $stream, Event::PERSIST | Event::WRITE, $this->streamCallback);
+        $this->writeListeners[$key] = $listener;
 
-        if (isset($this->readListeners[$key])) {
-            unset($this->readListeners[$key]);
-            $this->unsubscribeStreamEvent($stream, Event::READ);
+        // ext-event does not increase refcount on stream resources for PHP 7+
+        // manually keep track of stream resource to prevent premature garbage collection
+        if (PHP_VERSION_ID >= 70000) {
+            $this->writeRefs[$key] = $stream;
         }
     }
 
-    public function removeWriteStream($stream)
+    public function removeReadStream($stream)
     {
         $key = (int) $stream;
 
-        if (isset($this->writeListeners[$key])) {
-            unset($this->writeListeners[$key]);
-            $this->unsubscribeStreamEvent($stream, Event::WRITE);
+        if (isset($this->readEvents[$key])) {
+            $this->readEvents[$key]->del();
+            unset(
+                $this->readEvents[$key],
+                $this->readListeners[$key],
+                $this->readRefs[$key]
+            );
         }
     }
 
-    private function removeStream($stream)
+    public function removeWriteStream($stream)
     {
         $key = (int) $stream;
 
-        if (isset($this->streamEvents[$key])) {
-            $this->streamEvents[$key]->free();
-
+        if (isset($this->writeEvents[$key])) {
+            $this->writeEvents[$key]->del();
             unset(
-                $this->streamFlags[$key],
-                $this->streamEvents[$key],
-                $this->readListeners[$key],
+                $this->writeEvents[$key],
                 $this->writeListeners[$key],
-                $this->streamRefs[$key]
+                $this->writeRefs[$key]
             );
         }
     }
@@ -175,7 +181,7 @@ public function run()
             $flags = EventBase::LOOP_ONCE;
             if (!$this->running || !$this->futureTickQueue->isEmpty()) {
                 $flags |= EventBase::LOOP_NONBLOCK;
-            } elseif (!$this->streamEvents && !$this->timerEvents->count()) {
+            } elseif (!$this->readEvents && !$this->writeEvents && !$this->timerEvents->count()) {
                 break;
             }
 
@@ -207,64 +213,6 @@ private function scheduleTimer(TimerInterface $timer)
         $event->add($timer->getInterval());
     }
 
-    /**
-     * Create a new ext-event Event object, or update the existing one.
-     *
-     * @param resource $stream
-     * @param integer  $flag   Event::READ or Event::WRITE
-     */
-    private function subscribeStreamEvent($stream, $flag)
-    {
-        $key = (int) $stream;
-
-        if (isset($this->streamEvents[$key])) {
-            $event = $this->streamEvents[$key];
-            $flags = ($this->streamFlags[$key] |= $flag);
-
-            $event->del();
-            $event->set($this->eventBase, $stream, Event::PERSIST | $flags, $this->streamCallback);
-        } else {
-            $event = new Event($this->eventBase, $stream, Event::PERSIST | $flag, $this->streamCallback);
-
-            $this->streamEvents[$key] = $event;
-            $this->streamFlags[$key] = $flag;
-
-            // ext-event does not increase refcount on stream resources for PHP 7+
-            // manually keep track of stream resource to prevent premature garbage collection
-            if (PHP_VERSION_ID >= 70000) {
-                $this->streamRefs[$key] = $stream;
-            }
-        }
-
-        $event->add();
-    }
-
-    /**
-     * Update the ext-event Event object for this stream to stop listening to
-     * the given event type, or remove it entirely if it's no longer needed.
-     *
-     * @param resource $stream
-     * @param integer  $flag   Event::READ or Event::WRITE
-     */
-    private function unsubscribeStreamEvent($stream, $flag)
-    {
-        $key = (int) $stream;
-
-        $flags = $this->streamFlags[$key] &= ~$flag;
-
-        if (0 === $flags) {
-            $this->removeStream($stream);
-
-            return;
-        }
-
-        $event = $this->streamEvents[$key];
-
-        $event->del();
-        $event->set($this->eventBase, $stream, Event::PERSIST | $flags, $this->streamCallback);
-        $event->add();
-    }
-
     /**
      * Create a callback used as the target of timer events.
      *
