[前][次][番号順一覧][スレッド一覧]

ruby-changes:48576

From: ko1 <ko1@a...>
Date: Tue, 7 Nov 2017 15:01:19 +0900 (JST)
Subject: [ruby-changes:48576] ko1:r60691 (trunk): fix prefix `ruby_...()` to `rb_...()`.

ko1	2017-11-07 15:01:16 +0900 (Tue, 07 Nov 2017)

  New Revision: 60691

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60691

  Log:
    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

  Modified files:
    trunk/vm_core.h
Index: vm_core.h
===================================================================
--- vm_core.h	(revision 60690)
+++ vm_core.h	(revision 60691)
@@ -1590,9 +1590,9 @@ extern rb_event_flag_t ruby_vm_event_fla https://github.com/ruby/ruby/blob/trunk/vm_core.h#L1590
 
 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_ https://github.com/ruby/ruby/blob/trunk/vm_core.h#L1613
 }
 
 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_ https://github.com/ruby/ruby/blob/trunk/vm_core.h#L1680
 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 https://github.com/ruby/ruby/blob/trunk/vm_core.h#L1714
     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);
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]