Skip to content

Commit 5419487

Browse files
Sergio Durigan Juniorwilliamdes
authored andcommitted
Fix #309 - Use stream_select instead of non-blocking STDIN
The idiom used in the readStdin function from src/Utils/CLI.php is not entirely error-prone: marking stdin as non-blocking and then reading from it can lead to racy scenarios where we are not able to catch what's being fed to the program. This can be seen very frequently on s390x, where a loop like this: $ while echo "invalid query" | /usr/bin/php7.4 /path/to//highlight-query; do sleep 1; done; will lead to failures once on every few runs (as can be seen in the description of issue #309). This commit implements the more robust method which uses stream_select to wait for stdin to become available, but resorts to a sensible timeout value (0.2 seconds) which will prevent the blocking from happening. I tested this patch extensively on s390x and amd64, and noticed that the non-determinism is gone. Signed-off-by: Sergio Durigan Junior <[email protected]>
1 parent 6f31612 commit 5419487

1 file changed

Lines changed: 16 additions & 5 deletions

File tree

src/Utils/CLI.php

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,22 @@ public function runTokenize()
233233
return 1;
234234
}
235235

236-
public function readStdin() {
237-
stream_set_blocking(STDIN, false);
238-
$stdin = stream_get_contents(STDIN);
239-
// restore-default block-mode setting
240-
stream_set_blocking(STDIN, true);
236+
public function readStdin()
237+
{
238+
$read = [STDIN];
239+
$write = [];
240+
$except = [];
241+
242+
// Assume there's nothing to be read from STDIN.
243+
$stdin = null;
244+
245+
// Try to read from STDIN. Wait 0.2 second before timing out.
246+
$result = stream_select($read, $write, $except, 0, 2000);
247+
248+
if ($result > 0) {
249+
$stdin = stream_get_contents(STDIN);
250+
}
251+
241252
return $stdin;
242253
}
243254
}

0 commit comments

Comments
 (0)