summaryrefslogtreecommitdiff
path: root/vm_core.h
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-11-07 06:01:16 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-11-07 06:01:16 +0000
commit2d71889b6b48f55780e2d97e4a159469427c94da (patch)
treed7f3a74257d919647270cd426b9f5fe3c0217aa0 /vm_core.h
parent7285177c9700c7176c767047f1f788997623cbd0 (diff)
fix prefix `ruby_...()` to `rb_...()`.
* vm_core.h: fix prefix `ruby_` to `rb_` for the following functions. * ruby_current_execution_context * ruby_current_thread * ruby_current_vm * ruby_vm_check_ints * ruby_exec_event_hook_orig git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_core.h')
-rw-r--r--vm_core.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/vm_core.h b/vm_core.h
index fc0d611e29..202cb24137 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -1590,9 +1590,9 @@ extern rb_event_flag_t ruby_vm_event_flags;
RUBY_SYMBOL_EXPORT_END
-#define GET_VM() ruby_current_vm()
-#define GET_THREAD() ruby_current_thread()
-#define GET_EC() ruby_current_execution_context()
+#define GET_VM() rb_current_vm()
+#define GET_THREAD() rb_current_thread()
+#define GET_EC() rb_current_execution_context()
static inline rb_thread_t *
rb_ec_thread_ptr(const rb_execution_context_t *ec)
@@ -1613,20 +1613,20 @@ rb_ec_vm_ptr(const rb_execution_context_t *ec)
}
static inline rb_execution_context_t *
-ruby_current_execution_context(void)
+rb_current_execution_context(void)
{
return ruby_current_execution_context_ptr;
}
static inline rb_thread_t *
-ruby_current_thread(void)
+rb_current_thread(void)
{
const rb_execution_context_t *ec = GET_EC();
return rb_ec_thread_ptr(ec);
}
static inline rb_vm_t *
-ruby_current_vm(void)
+rb_current_vm(void)
{
VM_ASSERT(ruby_current_vm_ptr == NULL ||
ruby_current_execution_context_ptr == NULL ||
@@ -1680,11 +1680,11 @@ void rb_execution_context_mark(const rb_execution_context_t *ec);
void rb_fiber_close(rb_fiber_t *fib);
void Init_native_thread(rb_thread_t *th);
-#define RUBY_VM_CHECK_INTS(ec) ruby_vm_check_ints(ec)
+#define RUBY_VM_CHECK_INTS(ec) rb_vm_check_ints(ec)
static inline void
-ruby_vm_check_ints(rb_execution_context_t *ec)
+rb_vm_check_ints(rb_execution_context_t *ec)
{
- VM_ASSERT(ec == ruby_current_execution_context_ptr);
+ VM_ASSERT(ec == GET_EC());
if (UNLIKELY(RUBY_VM_INTERRUPTED_ANY(ec))) {
rb_threadptr_execute_interrupts(rb_ec_thread_ptr(ec), 0);
}
@@ -1714,13 +1714,13 @@ void rb_exec_event_hooks(struct rb_trace_arg_struct *trace_arg, int pop_p);
const rb_event_flag_t flag_arg_ = (flag_); \
if (UNLIKELY(ruby_vm_event_flags & (flag_arg_))) { \
/* defer evaluating the other arguments */ \
- ruby_exec_event_hook_orig(ec_, flag_arg_, self_, id_, called_id_, klass_, data_, pop_p_); \
+ rb_exec_event_hook_orig(ec_, flag_arg_, self_, id_, called_id_, klass_, data_, pop_p_); \
} \
} while (0)
static inline void
-ruby_exec_event_hook_orig(rb_execution_context_t *ec, const rb_event_flag_t flag,
- VALUE self, ID id, ID called_id, VALUE klass, VALUE data, int pop_p)
+rb_exec_event_hook_orig(rb_execution_context_t *ec, const rb_event_flag_t flag,
+ VALUE self, ID id, ID called_id, VALUE klass, VALUE data, int pop_p)
{
const rb_thread_t *th = rb_ec_thread_ptr(ec);