ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Fix endless poll on macOS #8753

Browse Source 
Harvid daemonizes and does not write anything
to stdout/err. as opposed to select(), poll() on
macOS does not return when the child process
terminates or is killed.

However poll() on an invalid FD does throw an
error and POLLNVAL is set.
This commit is contained in:
Robin Gareus 2021-06-21 01:58:40 +02:00
parent e7466bddbc
commit f4166fb61d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/pbd/system_exec.cc
View File

@ -836,21 +836,22 @@ SystemExec::output_interposer ()
for (;fcntl (rfd, F_GETFL) != -1;) {
r = read (rfd, buf, BUFSIZ - 1);
if (r < 0 && (errno == EINTR || errno == EAGAIN)) {
again:
/* wait till ready to read */
struct pollfd pfd;
pfd.fd = rfd;
pfd.events = POLLIN|POLLERR|POLLHUP;
pfd.events = POLLIN|POLLERR|POLLHUP|POLLNVAL;
int rv = poll (&pfd, 1, -1);
int rv = poll (&pfd, 1, 1000);
if (rv == -1) {
break;
}
if (pfd.revents & (POLLERR|POLLHUP)) {
if (pfd.revents & (POLLERR|POLLHUP|POLLNVAL)) {
break;
}
@ -858,6 +859,10 @@ SystemExec::output_interposer ()
/* back to read(2) call */
continue;
}
if (rv == 0) {
/* Timeout, poll again */
goto again;
}
}
if (r <= 0) {
break;