From f6d569b7c0ae7cb5e08534330cdf94572a12e869 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Sun, 4 Sep 2022 18:21:56 -0700 Subject: Call appropriate hooks on MJIT's fork This takes care of signal_self_pipe and other things. --- mjit.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'mjit.c') diff --git a/mjit.c b/mjit.c index 662ef99b32..0aa6d6e7cf 100644 --- a/mjit.c +++ b/mjit.c @@ -742,23 +742,17 @@ mjit_compact_unit(struct rb_mjit_unit *unit) return 1; } +extern pid_t rb_mjit_fork(); + static pid_t start_mjit_compact(struct rb_mjit_unit *unit) { - rb_vm_t *vm = GET_VM(); - rb_native_mutex_lock(&vm->waitpid_lock); - - pid_t pid = rb_fork(); + pid_t pid = rb_mjit_fork(); if (pid == 0) { - rb_native_mutex_unlock(&vm->waitpid_lock); - int exit_code = mjit_compact_unit(unit); exit(exit_code); } else { - mjit_add_waiting_pid(vm, pid); - rb_native_mutex_unlock(&vm->waitpid_lock); - return pid; } } @@ -908,20 +902,12 @@ mjit_compile_unit(struct rb_mjit_unit *unit) static pid_t start_mjit_compile(struct rb_mjit_unit *unit) { - rb_vm_t *vm = GET_VM(); - rb_native_mutex_lock(&vm->waitpid_lock); - - pid_t pid = rb_fork(); + pid_t pid = rb_mjit_fork(); if (pid == 0) { - rb_native_mutex_unlock(&vm->waitpid_lock); - int exit_code = mjit_compile_unit(unit); exit(exit_code); } else { - mjit_add_waiting_pid(vm, pid); - rb_native_mutex_unlock(&vm->waitpid_lock); - return pid; } } -- cgit v1.2.3