ExtEvLoop: Add new ExtEvLoop (PECL source ext-ev)

.travis.yml

@@ -11,6 +11,6 @@ matrix:
     - php: hhvm
 
 install: ./travis-init.sh
-  
+
 script:
-  - phpunit --coverage-text
+    - phpunit --coverage-text

script.gdb

@@ -0,0 +1,3 @@
+set env MALLOC_CHECK_=3
+run
+backtrace full

src/ExtEvLoop.php

@@ -0,0 +1,249 @@
+<?php
+
+namespace React\EventLoop;
+
+use SplObjectStorage;
+use React\EventLoop\Timer\Timer;
+use React\EventLoop\Timer\TimerInterface;
+use React\EventLoop\Tick\FutureTickQueue;
+use React\EventLoop\Tick\NextTickQueue;
+
+class ExtEvLoop implements LoopInterface
+{
+    private $loop;
+    private $nextTickQueue;
+    private $futureTickQueue;    
+    private $timers;
+    private $readEvents     = array();
+    private $writeEvents    = array();
+
+    private $running        = false;
+
+    public function __construct()
+    {
+        $this->loop             = new \EvLoop();
+        $this->timers           = new SplObjectStorage();
+        $this->nextTickQueue    = new NextTickQueue($this);
+        $this->futureTickQueue  = new FutureTickQueue($this);
+        $this->timers           = new SplObjectStorage();
+    }
+
+    /**
+     * Add a readable stream to the event loop
+     * @param stream   $stream   PHP stream resource
+     * @param callable $listener Callback
+     * @return void
+     */
+    public function addReadStream($stream, callable $listener)
+    {
+        $this->addStream($stream, $listener, \Ev::READ);
+    }
+
+    /**
+     * Add a writable stream to the event loop
+     * @param stream   $stream   PHP stream resource
+     * @param callable $listener Callback
+     * @return void
+     */
+    public function addWriteStream($stream, callable $listener)
+    {
+        $this->addStream($stream, $listener, \Ev::WRITE);
+    }
+
+    /**
+     * Remove a readable stream from the event loop.
+     * @param  stream $stream PHP stream resource
+     * @return void
+     */
+    public function removeReadStream($stream)
+    {
+        $key = (int) $stream;
+        if(isset($this->readEvents[$key])) {
+            $this->readEvents[$key]->stop();   
+            unset($this->readEvents[$key]);
+        }
+    }
+
+    /**
+     * remove a writable stream from the event loop
+     * @param  stream $stream PHP stream resource
+     * @return void         
+     */
+    public function removeWriteStream($stream)
+    {
+        $key = (int) $stream;
+        if(isset($this->writeEvents[$key])) {
+            $this->writeEvents[$key]->stop();
+            unset($this->writeEvents[$key]);
+        }
+    }
+
+    /**
+     * remove a stream from the event loop
+     * @param  stream $stream PHP stream
+     * @return void         
+     */
+    public function removeStream($stream)
+    {
+        if (isset($this->readEvents[(int)$stream])) {
+            $this->removeReadStream($stream);
+        }
+
+        if (isset($this->writeEvents[(int)$stream])) {
+            $this->removeWriteStream($stream);
+        }
+    }
+
+    /**
+     * Wraps the listener in a callback which will pass the
+     * stream to the listener then registers the stream with
+     * the eventloop.
+     * 
+     * @param stream    $stream   PHP Stream resource
+     * @param callable  $listener stream callback
+     * @param bit       $flags    flag bitmask
+     */
+    private function addStream($stream, callable $listener, $flags)
+    {
+        $listener = function ($event) use ($stream, $listener) {
+            call_user_func($listener, $stream);
+        };
+
+        $event = $this->loop->io($stream, $flags, $listener);
+
+        if (($flags & \Ev::READ) === $flags) {
+            $this->readEvents[(int)$stream] = $event;
+        } elseif (($flags & \Ev::WRITE) === $flags) {
+            $this->writeEvents[(int)$stream] = $event;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addTimer($interval, callable $callback)
+    {
+        $timer = new Timer($this, $interval, $callback, false);
+        $this->setupTimer($timer);
+
+        return $timer;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addPeriodicTimer($interval, callable $callback)
+    {
+        $timer = new Timer($this, $interval, $callback, true);
+        $this->setupTimer($timer);
+
+        return $timer;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function cancelTimer(TimerInterface $timer)
+    {
+        if (isset($this->timers[$timer])) {
+            /* stop EvTimer */
+            $this->timers[$timer]->stop();
+
+            /* defer timer */
+            $this->nextTick(function() use ($timer) {
+                $this->timers->detach($timer);    
+            });
+        }
+    }
+
+    /**
+     * Add timer object as 
+     * @param  TimerInterface $timer [description]
+     * @return [type]                [description]
+     */
+    private function setupTimer(TimerInterface $timer)
+    {
+        $callback = function () use ($timer) {
+            call_user_func($timer->getCallback(), $timer);
+
+            if (!$timer->isPeriodic()) {
+                $timer->cancel();
+            }
+        };
+
+        $interval = $timer->getInterval();
+
+        $libevTimer = $this->loop->timer($interval, $interval, $callback);
+
+        $this->timers->attach($timer, $libevTimer);
+
+        return $timer;
+    }
+
+    public function isTimerActive(TimerInterface $timer)
+    {
+        return $this->timers->contains($timer);
+    }
+
+
+    /**
+     * {@inheritdoc}
+     */
+    public function nextTick(callable $listener)
+    {
+        $this->nextTickQueue->add($listener);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function futureTick(callable $listener)
+    {
+        $this->futureTickQueue->add($listener);
+    }
+
+
+    public function tick()
+    {
+        $this->nextTickQueue->tick();
+        $this->futureTickQueue->tick();
+
+        $flags = \Ev::RUN_ONCE;
+        if (!$this->running || !$this->nextTickQueue->isEmpty() || !$this->futureTickQueue->isEmpty()) {
+            $flags |= \Ev::RUN_NOWAIT;
+        } elseif (!$this->readEvents && !$this->writeEvents && !$this->timers->count()) {
+            $this->running = false;
+            return;
+        }
+        $this->loop->run($flags);
+    }
+
+    public function run()
+    {
+        $this->running = true;
+        while($this->running) {
+            $this->tick();
+        }
+    }
+
+    public function stop()
+    {
+        $this->running = false;
+    }
+
+    public function __destruct()
+    {
+        // mannually stop all watchers
+        foreach($this->timers as $timer) {
+            $this->timers[$timer]->stop();            
+        }
+
+        foreach($this->readEvents as $event) {
+            $event->stop();
+        }
+
+        foreach($this->writeEvents as $event) {
+            $event->stop();
+        }
+    }
+}

tests/ExtEvLoopTest.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace React\Tests\EventLoop;
+
+use React\EventLoop\ExtEvLoop;
+
+class ExtEvLoopTest extends AbstractLoopTest
+{
+    private $file;
+
+    public function createLoop()
+    {
+        if (!class_exists('EvLoop')) {
+            $this->markTestSkipped('ev tests skipped because pecl/ev is not installed.');
+        }
+
+        return new ExtEvLoop();
+    }
+
+    public function tearDown()
+    {
+        if (file_exists($this->file)) {
+            unlink($this->file);
+        }
+    }
+
+    public function createStream()
+    {
+        $this->file = tempnam(sys_get_temp_dir(), 'react-');
+
+        $stream = fopen($this->file, 'r+');
+
+        return $stream;
+    }
+
+    public function testEvConstructor()
+    {
+        $loop = new ExtEvLoop();
+    }
+}

travis-init.sh

@@ -20,6 +20,18 @@ if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then
     popd
     echo "extension=libevent.so" >> "$(php -r 'echo php_ini_loaded_file();')"
 
+    # install 'pecl-ev' PHP extension
+    git clone http://bitbucket.org/osmanov/pecl-ev.git
+    # 0.2.10
+    pushd pecl-ev
+    phpize
+    ./configure
+    make
+    # make test
+    make install
+    popd
+    echo "extension=ev.so" >> "$(php -r 'echo php_ini_loaded_file();')"
+
     # install 'libev' PHP extension
     git clone --recursive https://github.com/m4rw3r/php-libev
     pushd php-libev