summaryrefslogtreecommitdiff
path: root/vm_sync.c
diff options
context:
space:
mode:
Diffstat (limited to 'vm_sync.c')
-rw-r--r--vm_sync.c125
1 files changed, 31 insertions, 94 deletions
diff --git a/vm_sync.c b/vm_sync.c
index 610bdb7b10..4bef232f20 100644
--- a/vm_sync.c
+++ b/vm_sync.c
@@ -1,10 +1,12 @@
+#include "internal/gc.h"
+#include "internal/thread.h"
#include "vm_core.h"
#include "vm_sync.h"
#include "ractor_core.h"
#include "vm_debug.h"
-#include "gc.h"
-static bool vm_barrier_finish_p(rb_vm_t *vm);
+void rb_ractor_sched_barrier_start(rb_vm_t *vm, rb_ractor_t *cr);
+void rb_ractor_sched_barrier_join(rb_vm_t *vm, rb_ractor_t *cr);
static bool
vm_locked(rb_vm_t *vm)
@@ -51,68 +53,47 @@ vm_lock_enter(rb_ractor_t *cr, rb_vm_t *vm, bool locked, bool no_barrier, unsign
// locking ractor and acquire VM lock will cause deadlock
VM_ASSERT(cr->sync.locked_by != rb_ractor_self(cr));
#endif
-
// lock
rb_native_mutex_lock(&vm->ractor.sync.lock);
VM_ASSERT(vm->ractor.sync.lock_owner == NULL);
- vm->ractor.sync.lock_owner = cr;
+ 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) {
- // barrier
while (vm->ractor.sync.barrier_waiting) {
- unsigned int barrier_cnt = vm->ractor.sync.barrier_cnt;
- rb_thread_t *th = GET_THREAD();
- bool running;
-
- RB_GC_SAVE_MACHINE_CONTEXT(th);
-
- if (rb_ractor_status_p(cr, ractor_running)) {
- rb_vm_ractor_blocking_cnt_inc(vm, cr, __FILE__, __LINE__);
- running = true;
- }
- else {
- running = false;
- }
- VM_ASSERT(rb_ractor_status_p(cr, ractor_blocking));
-
- if (vm_barrier_finish_p(vm)) {
- RUBY_DEBUG_LOG("wakeup barrier owner");
- rb_native_cond_signal(&vm->ractor.sync.barrier_cond);
- }
- else {
- RUBY_DEBUG_LOG("wait for barrier finish");
- }
-
- // wait for restart
- while (barrier_cnt == vm->ractor.sync.barrier_cnt) {
- vm->ractor.sync.lock_owner = NULL;
- rb_native_cond_wait(&cr->barrier_wait_cond, &vm->ractor.sync.lock);
- VM_ASSERT(vm->ractor.sync.lock_owner == NULL);
- vm->ractor.sync.lock_owner = cr;
- }
-
- RUBY_DEBUG_LOG("barrier is released. Acquire vm_lock");
-
- if (running) {
- rb_vm_ractor_blocking_cnt_dec(vm, cr, __FILE__, __LINE__);
- }
+ rb_ractor_sched_barrier_join(vm, cr);
}
}
+#endif
VM_ASSERT(vm->ractor.sync.lock_rec == 0);
- VM_ASSERT(vm->ractor.sync.lock_owner == cr);
+ VM_ASSERT(vm->ractor.sync.lock_owner == NULL);
+ vm->ractor.sync.lock_owner = cr;
}
vm->ractor.sync.lock_rec++;
*lev = vm->ractor.sync.lock_rec;
- RUBY_DEBUG_LOG2(file, line, "rec:%u owner:%d", vm->ractor.sync.lock_rec, rb_ractor_id(vm->ractor.sync.lock_owner));
+ RUBY_DEBUG_LOG2(file, line, "rec:%u owner:%u", vm->ractor.sync.lock_rec,
+ (unsigned int)rb_ractor_id(vm->ractor.sync.lock_owner));
}
static void
vm_lock_leave(rb_vm_t *vm, unsigned int *lev APPEND_LOCATION_ARGS)
{
- RUBY_DEBUG_LOG2(file, line, "rec:%u owner:%d", vm->ractor.sync.lock_rec, rb_ractor_id(vm->ractor.sync.lock_owner));
+ RUBY_DEBUG_LOG2(file, line, "rec:%u owner:%u%s", vm->ractor.sync.lock_rec,
+ (unsigned int)rb_ractor_id(vm->ractor.sync.lock_owner),
+ vm->ractor.sync.lock_rec == 1 ? " (leave)" : "");
ASSERT_vm_locking();
VM_ASSERT(vm->ractor.sync.lock_rec > 0);
@@ -127,7 +108,7 @@ vm_lock_leave(rb_vm_t *vm, unsigned int *lev APPEND_LOCATION_ARGS)
}
}
-MJIT_FUNC_EXPORTED void
+void
rb_vm_lock_enter_body(unsigned int *lev APPEND_LOCATION_ARGS)
{
rb_vm_t *vm = GET_VM();
@@ -139,7 +120,7 @@ rb_vm_lock_enter_body(unsigned int *lev APPEND_LOCATION_ARGS)
}
}
-MJIT_FUNC_EXPORTED void
+void
rb_vm_lock_enter_body_nb(unsigned int *lev APPEND_LOCATION_ARGS)
{
rb_vm_t *vm = GET_VM();
@@ -151,14 +132,14 @@ rb_vm_lock_enter_body_nb(unsigned int *lev APPEND_LOCATION_ARGS)
}
}
-MJIT_FUNC_EXPORTED void
+void
rb_vm_lock_enter_body_cr(rb_ractor_t *cr, unsigned int *lev APPEND_LOCATION_ARGS)
{
rb_vm_t *vm = GET_VM();
vm_lock_enter(cr, vm, vm_locked(vm), false, lev APPEND_LOCATION_PARAMS);
}
-MJIT_FUNC_EXPORTED void
+void
rb_vm_lock_leave_body(unsigned int *lev APPEND_LOCATION_ARGS)
{
vm_lock_leave(GET_VM(), lev APPEND_LOCATION_PARAMS);
@@ -213,18 +194,6 @@ rb_vm_cond_timedwait(rb_vm_t *vm, rb_nativethread_cond_t *cond, unsigned long ms
vm_cond_wait(vm, cond, msec);
}
-static bool
-vm_barrier_finish_p(rb_vm_t *vm)
-{
- RUBY_DEBUG_LOG("cnt:%u living:%u blocking:%u",
- vm->ractor.sync.barrier_cnt,
- vm->ractor.cnt,
- vm->ractor.blocking_cnt);
-
- VM_ASSERT(vm->ractor.blocking_cnt <= vm->ractor.cnt);
- return vm->ractor.blocking_cnt == vm->ractor.cnt;
-}
-
void
rb_vm_barrier(void)
{
@@ -236,45 +205,13 @@ rb_vm_barrier(void)
}
else {
rb_vm_t *vm = GET_VM();
- VM_ASSERT(vm->ractor.sync.barrier_waiting == false);
+ VM_ASSERT(!vm->ractor.sched.barrier_waiting);
ASSERT_vm_locking();
-
rb_ractor_t *cr = vm->ractor.sync.lock_owner;
VM_ASSERT(cr == GET_RACTOR());
VM_ASSERT(rb_ractor_status_p(cr, ractor_running));
- vm->ractor.sync.barrier_waiting = true;
-
- RUBY_DEBUG_LOG("barrier start. cnt:%u living:%u blocking:%u",
- vm->ractor.sync.barrier_cnt,
- vm->ractor.cnt,
- vm->ractor.blocking_cnt);
-
- rb_vm_ractor_blocking_cnt_inc(vm, cr, __FILE__, __LINE__);
-
- // send signal
- rb_ractor_t *r = 0;
- ccan_list_for_each(&vm->ractor.set, r, vmlr_node) {
- if (r != cr) {
- rb_ractor_vm_barrier_interrupt_running_thread(r);
- }
- }
-
- // wait
- while (!vm_barrier_finish_p(vm)) {
- rb_vm_cond_wait(vm, &vm->ractor.sync.barrier_cond);
- }
-
- RUBY_DEBUG_LOG("cnt:%u barrier success", vm->ractor.sync.barrier_cnt);
-
- rb_vm_ractor_blocking_cnt_dec(vm, cr, __FILE__, __LINE__);
-
- vm->ractor.sync.barrier_waiting = false;
- vm->ractor.sync.barrier_cnt++;
-
- ccan_list_for_each(&vm->ractor.set, r, vmlr_node) {
- rb_native_cond_signal(&r->barrier_wait_cond);
- }
+ rb_ractor_sched_barrier_start(vm, cr);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 09:36:49 +0000