Merge remote-tracking branch 'origin/master' into no-next-tick

Author: clue

.travis.yml

@@ -4,16 +4,10 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
-  - hhvm-nightly
-
-matrix:
-  allow_failures:
-    - php: hhvm
-    - php: hhvm-nightly
-  fast_finish: true
 
 install: ./travis-init.sh
 
 script:
-  - phpunit --coverage-text
+  - ./vendor/bin/phpunit --coverage-text

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.5.0 (xxxx-xx-xx)
+
+* BC break: Remove `LoopInterface::tick()` (@jsor, #72)
+
+## 0.4.2 (2016-03-07)
+
+* Bug fix: No longer error when signals sent to StreamSelectLoop
+* Support HHVM and PHP7 (@ondrejmirtes, @cebe)
+* Feature: Added support for EventConfig for ExtEventLoop (@steverhoades)
+* Bug fix: Fixed an issue loading loop extension libs via autoloader (@czarpino)
+
 ## 0.4.1 (2014-04-13)
 
 * Bug fix: null timeout in StreamSelectLoop causing 100% CPU usage (@clue)

README.md

@@ -49,7 +49,7 @@ Here is an async HTTP server built with just the event loop.
                 fclose($conn);
                 $loop->removeStream($conn);
             } else {
-                $data = substr($data, 0, $written);
+                $data = substr($data, $written);
             }
         });
     });

composer.json

@@ -6,6 +6,9 @@
     "require": {
         "php": ">=5.4.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": "~4.8"
+    },
     "suggest": {
         "ext-libevent": ">=0.1.0",
         "ext-event": "~1.0",
@@ -15,10 +18,5 @@
         "psr-4": {
             "React\\EventLoop\\": "src"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "0.5-dev"
-        }
     }
 }

src/ExtEventLoop.php

@@ -158,17 +158,6 @@ public function futureTick(callable $listener)
         $this->futureTickQueue->add($listener);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function tick()
-    {
-        $this->futureTickQueue->tick();
-
-        // @-suppression: https://github.com/reactphp/react/pull/234#discussion-diff-7759616R226
-        @$this->eventBase->loop(EventBase::LOOP_ONCE | EventBase::LOOP_NONBLOCK);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -279,7 +268,7 @@ private function unsubscribeStreamEvent($stream, $flag)
      */
     private function createTimerCallback()
     {
-        $this->timerCallback = function ($_, $_, $timer) {
+        $this->timerCallback = function ($_, $__, $timer) {
             call_user_func($timer->getCallback(), $timer);
 
             if (!$timer->isPeriodic() && $this->isTimerActive($timer)) {

src/LibEvLoop.php

@@ -162,16 +162,6 @@ public function futureTick(callable $listener)
         $this->futureTickQueue->add($listener);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function tick()
-    {
-        $this->futureTickQueue->tick();
-
-        $this->loop->run(EventLoop::RUN_ONCE | EventLoop::RUN_NOWAIT);
-    }
-
     /**
      * {@inheritdoc}
      */

src/LibEventLoop.php

@@ -166,16 +166,6 @@ public function futureTick(callable $listener)
         $this->futureTickQueue->add($listener);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function tick()
-    {
-        $this->futureTickQueue->tick();
-
-        event_base_loop($this->eventBase, EVLOOP_ONCE | EVLOOP_NONBLOCK);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -283,7 +273,7 @@ private function unsubscribeStreamEvent($stream, $flag)
      */
     private function createTimerCallback()
     {
-        $this->timerCallback = function ($_, $_, $timer) {
+        $this->timerCallback = function ($_, $__, $timer) {
             call_user_func($timer->getCallback(), $timer);
 
             // Timer already cancelled ...

src/LoopInterface.php

@@ -94,11 +94,6 @@ public function isTimerActive(TimerInterface $timer);
      */
     public function futureTick(callable $listener);
 
-    /**
-     * Perform a single iteration of the event loop.
-     */
-    public function tick();
-
     /**
      * Run the event loop until there are no more tasks to perform.
      */

src/StreamSelectLoop.php

@@ -137,18 +137,6 @@ public function futureTick(callable $listener)
         $this->futureTickQueue->add($listener);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function tick()
-    {
-        $this->futureTickQueue->tick();
-
-        $this->timers->tick();
-
-        $this->waitForStreamActivity(0);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -203,7 +191,12 @@ private function waitForStreamActivity($timeout)
         $read  = $this->readStreams;
         $write = $this->writeStreams;
 
-        $this->streamSelect($read, $write, $timeout);
+        $available = $this->streamSelect($read, $write, $timeout);
+        if (false === $available) {
+            // if a system call has been interrupted,
+            // we cannot rely on it's outcome
+            return;
+        }
 
         foreach ($read as $stream) {
             $key = (int) $stream;
@@ -230,17 +223,19 @@ private function waitForStreamActivity($timeout)
      * @param array        &$write  An array of write streams to select upon.
      * @param integer|null $timeout Activity timeout in microseconds, or null to wait forever.
      *
-     * @return integer The total number of streams that are ready for read/write.
+     * @return integer|false The total number of streams that are ready for read/write.
+     * Can return false if stream_select() is interrupted by a signal.
      */
     protected function streamSelect(array &$read, array &$write, $timeout)
     {
         if ($read || $write) {
             $except = null;
 
-            return stream_select($read, $write, $except, $timeout === null ? null : 0, $timeout);
+            // suppress warnings that occur, when stream_select is interrupted by a signal
+            return @stream_select($read, $write, $except, $timeout === null ? null : 0, $timeout);
         }
 
-        usleep($timeout);
+        $timeout && usleep($timeout);
 
         return 0;
     }

src/Timer/Timers.php

@@ -30,7 +30,7 @@ public function getTime()
     public function add(TimerInterface $timer)
     {
         $interval = $timer->getInterval();
-        $scheduledAt = $interval + $this->getTime();
+        $scheduledAt = $interval + microtime(true);
 
         $this->timers->attach($timer, $scheduledAt);
         $this->scheduler->insert($timer, -$scheduledAt);