1 files changed, 33 insertions, 40 deletions
diff --git a/thread.c b/thread.c
index a637c8ec7c..41bd6c9ec6 100644
--- a/thread.c
+++ b/thread.c
@@ -519,12 +519,8 @@ thread_cleanup_func(void *th_ptr, int atfork)
     th->locking_mutex = Qfalse;
     thread_cleanup_func_before_exec(th_ptr);
 
-    /*
-     * Unfortunately, we can't release native threading resource at fork
-     * because libc may have unstable locking state therefore touching
-     * a threading resource may cause a deadlock.
-     */
     if (atfork) {
+        native_thread_destroy_atfork(th->nt);
         th->nt = NULL;
         return;
     }
@@ -1544,6 +1540,29 @@ blocking_region_end(rb_thread_t *th, struct rb_blocking_region_buffer *region)
 #endif
 }
 
+/*
+ * Resolve sentinel unblock function values to their actual function pointers
+ * and appropriate data2 values. This centralizes the logic for handling
+ * RUBY_UBF_IO and RUBY_UBF_PROCESS sentinel values.
+ *
+ * @param unblock_function Pointer to unblock function pointer (modified in place)
+ * @param data2 Pointer to data2 pointer (modified in place)
+ * @param thread Thread context for resolving data2 when needed
+ * @return true if sentinel values were resolved, false otherwise
+ */
+bool
+rb_thread_resolve_unblock_function(rb_unblock_function_t **unblock_function, void **data2, struct rb_thread_struct *thread)
+{
+    rb_unblock_function_t *ubf = *unblock_function;
+
+    if ((ubf == RUBY_UBF_IO) || (ubf == RUBY_UBF_PROCESS)) {
+        *unblock_function = ubf_select;
+        *data2 = thread;
+        return true;
+    }
+    return false;
+}
+
 void *
 rb_nogvl(void *(*func)(void *), void *data1,
          rb_unblock_function_t *ubf, void *data2,
@@ -1570,11 +1589,9 @@ rb_nogvl(void *(*func)(void *), void *data1,
     bool is_main_thread = vm->ractor.main_thread == th;
     int saved_errno = 0;
 
-    if ((ubf == RUBY_UBF_IO) || (ubf == RUBY_UBF_PROCESS)) {
-        ubf = ubf_select;
-        data2 = th;
-    }
-    else if (ubf && rb_ractor_living_thread_num(th->ractor) == 1 && is_main_thread) {
+    rb_thread_resolve_unblock_function(&ubf, &data2, th);
+
+    if (ubf && rb_ractor_living_thread_num(th->ractor) == 1 && is_main_thread) {
         if (flags & RB_NOGVL_UBF_ASYNC_SAFE) {
             vm->ubf_async_safe = 1;
         }
@@ -6210,7 +6227,11 @@ threadptr_interrupt_exec_exec(rb_thread_t *th)
         RUBY_DEBUG_LOG("task:%p", task);
 
         if (task) {
-            (*task->func)(task->data);
+            if (task->flags & rb_interrupt_exec_flag_new_thread) {
+                rb_thread_create(task->func, task->data);
+            } else {
+                (*task->func)(task->data);
+            }
             ruby_xfree(task);
         }
         else {
@@ -6233,43 +6254,15 @@ threadptr_interrupt_exec_cleanup(rb_thread_t *th)
     rb_native_mutex_unlock(&th->interrupt_lock);
 }
 
-struct interrupt_ractor_new_thread_data {
-    rb_interrupt_exec_func_t *func;
-    void *data;
-};
-
-static VALUE
-interrupt_ractor_new_thread_func(void *data)
-{
-    struct interrupt_ractor_new_thread_data d = *(struct interrupt_ractor_new_thread_data *)data;
-    ruby_xfree(data);
-
-    d.func(d.data);
-    return Qnil;
-}
-
-static VALUE
-interrupt_ractor_func(void *data)
-{
-    rb_thread_create(interrupt_ractor_new_thread_func, data);
-    return Qnil;
-}
-
 // native thread safe
 // func/data should be native thread safe
 void
 rb_ractor_interrupt_exec(struct rb_ractor_struct *target_r,
                          rb_interrupt_exec_func_t *func, void *data, enum rb_interrupt_exec_flag flags)
 {
-    struct interrupt_ractor_new_thread_data *d = ALLOC(struct interrupt_ractor_new_thread_data);
-
     RUBY_DEBUG_LOG("flags:%d", (int)flags);
 
-    d->func = func;
-    d->data = data;
     rb_thread_t *main_th = target_r->threads.main;
-    rb_threadptr_interrupt_exec(main_th, interrupt_ractor_func, d, flags);
-
-    // TODO MEMO: we can create a new thread in a ractor, but not sure how to do that now.
+    rb_threadptr_interrupt_exec(main_th, func, data, flags | rb_interrupt_exec_flag_new_thread);
 }