CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-02-16 20:33:18 +02:00
Code Issues Projects Releases Wiki Activity

timeout: ensure we terminate command upon abnormal exit

Browse Source 
* src/timeout.c (main): Use PR_SET_PDEATHSIG to ensure the
child is terminated even if the parent terminates abnormally.
* tests/timeout/timeout-group.sh: Add a case to ensure sending
SIGKILL results in the termination of the monitored command.
* NEWS: Mention the improvement.
This commit is contained in:
Pádraig Brady
2025-11-28 17:34:23 +00:00
parent d1d311e7a2
commit fc5c7b2e47
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/timeout/timeout-group.sh
View File

@@ -76,6 +76,13 @@ check_timeout_cmd_running()
{ sleep $delay; return 1; }
}
check_timeout_cmd_exiting()
{
local delay="$1"
test -e sig.received ||
{ sleep $delay; return 1; }
}
# Terminate any background processes
cleanup_() { kill $pid 2>/dev/null && wait $pid; }
@@ -88,9 +95,20 @@ retry_delay_ check_timeout_cmd_running .1 6 || fail=1
kill -USR1 -- -$pid
wait
test -e sig.received || fail=1
rm -f sig.received timeout.running
# On Linux ensure we kill the monitored command
# even if we're terminated abnormally (e.g., get SIGKILL).
if grep '^#define HAVE_PRCTL 1' "$CONFIG_HEADER" >/dev/null; then
timeout -sUSR1 25 ./timeout.cmd 20 & pid=$!
# Wait 6.3s for timeout.cmd to start
retry_delay_ check_timeout_cmd_running .1 6 || fail=1
kill -KILL -- $pid
wait
# Wait 6.3s for timeout.cmd to exit
retry_delay_ check_timeout_cmd_exiting .1 6 || fail=1
rm -f sig.received timeout.running
fi
# Ensure cascaded timeouts work
# or more generally, ensure we timeout