danog/amp
1
0
Fork 0
mirror of https://github.com/danog/amp.git synced 2024-11-27 04:24:42 +01:00
Code Issues Projects Releases Wiki Activity

Remove unused Reactor constants

Browse Source
This commit is contained in:
Daniel Lowrey 2014-11-11 12:00:01 -05:00
parent d5c494afb1
commit ccc0bdcbe0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Reactor.php
View File

@ -3,10 +3,6 @@
namespace Amp;
interface Reactor {
const WATCH_READ = 0b001;
const WATCH_WRITE = 0b010;
const WATCH_NOW = 0b100;
/**
* Start the event reactor and assume program flow control
*

16
lib/UvReactor.php
View File

@ -24,6 +24,10 @@ class UvReactor implements SignalReactor {
private static $MODE_SIGNAL = 3;
private static $MODE_IMMEDIATE = 4;
private static $WATCH_READ = 0b001;
private static $WATCH_WRITE = 0b010;
private static $WATCH_NOW = 0b100;
public function __construct($newLoop = false) {
$this->loop = $newLoop ? uv_loop_new() : uv_default_loop();
$this->gcWatcher = uv_timer_init($this->loop);
@ -175,7 +179,7 @@ class UvReactor implements SignalReactor {
$msInterval = ($msInterval && $msInterval > 0) ? (int) $msInterval : -1;
return ($msInterval === -1)
? $this->watchStream(STDOUT, $callback, self::WATCH_WRITE | self::WATCH_NOW)
? $this->watchStream(STDOUT, $callback, self::$WATCH_WRITE | self::$WATCH_NOW)
: $this->startTimer($callback, $msInterval, $msInterval, self::$MODE_REPEAT);
}
@ -247,7 +251,7 @@ class UvReactor implements SignalReactor {
* @return string Returns a unique watcher ID
*/
public function onReadable($stream, callable $callback, $enableNow = true) {
$flags = $enableNow ? (self::WATCH_READ | self::WATCH_NOW) : self::WATCH_READ;
$flags = $enableNow ? (self::$WATCH_READ | self::$WATCH_NOW) : self::$WATCH_READ;
return $this->watchStream($stream, $callback, $flags);
}
@ -261,7 +265,7 @@ class UvReactor implements SignalReactor {
* @return string Returns a unique watcher ID
*/
public function onWritable($stream, callable $callback, $enableNow = true) {
$flags = $enableNow ? (self::WATCH_WRITE | self::WATCH_NOW) : self::WATCH_WRITE;
$flags = $enableNow ? (self::$WATCH_WRITE | self::$WATCH_NOW) : self::$WATCH_WRITE;
return $this->watchStream($stream, $callback, $flags);
}
@ -269,10 +273,10 @@ class UvReactor implements SignalReactor {
private function watchStream($stream, callable $callback, $flags) {
$flags = (int) $flags;
if ($flags & self::WATCH_READ) {
if ($flags & self::$WATCH_READ) {
/** @noinspection PhpUndefinedClassInspection */
$pollFlag = \UV::READABLE;
} elseif ($flags & self::WATCH_WRITE) {
} elseif ($flags & self::$WATCH_WRITE) {
/** @noinspection PhpUndefinedClassInspection */
$pollFlag = \UV::WRITABLE;
} else {
@ -296,7 +300,7 @@ class UvReactor implements SignalReactor {
$watcher->pollFlag = $pollFlag;
$watcher->uvStruct = $pollStartFunc($this->loop, $stream);
$watcher->callback = $this->wrapStreamCallback($watcher, $callback);
if ($watcher->isEnabled = ($flags & self::WATCH_NOW)) {
if ($watcher->isEnabled = ($flags & self::$WATCH_NOW)) {
uv_poll_start($watcher->uvStruct, $watcher->pollFlag, $watcher->callback);
}