Remove MJIT worker thread (#6006)

[Misc #18830]

1 files changed, 15 insertions, 0 deletions

diff --git a/thread.c b/thread.c
index 5e659a643f..0b5cbb8197 100644
--- a/thread.c
+++ b/thread.c
@@ -2233,6 +2233,12 @@ threadptr_get_interrupts(rb_thread_t *th)
     return interrupt & (rb_atomic_t)~ec->interrupt_mask;
 }
 
+#if USE_MJIT
+// process.c
+extern bool mjit_waitpid_finished;
+extern int mjit_waitpid_status;
+#endif
+
 MJIT_FUNC_EXPORTED int
 rb_threadptr_execute_interrupts(rb_thread_t *th, int blocking_timing)
 {
@@ -2280,6 +2286,15 @@ rb_threadptr_execute_interrupts(rb_thread_t *th, int blocking_timing)
 		ret |= rb_signal_exec(th, sig);
 	    }
 	    th->status = prev_status;
+
+#if USE_MJIT
+            // Handle waitpid_signal for MJIT issued by ruby_sigchld_handler. This needs to be done
+            // outside ruby_sigchld_handler to avoid recursively relying on the SIGCHLD handler.
+            if (mjit_waitpid_finished) {
+                mjit_waitpid_finished = false;
+                mjit_notify_waitpid(mjit_waitpid_status);
+            }
+#endif
 	}
 
 	/* exception from another thread */