Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions modules/capture/scripts/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,9 @@ sleep 0.5
kill -INT "$recorder_part" "$recorder_flac" "$recorder_again"
wait "$recorder_part" "$recorder_flac" 2>/dev/null || true
again_as=0; wait "$recorder_again" || again_as=$?
# Its signallers alone: the graph's daemons are children of this script too, and never end.
wait "${signallers[@]}" 2>/dev/null || true
# Its signallers alone — the graph's daemons are children of this script too, and never end —, each
# judged: one that failed sent nothing, and the folders after would be those of recordings merely stopped.
for signaller in "${signallers[@]}"; do check wait "$signaller"; done
kill "$mic_player" "$others_player" 2>/dev/null || true
for run in part flac again; do
folder=$(ls -d "$work/kept-$run"/*/ | head -1)
Expand Down
25 changes: 22 additions & 3 deletions modules/capture/scripts/e2e_measure_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,15 @@ def call_followed(folder, events, call, default, heard, left, after):
assert not near(left), f"remote: {left} Hz, played on the output the call had left, is in its track"


def ended(pid):
"""The process is gone, or has ended and waits for its parent to read its status."""
try:
with open(f"/proc/{pid}/stat") as stat:
return stat.read().rpartition(")")[2].split()[0] == "Z"
except FileNotFoundError:
return True


def main(what, folder, *args):
if what == "pause":
# Not a measure: stops the recorder's own stream for a track, then starts it again.
Expand Down Expand Up @@ -391,12 +400,22 @@ def main(what, folder, *args):
return print(f" {', '.join(names)}: each track whole")
if what == "signal-at":
# Not a measure: the signal `args[1]` to the recorder `args[0]` the moment `args[2]` is in the folder.
# Exits 0 once sent, and when the recorder ended before the moment: on a fast machine a `.part`
# comes and goes between two looks, and what is left is judged whole all the same. Exits 1
# otherwise: the moment not come in two minutes with the recorder still running, or a failure.
pid, sent, name = int(args[0]), getattr(signal, args[1]), args[2]
until = time.monotonic() + 120
while not os.path.exists(os.path.join(folder, name)):
assert time.monotonic() < until, f"{name} never appeared"
if ended(pid):
return print(f" {args[1]} not sent: the recorder ended before {name} appeared")
assert time.monotonic() < until, f"{name} never appeared, the recorder still running"
time.sleep(0.0005)
os.kill(pid, sent)
try:
if ended(pid):
raise ProcessLookupError
os.kill(pid, sent)
except ProcessLookupError:
return print(f" {args[1]} not sent: the recorder ended as {name} appeared")
return print(f" {args[1]} sent as {name} appeared")
if what == "followed":
return followed(folder, *args)
Expand Down Expand Up @@ -477,7 +496,7 @@ def main(what, folder, *args):
elif what == "stopped-source":
# The remote source was stopped for several seconds: the capture wrote zeros and said which.
points, silences, _ = clocks["remote"]
remote, rate = tracks["remote"], tracks["remote"]["rate"]
_, rate = tracks["remote"], tracks["remote"]["rate"]
assert silences, "remote stopped for seconds, and the clock says no silence of ours"
zeros = sum(to - start for start, to in silences)
assert zeros >= 2 * rate, f"{zeros / rate:.1f} s of zeros said for a stop of several seconds"
Expand Down
Loading