bug #28940 [Process] Adds usleep(1000) to ease CPU usage. (miniyarov)

nicolas-grekas · nicolas-grekas · commit fc7aeb95e094 · 2018-10-23T09:28:42.000+02:00
This PR was squashed before being merged into the 4.2-dev branch (closes #28940). Discussion ---------- [Process] Adds usleep(1000) to ease CPU usage. | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | symfony/symfony-docs Commits ------- 9d1416a [Process] Adds usleep(1000) to ease CPU usage.
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -436,12 +436,10 @@ public function wait(callable $callback = null)
      * from the output in real-time while writing the standard input to the process.
      * It allows to have feedback from the independent process during execution.
      *
-     * @param callable $callback
-     *
      * @throws RuntimeException When process timed out
      * @throws LogicException   When process is not yet started
      */
-    public function waitUntil(callable $callback)
+    public function waitUntil(callable $callback): bool
     {
         $this->requireProcessIsStarted(__FUNCTION__);
         $this->updateStatus(false);
@@ -465,7 +463,14 @@ public function waitUntil(callable $callback)
                     $this->fallbackStatus['exitcode'] = (int) $data;
                 }
             }
+            if ($wait && !$this->isRunning()) {
+                return false;
+            }
+
+            usleep(1000);
         } while ($wait);
+
+        return true;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -436,12 +436,10 @@ public function wait(callable $callback = null)`
`436`	`436`	`* from the output in real-time while writing the standard input to the process.`
`437`	`437`	`* It allows to have feedback from the independent process during execution.`
`438`	`438`	`*`
`439`		`- * @param callable $callback`
`440`		`- *`
`441`	`439`	`* @throws RuntimeException When process timed out`
`442`	`440`	`* @throws LogicException When process is not yet started`
`443`	`441`	`*/`
`444`		`- public function waitUntil(callable $callback)`
	`442`	`+ public function waitUntil(callable $callback): bool`
`445`	`443`	`{`
`446`	`444`	`$this->requireProcessIsStarted(__FUNCTION__);`
`447`	`445`	`$this->updateStatus(false);`
`@@ -465,7 +463,14 @@ public function waitUntil(callable $callback)`
`465`	`463`	`$this->fallbackStatus['exitcode'] = (int) $data;`
`466`	`464`	`}`
`467`	`465`	`}`
	`466`	`+ if ($wait && !$this->isRunning()) {`
	`467`	`+ return false;`
	`468`	`+ }`
	`469`	`+`
	`470`	`+ usleep(1000);`
`468`	`471`	`} while ($wait);`
	`472`	`+`
	`473`	`+ return true;`
`469`	`474`	`}`
`470`	`475`
`471`	`476`	`/**`