Fix TracingDriver::getInfo()

amphp · Jul 24, 2018 · d668658 · d668658
1 parent af6fc70
commit d668658
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/lib/Cancellation/TimeoutToken.php b/lib/Cancellation/TimeoutToken.php
@@ -27,6 +27,7 @@ public function __construct(int $timeout)
         $this->watcher = Loop::delay($timeout, static function () use ($source) {
             $source->cancel(new TimeoutException);
         });
+
         Loop::unreference($this->watcher);
     }
 

diff --git a/lib/Loop/EventDriver.php b/lib/Loop/EventDriver.php
@@ -151,7 +151,11 @@ public function run(): void
      */
     public function stop(): void
     {
-        $this->handle->stop();
+        // Might be called if a stop() call happens during __destruct (which has an undefined order)
+        if ($this->handle !== null) {
+            $this->handle->stop();
+        }
+
         parent::stop();
     }
 

diff --git a/lib/Loop/TracingDriver.php b/lib/Loop/TracingDriver.php
@@ -142,6 +142,11 @@ public function getHandle()
         $this->driver->getHandle();
     }
 
+    public function getInfo(): array
+    {
+        return $this->driver->getInfo();
+    }
+
     public function getDump(): string
     {
         $dump = "";