_seems_ to fix test flake on FreeBSD?

ruby · May 21, 2023 · 2f306cb · 2f306cb
1 parent 0867588
commit 2f306cb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/thread.c b/thread.c
@@ -4509,7 +4509,6 @@ check_signals_nogvl(rb_thread_t *th, int sigwait_fd)
         else {
             threadptr_trap_interrupt(vm->ractor.main_thread);
         }
-        ret = TRUE; /* for rb_sigwait_sleep */
     }
     return ret;
 }

diff --git a/thread_pthread.c b/thread_pthread.c
@@ -506,7 +506,7 @@ thread_sched_to_running_common(struct rb_thread_sched *sched, rb_thread_t *th)
     RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_RESUMED);
 
     if (!sched->timer) {
-        if (!designate_timer_thread(sched) && !ubf_threads_empty()) {
+        if (!designate_timer_thread(sched) && !ubf_threads_empty() && th != sigwait_th) {
             rb_thread_wakeup_timer_thread(-1);
         }
     }