Keep the loop running if anything interrupts its operation

Author: clue

src/Blocker.php

@@ -24,11 +24,16 @@ public function __construct(LoopInterface $loop)
      */
     public function wait($time)
     {
+        $wait = true;
         $loop = $this->loop;
-        $loop->addTimer($time, function () use ($loop) {
+        $loop->addTimer($time, function () use ($loop, &$wait) {
             $loop->stop();
+            $wait = false;
         });
-        $loop->run();
+
+        do {
+            $loop->run();
+        } while($wait);
     }
 
     /**
@@ -40,22 +45,27 @@ public function wait($time)
      */
     public function awaitOne(PromiseInterface $promise)
     {
+        $wait = true;
         $resolved = null;
         $exception = null;
         $loop = $this->loop;
 
         $promise->then(
-            function ($c) use (&$resolved, $loop) {
+            function ($c) use (&$resolved, &$wait, $loop) {
                 $resolved = $c;
+                $wait = false;
                 $loop->stop();
             },
-            function ($error) use (&$exception, $loop) {
+            function ($error) use (&$exception, &$wait, $loop) {
                 $exception = $error;
+                $wait = false;
                 $loop->stop();
             }
         );
 
-        $loop->run();
+        while ($wait) {
+            $loop->run();
+        }
 
         if ($exception !== null) {
             throw $exception;
@@ -118,7 +128,9 @@ function ($e) use (&$wait, $loop) {
             );
         }
 
-        $loop->run();
+        while ($wait) {
+            $loop->run();
+        }
 
         if (!$success) {
             throw new UnderflowException('No promise could resolve');
@@ -180,7 +192,9 @@ function ($e) use ($promises, &$exception, &$wait, $loop) {
             );
         }
 
-        $loop->run();
+        while ($wait) {
+            $loop->run();
+        }
 
         if ($exception !== null) {
             throw $exception;

tests/BlockerTest.php

@@ -38,6 +38,14 @@ public function testAwaitOneResolved()
         $this->assertEquals(2, $this->block->awaitOne($promise));
     }
 
+    public function testAwaitOneInterrupted()
+    {
+        $promise = $this->createPromiseResolved(2, 0.02);
+        $this->createTimerInterrupt(0.01);
+
+        $this->assertEquals(2, $this->block->awaitOne($promise));
+    }
+
     /**
      * @expectedException UnderflowException
      */
@@ -89,6 +97,14 @@ public function testAwaitRaceAllRejected()
         $this->block->awaitRace($all);
     }
 
+    public function testAwaitRaceInterrupted()
+    {
+        $promise = $this->createPromiseResolved(2, 0.02);
+        $this->createTimerInterrupt(0.01);
+
+        $this->assertEquals(2, $this->block->awaitRace(array($promise)));
+    }
+
     public function testAwaitAllEmpty()
     {
         $this->assertEquals(array(), $this->block->awaitAll(array()));
@@ -126,6 +142,14 @@ public function testAwaitAllOnlyRejected()
         $this->block->awaitAll($all);
     }
 
+    public function testAwaitAllInterrupted()
+    {
+        $promise = $this->createPromiseResolved(2, 0.02);
+        $this->createTimerInterrupt(0.01);
+
+        $this->assertEquals(array(2), $this->block->awaitAll(array($promise)));
+    }
+
     private function createPromiseResolved($value = null, $delay = 0.01)
     {
         $deferred = new Deferred();
@@ -147,4 +171,12 @@ private function createPromiseRejected($value = null, $delay = 0.01)
 
         return $deferred->promise();
     }
+
+    private function createTimerInterrupt($delay = 0.01)
+    {
+        $loop = $this->loop;
+        $loop->addTimer($delay, function () use ($loop) {
+            $loop->stop();
+        });
+    }
 }