2 files changed, 29 insertions, 14 deletions
@@ -592,7 +592,7 @@ thread_sched_setup_running_threads(struct rb_thread_sched *sched, rb_ractor_t *c
 }
 if (add_th) {
- if (UNLIKELY(vm->ractor.sched.barrier_waiting)) {
 RUBY_DEBUG_LOG("barrier-wait");
 ractor_sched_barrier_join_signal_locked(vm);
@@ -605,6 +605,7 @@ thread_sched_setup_running_threads(struct rb_thread_sched *sched, rb_ractor_t *c
 ccan_list_add(&vm->ractor.sched.running_threads, &add_th->sched.node.running_threads);
 vm->ractor.sched.running_cnt++;
 sched->is_running = true;
 }
 if (add_timeslice_th) {
@@ -40,6 +40,26 @@ rb_vm_locked_p(void)
 return vm_locked(GET_VM());
 }
 static void
 vm_lock_enter(rb_ractor_t *cr, rb_vm_t *vm, bool locked, bool no_barrier, unsigned int *lev APPEND_LOCATION_ARGS)
 {
@@ -58,23 +78,17 @@ vm_lock_enter(rb_ractor_t *cr, rb_vm_t *vm, bool locked, bool no_barrier, unsign
 VM_ASSERT(vm->ractor.sync.lock_owner == NULL);
 VM_ASSERT(vm->ractor.sync.lock_rec == 0);
-#ifdef RUBY_THREAD_PTHREAD_H
- if (!no_barrier &&
- cr->threads.sched.running != NULL // ractor has running threads.
- ) {
- while (vm->ractor.sched.barrier_waiting) {
 RUBY_DEBUG_LOG("barrier serial:%u", vm->ractor.sched.barrier_serial);
 rb_ractor_sched_barrier_join(vm, cr);
- }
 }
-#else
- if (!no_barrier) {
- while (vm->ractor.sync.barrier_waiting) {
- rb_ractor_sched_barrier_join(vm, cr);
- }
- }
-#endif
 VM_ASSERT(vm->ractor.sync.lock_rec == 0);
 VM_ASSERT(vm->ractor.sync.lock_owner == NULL);