Properly clean up event watchers for ext-event and ext-libev

reactphp · jsor · Feb 6, 2018 · Jan 17, 2018 · Feb 6, 2018 · 0f8c6b415d10a6c993717aff760c8407fec8dd17
commit 0f8c6b415d10a6c993717aff760c8407fec8dd17
diff --git a/src/ExtEventLoop.php b/src/ExtEventLoop.php
@@ -57,7 +57,7 @@ function ($signal) {
             },
             function ($signal) {
                 if ($this->signals->count($signal) === 0) {
-                    $this->signalEvents[$signal]->del();
+                    $this->signalEvents[$signal]->free();
                     unset($this->signalEvents[$signal]);
                 }
             }

diff --git a/src/ExtLibevLoop.php b/src/ExtLibevLoop.php
@@ -55,6 +55,7 @@ function ($signal) {
             },
             function ($signal) {
                 if ($this->signals->count($signal) === 0) {
+                    $this->signalEvents[$signal]->stop();
                     $this->loop->remove($this->signalEvents[$signal]);
                     unset($this->signalEvents[$signal]);
                 }
@@ -100,6 +101,7 @@ public function removeReadStream($stream)
 
         if (isset($this->readEvents[$key])) {
             $this->readEvents[$key]->stop();
+            $this->loop->remove($this->readEvents[$key]);
             unset($this->readEvents[$key]);
         }
     }
@@ -110,6 +112,7 @@ public function removeWriteStream($stream)
 
         if (isset($this->writeEvents[$key])) {
             $this->writeEvents[$key]->stop();
+            $this->loop->remove($this->writeEvents[$key]);
             unset($this->writeEvents[$key]);
         }
     }