SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pidref: Add pidref_wait_for_terminate_full()

Browse Source 
We can use this to replace wait_for_terminate_with_timeout(). Because
we poll a pidfd, we don't need to block SIGCHLD anymore in umount.c.
This commit is contained in:
Daan De Meyer
2025-12-20 15:49:26 +01:00
parent 9bd833ee6e
commit e74b571004
9 changed files with 122 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-pidref.c
+19
View File
@@ -6,6 +6,7 @@
#include "process-util.h"
#include "stdio-util.h"
#include "tests.h"
#include "time-util.h"
TEST(pidref_is_set) {
ASSERT_FALSE(pidref_is_set(NULL));
@@ -246,4 +247,22 @@ TEST(pidref_is_remote) {
ASSERT_ERROR(pidref_verify(&p), EREMOTE);
}
TEST(pidref_wait_for_terminate_timeout) {
_cleanup_(pidref_done_sigkill_wait) PidRef pidref = PIDREF_NULL;
siginfo_t si;
/* Test successful termination within timeout */
ASSERT_OK(pidref_safe_fork("(test-pidref-wait-timeout)", FORK_DEATHSIG_SIGKILL|FORK_FREEZE, &pidref));
assert_se(pidref_kill(&pidref, SIGKILL) >= 0);
ASSERT_OK(pidref_wait_for_terminate_full(&pidref, 5 * USEC_PER_SEC, &si));
ASSERT_EQ(si.si_signo, SIGCHLD);
pidref_done(&pidref);
/* Test timeout when process doesn't terminate */
ASSERT_OK(pidref_safe_fork("(test-pidref-wait-timeout-expired)", FORK_DEATHSIG_SIGKILL|FORK_FREEZE, &pidref));
ASSERT_ERROR(pidref_wait_for_terminate_full(&pidref, 100 * USEC_PER_MSEC, NULL), ETIMEDOUT);
}
DEFINE_TEST_MAIN(LOG_DEBUG);