add an option to set max retries

reliforp · May 27, 2020 · f20bd67 · f20bd67
1 parent 5d9c3b9
commit f20bd67
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/src/Command/Inspector/GetCurrentFunctionNameCommand.php b/src/Command/Inspector/GetCurrentFunctionNameCommand.php
@@ -61,6 +61,12 @@ public function configure(): void
                 's',
                 InputOption::VALUE_OPTIONAL,
                 'nanoseconds between traces (default: 1000 * 1000 * 10)'
+            )
+            ->addOption(
+                'max-retries',
+                'r',
+                InputOption::VALUE_OPTIONAL,
+                'max retries on contiguous errors of read (default: 10)'
             );
     }
 

diff --git a/src/Command/Inspector/GetTraceCommand.php b/src/Command/Inspector/GetTraceCommand.php
@@ -63,6 +63,12 @@ public function configure(): void
                 's',
                 InputOption::VALUE_OPTIONAL,
                 'nanoseconds between traces (default: 1000 * 1000 * 10)'
+            )
+            ->addOption(
+                'max-retries',
+                'r',
+                InputOption::VALUE_OPTIONAL,
+                'max retries on contiguous errors of read (default: 10)'
             );
     }
 

diff --git a/src/Command/Inspector/Settings/LoopSettings.php b/src/Command/Inspector/Settings/LoopSettings.php
@@ -20,19 +20,23 @@ class LoopSettings
 {
     private const SLEEP_NANO_SECONDS_DEFAULT = 1000 * 1000 * 10;
     private const CANCEL_KEY_DEFAULT = 'q';
+    private const MAX_RETRY_DEFAULT = 10;
 
     public int $sleep_nano_seconds;
     public string $cancel_key;
+    public int $max_retries;
 
     /**
      * TraceLoopSettings constructor.
      * @param int $sleep_nano_seconds
      * @param string $cancel_key
+     * @param int $max_retries
      */
-    public function __construct(int $sleep_nano_seconds, string $cancel_key)
+    public function __construct(int $sleep_nano_seconds, string $cancel_key, int $max_retries)
     {
         $this->sleep_nano_seconds = $sleep_nano_seconds;
         $this->cancel_key = $cancel_key;
+        $this->max_retries = $max_retries;
     }
 
     /**
@@ -51,6 +55,15 @@ public static function fromConsoleInput(InputInterface $input): self
             throw LoopSettingsException::create(LoopSettingsException::SLEEP_NS_IS_NOT_INTEGER);
         }
 
-        return new self($sleep_nano_seconds, self::CANCEL_KEY_DEFAULT);
+        $max_retries = $input->getOption('max-retries');
+        if (is_null($max_retries)) {
+            $max_retries = self::MAX_RETRY_DEFAULT;
+        }
+        $max_retries = filter_var($max_retries, FILTER_VALIDATE_INT);
+        if ($max_retries === false) {
+            throw LoopSettingsException::create(LoopSettingsException::MAX_RETRY_IS_NOT_INTEGER);
+        }
+
+        return new self($sleep_nano_seconds, self::CANCEL_KEY_DEFAULT, $max_retries);
     }
 }
diff --git a/src/Command/Inspector/Settings/LoopSettingsException.php b/src/Command/Inspector/Settings/LoopSettingsException.php
@@ -18,8 +18,10 @@
 class LoopSettingsException extends CommandSettingsException
 {
     public const SLEEP_NS_IS_NOT_INTEGER = 1;
+    public const MAX_RETRY_IS_NOT_INTEGER = 2;
 
     protected const ERRORS = [
         self::SLEEP_NS_IS_NOT_INTEGER => 'sleep-ns is not integer',
+        self::MAX_RETRY_IS_NOT_INTEGER => 'max-retries is not integer',
     ];
 }
diff --git a/src/Command/Inspector/TraceLoopProvider.php b/src/Command/Inspector/TraceLoopProvider.php
@@ -34,7 +34,7 @@ public function __construct(LoopBuilder $loop_builder)
     public function getMainLoop(callable $main, LoopSettings $settings): Loop
     {
         return $this->loop_builder->addProcess(NanoSleepLoop::class, [$settings->sleep_nano_seconds])
-            ->addProcess(RetryOnExceptionLoop::class, [10, [MemoryReaderException::class]])
+            ->addProcess(RetryOnExceptionLoop::class, [$settings->max_retries, [MemoryReaderException::class]])
             ->addProcess(KeyboardCancelLoop::class, [$settings->cancel_key])
             ->addProcess(CallableLoop::class, [$main])
             ->build();