Fix TracingDriver, add TracingDriverTest

amphp · Oct 1, 2019 · 5a294f1 · 5a294f1
1 parent 1657284
commit 5a294f1
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 1 deletion.
diff --git a/lib/Loop/TracingDriver.php b/lib/Loop/TracingDriver.php
@@ -36,6 +36,7 @@ public function defer(callable $callback, $data = null): string
 
         $this->creationTraces[$id] = formatStacktrace(\debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS));
         $this->enabledWatchers[$id] = true;
+
         return $id;
     }
 
@@ -48,38 +49,47 @@ public function delay(int $delay, callable $callback, $data = null): string
 
         $this->creationTraces[$id] = formatStacktrace(\debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS));
         $this->enabledWatchers[$id] = true;
+
         return $id;
     }
 
     public function repeat(int $interval, callable $callback, $data = null): string
     {
         $id = $this->driver->repeat($interval, $callback, $data);
+
         $this->creationTraces[$id] = formatStacktrace(\debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS));
         $this->enabledWatchers[$id] = true;
+
         return $id;
     }
 
     public function onReadable($stream, callable $callback, $data = null): string
     {
         $id = $this->driver->onReadable($stream, $callback, $data);
+
         $this->creationTraces[$id] = formatStacktrace(\debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS));
         $this->enabledWatchers[$id] = true;
+
         return $id;
     }
 
     public function onWritable($stream, callable $callback, $data = null): string
     {
         $id = $this->driver->onWritable($stream, $callback, $data);
+
         $this->creationTraces[$id] = formatStacktrace(\debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS));
         $this->enabledWatchers[$id] = true;
+
         return $id;
     }
 
     public function onSignal(int $signo, callable $callback, $data = null): string
     {
         $id = $this->driver->onSignal($signo, $callback, $data);
+
         $this->creationTraces[$id] = formatStacktrace(\debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS));
         $this->enabledWatchers[$id] = true;
+
         return $id;
     }
 
@@ -100,6 +110,7 @@ public function cancel(string $watcherId)
     {
         $this->driver->cancel($watcherId);
         $this->creationTraces[$watcherId] = formatStacktrace(\debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS));
+
         unset($this->enabledWatchers[$watcherId], $this->unreferencedWatchers[$watcherId]);
     }
 
@@ -156,6 +167,26 @@ public function dump(): string
         return \rtrim($dump);
     }
 
+    public function getInfo(): array
+    {
+        return $this->driver->getInfo();
+    }
+
+    public function __debugInfo()
+    {
+        return $this->driver->__debugInfo();
+    }
+
+    public function now(): int
+    {
+        return $this->driver->now();
+    }
+
+    protected function error(\Throwable $exception)
+    {
+        $this->driver->error($exception);
+    }
+
     /** @inheritdoc */
     protected function activate(array $watchers)
     {
@@ -177,7 +208,7 @@ protected function deactivate(Watcher $watcher)
     private function getCreationTrace(string $watcher): string
     {
         if (!isset($this->creationTraces[$watcher])) {
-            new InvalidWatcherError($watcher, "An invalid watcher has been used: " . $watcher);
+            throw new InvalidWatcherError($watcher, "An invalid watcher has been used: " . $watcher);
         }
 
         return $this->creationTraces[$watcher];

diff --git a/test/Loop/TracingDriverTest.php b/test/Loop/TracingDriverTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Amp\Test\Loop;
+
+use Amp\Loop\NativeDriver;
+use Amp\Loop\TracingDriver;
+
+class TracingDriverTest extends DriverTest
+{
+    public function getFactory(): callable
+    {
+        return static function () {
+            return new TracingDriver(new NativeDriver);
+        };
+    }
+
+    /**
+     * @dataProvider provideRegistrationArgs
+     * @group memoryleak
+     */
+    public function testNoMemoryLeak($type, $args)
+    {
+        // Skip, because the driver intentionally leaks
+        $this->assertTrue(true);
+    }
+}