mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-11-28 11:09:54 +00:00
Code Issues 1 Releases Wiki Activity

Merge pull request #713 from yumaikas/fix-process-terminate-windows

Browse Source 
Add TerminateProcess to janet_proc_gc and os_proc_kill on Windows
This commit is contained in:
Calvin Rose 2021-07-11 09:30:07 -04:00 committed by GitHub
commit dc414f1239
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/os.c
View File

@ -434,6 +434,7 @@ static int janet_proc_gc(void *p, size_t s) {
JanetProc *proc = (JanetProc *) p; JanetProc *proc = (JanetProc *) p;
#ifdef JANET_WINDOWS #ifdef JANET_WINDOWS
if (!(proc->flags & JANET_PROC_CLOSED)) { if (!(proc->flags & JANET_PROC_CLOSED)) {
TerminateProcess(proc->pHandle, 1);
CloseHandle(proc->pHandle); CloseHandle(proc->pHandle);
CloseHandle(proc->tHandle); CloseHandle(proc->tHandle);
} }
@ -519,6 +520,7 @@ static Janet os_proc_kill(int32_t argc, Janet *argv) {
janet_panicf("cannot close process handle that is already closed"); janet_panicf("cannot close process handle that is already closed");
} }
proc->flags |= JANET_PROC_CLOSED; proc->flags |= JANET_PROC_CLOSED;
TerminateProcess(proc->pHandle, 1);
CloseHandle(proc->pHandle); CloseHandle(proc->pHandle);
CloseHandle(proc->tHandle); CloseHandle(proc->tHandle);
#else #else

5
test/suite0009.janet
View File

@ -47,6 +47,11 @@
(assert-no-error "pipe stdin to process 2" (os/proc-wait p)) (assert-no-error "pipe stdin to process 2" (os/proc-wait p))
(assert (= "hello!" (string/trim x)) "round trip pipeline in process")) (assert (= "hello!" (string/trim x)) "round trip pipeline in process"))
(let [p (os/spawn [janet "-e" `(do (ev/sleep 30) (os/exit 24)`] :p)]
(os/proc-kill p)
(def retval (os/proc-wait p))
(assert (not= retval 24) "Process was *not* terminated by parent"))
# Parallel subprocesses # Parallel subprocesses
(defn calc-1 (defn calc-1