fix(demo): kill launcher process groups and trap before creating the work dir

commit: c2e9def3be042f920f5607e82b529e225fbbfbbf
author: brice · 38h ago · 2026-10-21 05:29 UTC
parent: 87924a1
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email
checks: 2/2

3 files · +9 -4

M docs/media/demo.mp4 +0 -0 binary file: no text diff

binary file: no text diff

M docs/media/demo.png +0 -0 binary file: no text diff

binary file: no text diff

M tools/demo/record.sh +9 -4


@@ -9,16 +9,17 @@ for command in docker go ffmpeg; do
9	9		done
10	10		docker info >/dev/null 2>&1 \|\| { echo 'Docker daemon unavailable; start rootless Docker first.' >&2; exit 1; }
11	11		work=$(mktemp -d "${TMPDIR:-/tmp}/neferwl-demo.XXXXXX")
12		-	printf 'Capture directory: %s\n' "$work"
13		-	mkdir -p "$work/shots" docs/media
14	12		compositor='' launcher='' feeder='' success=''
15	13		container=neferwl-demo-$$
16	14		cleanup() {
17	15		local status=$?
18	16		trap - EXIT
19		-	for pid in "$launcher" "$feeder" "$compositor"; do
20		-	if [[ -n $pid ]]; then kill "$pid" 2>/dev/null \|\| true; fi
	17	+	# launcher and feeder run with job control (set -m) in their own process
	18	+	# groups, so killing the group also stops their sleep/docker exec children.
	19	+	for pid in "$launcher" "$feeder"; do
	20	+	if [[ -n $pid ]]; then kill -- "-$pid" 2>/dev/null \|\| kill "$pid" 2>/dev/null \|\| true; fi
21	21		done
	22	+	if [[ -n $compositor ]]; then kill "$compositor" 2>/dev/null \|\| true; fi
22	23		docker rm -f "$container" >/dev/null 2>&1 \|\| true
23	24		for pid in "$launcher" "$feeder" "$compositor"; do
24	25		if [[ -n $pid ]]; then wait "$pid" 2>/dev/null \|\| true; fi

@@ -32,6 +33,8 @@ cleanup() {
32	33		trap cleanup EXIT
33	34		trap 'exit 130' INT
34	35		trap 'exit 143' TERM
	36	+	printf 'Capture directory: %s\n' "$work"
	37	+	mkdir -p "$work/shots" docs/media
35	38		docker build -t neferwl-demo -f tools/demo/Dockerfile tools/demo
36	39		CGO_ENABLED=0 go build -o "$work/neferwl" ./cmd/neferwl
37	40		state=$work/state

@@ -86,10 +89,12 @@ docker exec -d --user demo "$container" foot --title 'System / NeferWL' bash -c
86	89		# The first app is launched before t=0. FIFO input and shell launches now
87	90		# share this epoch, independent of compositor/image/container startup time.
88	91		SECONDS=0
	92	+	set -m
89	93		{ cat tools/demo/input.txt; printf '\nkey Ctrl+Alt+BackSpace\n'; } >&3 &
90	94		feeder=$!
91	95		launch_apps &
92	96		launcher=$!
	97	+	set +m
93	98		# --timeout exits nonzero; accept only its explicit timeout log entry.
94	99		if ! wait "$compositor"; then
95	100		grep -q '"reason":"timeout"' "$log" \|\| exit 1

 done
 docker info >/dev/null 2>&1 || { echo 'Docker daemon unavailable; start rootless Docker first.' >&2; exit 1; }
 work=$(mktemp -d "${TMPDIR:-/tmp}/neferwl-demo.XXXXXX")
-printf 'Capture directory: %s\n' "$work"
-mkdir -p "$work/shots" docs/media
 compositor='' launcher='' feeder='' success=''
 container=neferwl-demo-$$
 cleanup() {
     local status=$?
     trap - EXIT
-    for pid in "$launcher" "$feeder" "$compositor"; do
+    # launcher and feeder run with job control (set -m) in their own process
-        if [[ -n $pid ]]; then kill "$pid" 2>/dev/null || true; fi
+    # groups, so killing the group also stops their sleep/docker exec children.
+    for pid in "$launcher" "$feeder"; do
+        if [[ -n $pid ]]; then kill -- "-$pid" 2>/dev/null || kill "$pid" 2>/dev/null || true; fi
     done
+    if [[ -n $compositor ]]; then kill "$compositor" 2>/dev/null || true; fi
     docker rm -f "$container" >/dev/null 2>&1 || true
     for pid in "$launcher" "$feeder" "$compositor"; do
         if [[ -n $pid ]]; then wait "$pid" 2>/dev/null || true; fi
 trap cleanup EXIT
 trap 'exit 130' INT
 trap 'exit 143' TERM
+printf 'Capture directory: %s\n' "$work"
+mkdir -p "$work/shots" docs/media
 docker build -t neferwl-demo -f tools/demo/Dockerfile tools/demo
 CGO_ENABLED=0 go build -o "$work/neferwl" ./cmd/neferwl
 state=$work/state
 # The first app is launched before t=0. FIFO input and shell launches now
 # share this epoch, independent of compositor/image/container startup time.
 SECONDS=0
+set -m
 { cat tools/demo/input.txt; printf '\nkey Ctrl+Alt+BackSpace\n'; } >&3 &
 feeder=$!
 launch_apps &
 launcher=$!
+set +m
 # --timeout exits nonzero; accept only its explicit timeout log entry.
 if ! wait "$compositor"; then
     grep -q '"reason":"timeout"' "$log" || exit 1