diff options
| author | Philipp Stephani <phst@google.com> | 2021-01-17 14:00:16 +0100 |
|---|---|---|
| committer | Philipp Stephani <phst@google.com> | 2021-01-17 14:02:36 +0100 |
| commit | 1773679af3241919a85d6174b1554070a63cca79 (patch) | |
| tree | cc5d73f8615beaa9e1bbff36b45516c89c9080b5 /src | |
| parent | 39a65844e8d67b5ca3bb2d179e899ff99cd85618 (diff) | |
| download | emacs-1773679af3241919a85d6174b1554070a63cca79.tar.gz | |
Ensure that sentinels are called during 'accept-process-output'.
When we're trying to notify a process about a status change, we need
to ignore the SIGCHLD pipe temporarily, otherwise the code would
likely not run into the timeout case that's necessary for a status
change to happen.
* src/process.c (wait_reading_process_output): Ignore the SIGCHLD pipe
when notifying a process about a status change.
* test/src/process-tests.el (process-tests/sentinel-called)
(process-tests/sentinel-with-multiple-processes): New unit tests.
Diffstat (limited to 'src')
| -rw-r--r-- | src/process.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/process.c b/src/process.c index aca87f8ed35..09f87908a45 100644 --- a/src/process.c +++ b/src/process.c @@ -5323,6 +5323,15 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, compute_input_wait_mask (&Atemp); compute_write_mask (&Ctemp); + /* If a process status has changed, the child signal pipe + will likely be readable. We want to ignore it for now, + because otherwise we wouldn't run into a timeout + below. */ + int fd = child_signal_read_fd; + eassert (fd < FD_SETSIZE); + if (0 <= fd) + FD_CLR (fd, &Atemp); + timeout = make_timespec (0, 0); if ((thread_select (pselect, max_desc + 1, &Atemp, |