system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-07-22 02:34:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test: fall back to a timerfd if pidfd fails

Browse source 
Looks like we don't have pidfd in the CI runners, so let's fall back to a
timerfd that pings us every 20ms in case the test finished.
This commit is contained in:
Peter Hutterer 2021-06-08 14:07:23 +10:00
parent 9bc840efe2
commit 28f74dc6b2
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
test/pwtest.c
View file

@ -600,8 +600,8 @@ static bool collect_child(struct pwtest_test *t, pid_t pid)
int r;
int status;
r = waitpid(pid, &status, 0);
if (r < 0)
r = waitpid(pid, &status, WNOHANG);
if (r <= 0)
return false;
if (WIFEXITED(status)) {
@ -813,8 +813,19 @@ static int monitor_test_forked(struct pwtest_test *t, pid_t pid, int read_fds[_F
int r;
pidfd = syscall(SYS_pidfd_open, pid, 0);
if (pidfd < 0)
goto error;
/* If we don't have pidfd, we use a timerfd to ping us every 20ms */
if (pidfd < 0 && errno == ENOSYS) {
pidfd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK);
if (pidfd == -1)
goto error;
r = timerfd_settime(pidfd, 0,
&((struct itimerspec ){
.it_interval.tv_nsec = 20 * 1000 * 1000,
.it_value.tv_nsec = 20 * 1000 * 1000,
}), NULL);
if (r < 0)
goto error;
}
/* Each test has an epollfd with:
* - a timerfd so we can kill() it if it hangs
@ -856,6 +867,8 @@ static int monitor_test_forked(struct pwtest_test *t, pid_t pid, int read_fds[_F
}
if (e.data.fd == pidfd) {
uint64_t buf;
(void)read(pidfd, &buf, sizeof(buf)); /* for timerfd fallback */
if (collect_child(t, pid))
break;
} else if (e.data.fd == timerfd) {