Commit 5419487
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
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
233 | 233 | | |
234 | 234 | | |
235 | 235 | | |
236 | | - | |
237 | | - | |
238 | | - | |
239 | | - | |
240 | | - | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
241 | 252 | | |
242 | 253 | | |
243 | 254 | | |
0 commit comments