merged branch romainneutron/process-stream-select2.2 (PR #8274)

fabpot · fabpot · commit add4207838e1 · 2013-06-13T18:05:48.000+02:00
This PR was merged into the 2.2 branch. Discussion ---------- [2.2][Process] Disable exception on stream_select timeout | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #8231 | License | MIT Commits ------- c0da3ae [Process] Disable exception on stream_select timeout
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -306,15 +306,17 @@ public function start($callback = null)
             $w = $writePipes;
             $e = null;
 
-            $n = @stream_select($r, $w, $e, 0, ceil(static::TIMEOUT_PRECISION * 1E6));
-
-            if (false === $n) {
+            if (false === $n = @stream_select($r, $w, $e, 0, ceil(static::TIMEOUT_PRECISION * 1E6))) {
+                // if a system call has been interrupted, forget about it, let's try again
+                if ($this->hasSystemCallBeenInterrupted()) {
+                    continue;
+                }
                 break;
             }
-            if ($n === 0) {
-                proc_terminate($this->process);
 
-                throw new RuntimeException('The process timed out.');
+            // nothing has changed, let's wait until the process is ready
+            if (0 === $n) {
+                continue;
             }
 
             if ($w) {
@@ -404,10 +406,9 @@ public function wait($callback = null)
 
                 // let's have a look if something changed in streams
                 if (false === $n = @stream_select($r, $w, $e, 0, ceil(static::TIMEOUT_PRECISION * 1E6))) {
-                    $lastError = error_get_last();
-
-                    // stream_select returns false when the `select` system call is interrupted by an incoming signal
-                    if (isset($lastError['message']) && false === stripos($lastError['message'], 'interrupted system call')) {
+                    // if a system call has been interrupted, forget about it, let's try again
+                    // otherwise, an error occured, let's reset pipes
+                    if (!$this->hasSystemCallBeenInterrupted()) {
                         $this->pipes = array();
                     }
 
@@ -1140,4 +1141,17 @@ private function processFileHandles($callback, $closeEmptyHandles = false)
             }
         }
     }
+
+    /**
+     * Returns true if a system call has been interrupted.
+     *
+     * @return Boolean
+     */
+    private function hasSystemCallBeenInterrupted()
+    {
+        $lastError = error_get_last();
+
+        // stream_select returns false when the `select` system call is interrupted by an incoming signal
+        return isset($lastError['message']) && false !== stripos($lastError['message'], 'interrupted system call');
+    }
 }
