[EventLoop] Remove check on return value from streams callbacks.

nrk · nrk · commit 141a77d0f0f6 · 2013-01-14T21:23:09.000+01:00
This was an early addition but now that the event loop abstraction is
mature enough it's definitely better to be explicit when removing a
stream instead of relying on obscure values returned from callbacks.
diff --git a/LibEventLoop.php b/LibEventLoop.php
@@ -32,15 +32,11 @@ protected function createLibeventCallback()
 
             try {
                 if (($flags & EV_READ) === EV_READ && isset($readCallbacks[$id])) {
-                    if (call_user_func($readCallbacks[$id], $stream, $loop) === false) {
-                        $loop->removeReadStream($stream);
-                    }
+                    call_user_func($readCallbacks[$id], $stream, $loop);
                 }
 
                 if (($flags & EV_WRITE) === EV_WRITE && isset($writeCallbacks[$id])) {
-                    if (call_user_func($writeCallbacks[$id], $stream, $loop) === false) {
-                        $loop->removeWriteStream($stream);
-                    }
+                    call_user_func($writeCallbacks[$id], $stream, $loop);
                 }
             } catch (\Exception $ex) {
                 // If one of the callbacks throws an exception we must stop the loop
diff --git a/StreamSelectLoop.php b/StreamSelectLoop.php
@@ -125,9 +125,7 @@ protected function runStreamSelect()
             if ($read) {
                 foreach ($read as $stream) {
                     $listener = $this->readListeners[(int) $stream];
-                    if (call_user_func($listener, $stream, $this) === false) {
-                        $this->removeReadStream($stream);
-                    }
+                    call_user_func($listener, $stream, $this);
                 }
             }
 
@@ -138,9 +136,7 @@ protected function runStreamSelect()
                     }
 
                     $listener = $this->writeListeners[(int) $stream];
-                    if (call_user_func($listener, $stream, $this) === false) {
-                        $this->removeWriteStream($stream);
-                    }
+                    call_user_func($listener, $stream, $this);
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -125,9 +125,7 @@ protected function runStreamSelect()`
`125`	`125`	`if ($read) {`
`126`	`126`	`foreach ($read as $stream) {`
`127`	`127`	`$listener = $this->readListeners[(int) $stream];`
`128`		`- if (call_user_func($listener, $stream, $this) === false) {`
`129`		`- $this->removeReadStream($stream);`
`130`		`- }`
	`128`	`+ call_user_func($listener, $stream, $this);`
`131`	`129`	`}`
`132`	`130`	`}`
`133`	`131`
`@@ -138,9 +136,7 @@ protected function runStreamSelect()`
`138`	`136`	`}`
`139`	`137`
`140`	`138`	`$listener = $this->writeListeners[(int) $stream];`
`141`		`- if (call_user_func($listener, $stream, $this) === false) {`
`142`		`- $this->removeWriteStream($stream);`
`143`		`- }`
	`139`	`+ call_user_func($listener, $stream, $this);`
`144`	`140`	`}`
`145`	`141`	`}`
`146`	`142`	`}`