mach jl_deliver_handled_sigint fixed

jakubwro · Sep 19, 2023 · 265eff0 · 265eff0
1 parent 9ddbf8b
commit 265eff0
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/src/signals-mach.c b/src/signals-mach.c
@@ -457,6 +457,34 @@ static void jl_try_deliver_sigint(void)
     HANDLE_MACH_ERROR("thread_resume", ret);
 }
 
+static void jl_deliver_handled_sigint(void)
+{
+    jl_ptls_t ptls2 = jl_atomic_load_relaxed(&jl_all_tls_states)[0];
+    mach_port_t thread = pthread_mach_thread_np(ptls2->system_id);
+
+    kern_return_t ret = thread_suspend(thread);
+    HANDLE_MACH_ERROR("thread_suspend", ret);
+
+    // This aborts `sleep` and other syscalls.
+    // ret = thread_abort_safely(thread);
+    // HANDLE_MACH_ERROR("thread_abort", ret);
+
+    int force = jl_check_force_sigint();
+    if (force || (!ptls2->defer_signal && ptls2->io_wait)) {
+        jl_safepoint_consume_sigint();
+        if (force)
+            jl_safe_printf("WARNING: Force throwing a SIGINT\n");
+        jl_clear_force_sigint();
+        jl_throw_in_thread(ptls2, thread, jl_interrupt_exception);
+    }
+    else {
+        jl_wake_libuv();
+    }
+
+    ret = thread_resume(thread);
+    HANDLE_MACH_ERROR("thread_resume", ret);
+}
+
 static void JL_NORETURN jl_exit_thread0_cb(int signo)
 {
 CFI_NORETURN

diff --git a/src/signals-unix.c b/src/signals-unix.c
@@ -600,7 +600,6 @@ JL_DLLEXPORT void jl_profile_stop_timer(void)
 #error no profile tools available
 
 #endif
-#endif // HAVE_MACH
 
 static void jl_deliver_handled_sigint(void)
 {
@@ -612,6 +611,8 @@ static void jl_deliver_handled_sigint(void)
     jl_wake_thread(0);
 }
 
+#endif // HAVE_MACH
+
 static void allocate_segv_handler(void)
 {
     struct sigaction act;