always init

Author: Jacob Lacouture

eval.c

@@ -262,7 +262,7 @@ rb_ec_cleanup(rb_execution_context_t *ec, enum ruby_tag_type ex)
     EC_POP_TAG();
     th = th0;
     rb_thread_stop_timer_thread();
-    rb_thread_stop_deferred_wait_thread(false);
+    rb_thread_stop_deferred_wait_thread();
     ruby_vm_destruct(th->vm);
     // For YJIT, call this after ruby_vm_destruct() frees jit_cont for the root fiber.
     rb_jit_cont_finish();

process.c

@@ -1522,7 +1522,7 @@ before_exec_non_async_signal_safe(void)
      * Nowadays, we always stop the timer thread completely to allow redirects.
      */
     rb_thread_stop_timer_thread();
-    rb_thread_stop_deferred_wait_thread(false);
+    rb_thread_stop_deferred_wait_thread();
 }
 
 #define WRITE_CONST(fd, str) (void)(write((fd),(str),sizeof(str)-1)<0)
@@ -1570,7 +1570,7 @@ after_exec(void)
 {
     rb_thread_reset_timer_thread();
     rb_thread_start_timer_thread();
-    rb_thread_start_deferred_wait_thread(false);
+    rb_thread_start_deferred_wait_thread();
 }
 
 #if defined HAVE_WORKING_FORK || defined HAVE_DAEMON

thread.c

@@ -5761,7 +5761,7 @@ Init_Thread(void)
     }
 
     rb_thread_create_timer_thread();
-    rb_thread_start_deferred_wait_thread(true);
+    rb_thread_start_deferred_wait_thread();
 
     Init_thread_sync();
 

thread_none.c

@@ -48,12 +48,12 @@ thread_sched_blocking_region_exit(struct rb_thread_sched *sched, rb_thread_t *th
 }
 
 void
-rb_thread_start_deferred_wait_thread(bool init)
+rb_thread_start_deferred_wait_thread(void)
 {
 }
 
 void
-rb_thread_stop_deferred_wait_thread(bool destroy)
+rb_thread_stop_deferred_wait_thread(void)
 {
 }
 

thread_pthread.c

@@ -1328,14 +1328,12 @@ thread_sched_blocking_region_exit(struct rb_thread_sched *sched, rb_thread_t *th
 }
 
 void
-rb_thread_start_deferred_wait_thread(bool init)
+rb_thread_start_deferred_wait_thread(void)
 {
-    if (init) {
-        rb_native_mutex_initialize(&thread_deferred_wait.lock);
-        rb_native_cond_initialize(&thread_deferred_wait.cond);
-        ccan_list_head_init(&thread_deferred_wait.q_head);
-    }
-
+    rb_native_mutex_initialize(&thread_deferred_wait.lock);
+    rb_native_cond_initialize(&thread_deferred_wait.cond);
+    ccan_list_head_init(&thread_deferred_wait.q_head);
+    thread_deferred_wait.running = true;
     pthread_attr_t attr;
     int r;
     r = pthread_attr_init(&attr);
@@ -1347,23 +1345,19 @@ rb_thread_start_deferred_wait_thread(bool init)
         rb_bug_errno("start_deferred_wait_thread - pthread_create", r);
     }
     pthread_attr_destroy(&attr);
-    thread_deferred_wait.running = true;
 }
 
 void
-rb_thread_stop_deferred_wait_thread(bool destroy)
+rb_thread_stop_deferred_wait_thread(void)
 {
     rb_native_mutex_lock(&thread_deferred_wait.lock);
     thread_deferred_wait.running = false;
     rb_native_cond_signal(&thread_deferred_wait.cond);
     rb_native_mutex_unlock(&thread_deferred_wait.lock);
     pthread_join(thread_deferred_wait.thread, NULL);
-
-    if (destroy) {
-        VM_ASSERT(ccan_list_empty(&thread_deferred_wait.q_head));
-        rb_native_cond_destroy(&thread_deferred_wait.cond);
-        rb_native_mutex_destroy(&thread_deferred_wait.lock);
-    }
+    VM_ASSERT(ccan_list_empty(&thread_deferred_wait.q_head));
+    rb_native_cond_destroy(&thread_deferred_wait.cond);
+    rb_native_mutex_destroy(&thread_deferred_wait.lock);
 }
 
 
@@ -1795,7 +1789,7 @@ thread_sched_atfork(struct rb_thread_sched *sched)
 {
     current_fork_gen++;
     rb_thread_sched_init(sched, true);
-    rb_thread_start_deferred_wait_thread(true);
+    rb_thread_start_deferred_wait_thread();
     rb_thread_t *th =  GET_THREAD();
     rb_vm_t *vm = GET_VM();
 

thread_win32.c

@@ -161,12 +161,12 @@ thread_sched_blocking_region_exit(struct rb_thread_sched *sched, rb_thread_t *th
 }
 
 void
-rb_thread_start_deferred_wait_thread(bool init)
+rb_thread_start_deferred_wait_thread(void)
 {
 }
 
 void
-rb_thread_stop_deferred_wait_thread(bool destroy)
+rb_thread_stop_deferred_wait_thread(void)
 {
 }
 

vm_core.h

@@ -1956,8 +1956,8 @@ void rb_vm_pop_frame(rb_execution_context_t *ec);
 
 void rb_thread_start_timer_thread(void);
 void rb_thread_stop_timer_thread(void);
-void rb_thread_start_deferred_wait_thread(bool init);
-void rb_thread_stop_deferred_wait_thread(bool destroy);
+void rb_thread_start_deferred_wait_thread(void);
+void rb_thread_stop_deferred_wait_thread(void);
 void rb_thread_reset_timer_thread(void);
 void rb_thread_wakeup_timer_thread(int);