mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-06-26 07:02:57 +00:00
Code Issues 1 Releases Wiki Activity

Prevent multi-scheduling with os/proc-wait. (address #1562)

Browse Source
This commit is contained in:
Calvin Rose 2025-03-02 10:33:56 -06:00
parent 3441bcbd69
commit e0a0e2ed42
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/os.c
View File

@ -541,11 +541,12 @@ static void janet_proc_wait_cb(JanetEVGenericMessage args) {
proc->flags &= ~JANET_PROC_WAITING; proc->flags &= ~JANET_PROC_WAITING;
janet_gcunroot(janet_wrap_abstract(proc)); janet_gcunroot(janet_wrap_abstract(proc));
janet_gcunroot(janet_wrap_fiber(args.fiber)); janet_gcunroot(janet_wrap_fiber(args.fiber));
if ((status != 0) && (proc->flags & JANET_PROC_ERROR_NONZERO)) { uint32_t sched_id = (uint32_t) args.argi;
JanetString s = janet_formatc("command failed with non-zero exit code %d", status); if (janet_fiber_can_resume(args.fiber) && args.fiber->sched_id == sched_id) {
janet_cancel(args.fiber, janet_wrap_string(s)); if ((status != 0) && (proc->flags & JANET_PROC_ERROR_NONZERO)) {
} else { JanetString s = janet_formatc("command failed with non-zero exit code %d", status);
if (janet_fiber_can_resume(args.fiber)) { janet_cancel(args.fiber, janet_wrap_string(s));
} else {
janet_schedule(args.fiber, janet_wrap_integer(status)); janet_schedule(args.fiber, janet_wrap_integer(status));
} }
} }
@ -603,6 +604,7 @@ os_proc_wait_impl(JanetProc *proc) {
memset(&targs, 0, sizeof(targs)); memset(&targs, 0, sizeof(targs));
targs.argp = proc; targs.argp = proc;
targs.fiber = janet_root_fiber(); targs.fiber = janet_root_fiber();
targs.argi = (uint32_t) targs.fiber->sched_id;
janet_gcroot(janet_wrap_abstract(proc)); janet_gcroot(janet_wrap_abstract(proc));
janet_gcroot(janet_wrap_fiber(targs.fiber)); janet_gcroot(janet_wrap_fiber(targs.fiber));
janet_ev_threaded_call(janet_proc_wait_subr, targs, janet_proc_wait_cb); janet_ev_threaded_call(janet_proc_wait_subr, targs, janet_proc_wait_cb);

24
test/suite-ev.janet
View File

@ -526,4 +526,28 @@
(assert (= maxconn connect-count)) (assert (= maxconn connect-count))
(:close s) (:close s)
# Cancel os/proc-wait with ev/deadline
(let [p (os/spawn [;run janet "-e" "(os/sleep 4)"] :p)]
(var terminated-normally false)
(assert-error "deadline expired"
(ev/with-deadline 0.01
(os/proc-wait p)
(print "uhoh")
(set terminated-normally true)))
(assert (not terminated-normally) "early termination failure")
# Without this kill, janet will wait the full 4 seconds for the subprocess to complete before exiting.
(assert-no-error "kill proc after wait failed" (os/proc-kill p)))
# Cancel os/proc-wait with ev/deadline 2
(let [p (os/spawn [;run janet "-e" "(os/sleep 0.1)"] :p)]
(var terminated-normally false)
(assert-error "deadline expired"
(ev/with-deadline 0.05
(os/proc-wait p)
(print "uhoh")
(set terminated-normally true)))
(assert (not terminated-normally) "early termination failure 2")
(ev/sleep 0.15)
(assert (not terminated-normally) "early termination failure 3"))
(end-suite) (end-suite)