aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Valentine-House <matt@eightbitraptor.com>2023-03-07 18:41:04 +0000
committerMatt Valentine-House <matt@eightbitraptor.com>2023-03-15 21:26:26 +0000
commit60b8c7d9fd2e2cb82dae7189a66335b3bec9005f (patch)
treeb582f3036e3e0f0bae68ff857b42837b5bac21a1
parent5791aa6263f730e3b2c8d4a4fb7a054539cf6135 (diff)
downloadruby-60b8c7d9fd2e2cb82dae7189a66335b3bec9005f.tar.gz
Rename RB_GC_SAVE_MACHINE_CONTEXT -> RB_VM_SAVE_MACHINE_CONTEXT
-rw-r--r--thread.c6
-rw-r--r--thread_pthread.c2
-rw-r--r--vm_core.h2
-rw-r--r--vm_sync.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/thread.c b/thread.c
index d4348e8df2..4ea9716139 100644
--- a/thread.c
+++ b/thread.c
@@ -173,7 +173,7 @@ static inline void blocking_region_end(rb_thread_t *th, struct rb_blocking_regio
#define THREAD_BLOCKING_BEGIN(th) do { \
struct rb_thread_sched * const sched = TH_SCHED(th); \
- RB_GC_SAVE_MACHINE_CONTEXT(th); \
+ RB_VM_SAVE_MACHINE_CONTEXT(th); \
thread_sched_to_waiting(sched);
#define THREAD_BLOCKING_END(th) \
@@ -1439,7 +1439,7 @@ rb_thread_schedule_limits(uint32_t limits_us)
if (th->running_time_us >= limits_us) {
RUBY_DEBUG_LOG("switch %s", "start");
- RB_GC_SAVE_MACHINE_CONTEXT(th);
+ RB_VM_SAVE_MACHINE_CONTEXT(th);
thread_sched_yield(TH_SCHED(th), th);
rb_ractor_thread_switch(th->ractor, th);
@@ -1474,7 +1474,7 @@ blocking_region_begin(rb_thread_t *th, struct rb_blocking_region_buffer *region,
RUBY_DEBUG_LOG("");
- RB_GC_SAVE_MACHINE_CONTEXT(th);
+ RB_VM_SAVE_MACHINE_CONTEXT(th);
thread_sched_to_waiting(TH_SCHED(th));
return TRUE;
}
diff --git a/thread_pthread.c b/thread_pthread.c
index c523509b9f..09d8148375 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -2282,7 +2282,7 @@ ubf_ppoll_sleep(void *ignore)
#define THREAD_BLOCKING_YIELD(th) do { \
const rb_thread_t *next; \
struct rb_thread_sched *sched = TH_SCHED(th); \
- RB_GC_SAVE_MACHINE_CONTEXT(th); \
+ RB_VM_SAVE_MACHINE_CONTEXT(th); \
rb_native_mutex_lock(&sched->lock); \
next = thread_sched_to_waiting_common(sched); \
rb_native_mutex_unlock(&sched->lock); \
diff --git a/vm_core.h b/vm_core.h
index e44a3936af..2ec52fa1b0 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -1819,7 +1819,7 @@ RUBY_EXTERN unsigned int ruby_vm_event_local_num;
#define GET_THREAD() rb_current_thread()
#define GET_EC() rb_current_execution_context(true)
-#define RB_GC_SAVE_MACHINE_CONTEXT(th) \
+#define RB_VM_SAVE_MACHINE_CONTEXT(th) \
do { \
FLUSH_REGISTER_WINDOWS; \
setjmp((th)->ec->machine.regs); \
diff --git a/vm_sync.c b/vm_sync.c
index 074efc76cc..41eab1b9e6 100644
--- a/vm_sync.c
+++ b/vm_sync.c
@@ -64,7 +64,7 @@ vm_lock_enter(rb_ractor_t *cr, rb_vm_t *vm, bool locked, bool no_barrier, unsign
rb_thread_t *th = GET_THREAD();
bool running;
- RB_GC_SAVE_MACHINE_CONTEXT(th);
+ RB_VM_SAVE_MACHINE_CONTEXT(th);
if (rb_ractor_status_p(cr, ractor_running)) {
rb_vm_ractor_blocking_cnt_inc(vm, cr, __FILE__, __LINE__);