mirrors
/
janet
mirror of https://github.com/janet-lang/janet
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Expose _exit to skip certain cleanup with os/exit

This commit is contained in:
Calvin Rose 2024-02-01 22:20:52 -06:00
parent 3fd70f0951
commit f6df8ff935
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/os.c
View File

@ -229,10 +229,11 @@ JANET_CORE_FN(os_compiler,
#undef janet_stringify #undef janet_stringify
JANET_CORE_FN(os_exit, JANET_CORE_FN(os_exit,
"(os/exit &opt x)", "(os/exit &opt x force)",
"Exit from janet with an exit code equal to x. If x is not an integer, " "Exit from janet with an exit code equal to x. If x is not an integer, "
"the exit with status equal the hash of x.") { "the exit with status equal the hash of x. If `force` is truthy will exit immediately and "
janet_arity(argc, 0, 1); "skip cleanup code.") {
janet_arity(argc, 0, 2);
int status; int status;
if (argc == 0) { if (argc == 0) {
status = EXIT_SUCCESS; status = EXIT_SUCCESS;
@ -242,7 +243,11 @@ JANET_CORE_FN(os_exit,
status = EXIT_FAILURE; status = EXIT_FAILURE;
} }
janet_deinit(); janet_deinit();
exit(status); if (argc >= 2 && janet_truthy(argv[1])) {
_exit(status);
} else {
exit(status);
}
return janet_wrap_nil(); return janet_wrap_nil();
} }
@ -613,7 +618,7 @@ os_proc_wait_impl(JanetProc *proc) {
JANET_CORE_FN(os_proc_wait, JANET_CORE_FN(os_proc_wait,
"(os/proc-wait proc)", "(os/proc-wait proc)",
"Block until the subprocess completes. Returns the subprocess return code.") { "Suspend the current fiber until the subprocess completes. Returns the subprocess return code.") {
janet_fixarity(argc, 1); janet_fixarity(argc, 1);
JanetProc *proc = janet_getabstract(argv, 0, &ProcAT); JanetProc *proc = janet_getabstract(argv, 0, &ProcAT);
#ifdef JANET_EV #ifdef JANET_EV
@ -877,8 +882,9 @@ JANET_CORE_FN(os_sigaction,
} }
struct sigaction action; struct sigaction action;
sigset_t mask; sigset_t mask;
sigfillset(&mask); sigaddset(&mask, sig);
memset(&action, 0, sizeof(action)); memset(&action, 0, sizeof(action));
action.sa_flags |= SA_RESTART;
if (can_interrupt) { if (can_interrupt) {
#ifdef JANET_NO_INTERPRETER_INTERRUPT #ifdef JANET_NO_INTERPRETER_INTERRUPT
janet_panic("interpreter interrupt not enabled"); janet_panic("interpreter interrupt not enabled");