Merge pull request #149 from clue-labs/cleanup

jsor · web-flow · commit e03f1145a5db · 2018-02-06T15:08:53.000+01:00
Properly clean up event watchers for ext-event and ext-libev
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]);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ function ($signal) {`
`57`	`57`	`},`
`58`	`58`	`function ($signal) {`
`59`	`59`	`if ($this->signals->count($signal) === 0) {`
`60`		`- $this->signalEvents[$signal]->del();`
	`60`	`+ $this->signalEvents[$signal]->free();`
`61`	`61`	`unset($this->signalEvents[$signal]);`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ function ($signal) {`
`55`	`55`	`},`
`56`	`56`	`function ($signal) {`
`57`	`57`	`if ($this->signals->count($signal) === 0) {`
	`58`	`+ $this->signalEvents[$signal]->stop();`
`58`	`59`	`$this->loop->remove($this->signalEvents[$signal]);`
`59`	`60`	`unset($this->signalEvents[$signal]);`
`60`	`61`	`}`
`@@ -100,6 +101,7 @@ public function removeReadStream($stream)`
`100`	`101`
`101`	`102`	`if (isset($this->readEvents[$key])) {`
`102`	`103`	`$this->readEvents[$key]->stop();`
	`104`	`+ $this->loop->remove($this->readEvents[$key]);`
`103`	`105`	`unset($this->readEvents[$key]);`
`104`	`106`	`}`
`105`	`107`	`}`
`@@ -110,6 +112,7 @@ public function removeWriteStream($stream)`
`110`	`112`
`111`	`113`	`if (isset($this->writeEvents[$key])) {`
`112`	`114`	`$this->writeEvents[$key]->stop();`
	`115`	`+ $this->loop->remove($this->writeEvents[$key]);`
`113`	`116`	`unset($this->writeEvents[$key]);`
`114`	`117`	`}`
`115`	`118`	`}`