nobu	2015-10-29 14:32:19 +0900 (Thu, 29 Oct 2015)

  New Revision: 52338

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

  Log:
    vm.c: ruby_th_dtrace_setup
    
    * vm.c (ruby_th_dtrace_setup): extract setup for calling dtrace
      hook from RUBY_DTRACE_HOOK macro.

  Modified files:
    trunk/probes_helper.h
    trunk/vm.c
Index: probes_helper.h
===================================================================
--- probes_helper.h	(revision 52337)
+++ probes_helper.h	(revision 52338)
@@ -4,66 +4,40 @@ https://github.com/ruby/ruby/blob/trunk/probes_helper.h#L4
 #include "ruby/ruby.h"
 #include "probes.h"
 
-VALUE rb_class_path_no_cache(VALUE _klass);
+struct ruby_dtrace_method_hook_args {
+    const char *classname;
+    const char *methodname;
+    const char *filename;
+    int line_no;
+    volatile VALUE klass;
+    volatile VALUE name;
+};
 
-#define RUBY_DTRACE_HOOK(name, th, klazz, id) \
+NOINLINE(int ruby_th_dtrace_setup(rb_thread_t *, VALUE, ID, struct ruby_dtrace_method_hook_args *));
+
+#define RUBY_DTRACE_METHOD_HOOK(name, th, klazz, id) \
 do { \
-    if (RUBY_DTRACE_##name##_ENABLED()) { \
-	VALUE _klass = (klazz); \
-	ID _id = (id); \
-	const char * classname; \
-	const char * methodname; \
-	const char * filename; \
-	if (!_klass) { \
-	    rb_thread_method_id_and_class((th), &_id, &_klass); \
-	} \
-	if (_klass) { \
-	    if (RB_TYPE_P(_klass, T_ICLASS)) { \
-		_klass = RBASIC(_klass)->klass; \
-	    } \
-	    else if (FL_TEST(_klass, FL_SINGLETON)) { \
-		_klass = rb_iv_get(_klass, "__attached__"); \
-	    } \
-	    switch (TYPE(_klass)) { \
-		case T_CLASS: \
-		case T_ICLASS: \
-		case T_MODULE: \
-		{ \
-		    VALUE _name = rb_class_path_no_cache(_klass); \
-		    if (!NIL_P(_name)) { \
-		        classname = StringValuePtr(_name); \
-		    } \
-		    else {			 \
-		        classname = "<unknown>"; \
-		    } \
-		    methodname = rb_id2name(_id); \
-		    filename   = rb_sourcefile(); \
-		    if (classname && methodname && filename) { \
-		        RUBY_DTRACE_##name( \
-				classname, \
-				methodname, \
-				filename, \
-				rb_sourceline()); \
-		    } \
-		    RB_GC_GUARD(_name); \
-		    break; \
-		} \
-	    } \
+    if (UNLIKELY(RUBY_DTRACE_##name##_ENABLED())) { \
+	struct ruby_dtrace_method_hook_args args; \
+	if (ruby_th_dtrace_setup(th, klazz, id, &args)) { \
+	    RUBY_DTRACE_##name(args.classname, \
+			       args.methodname, \
+			       args.filename, \
+			       args.line_no); \
 	} \
-	RB_GC_GUARD(_klass); \
     } \
 } while (0)
 
 #define RUBY_DTRACE_METHOD_ENTRY_HOOK(th, klass, id) \
-    RUBY_DTRACE_HOOK(METHOD_ENTRY, th, klass, id)
+    RUBY_DTRACE_METHOD_HOOK(METHOD_ENTRY, th, klass, id)
 
 #define RUBY_DTRACE_METHOD_RETURN_HOOK(th, klass, id) \
-    RUBY_DTRACE_HOOK(METHOD_RETURN, th, klass, id)
+    RUBY_DTRACE_METHOD_HOOK(METHOD_RETURN, th, klass, id)
 
 #define RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, klass, id) \
-    RUBY_DTRACE_HOOK(CMETHOD_ENTRY, th, klass, id)
+    RUBY_DTRACE_METHOD_HOOK(CMETHOD_ENTRY, th, klass, id)
 
 #define RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, klass, id) \
-    RUBY_DTRACE_HOOK(CMETHOD_RETURN, th, klass, id)
+    RUBY_DTRACE_METHOD_HOOK(CMETHOD_RETURN, th, klass, id)
 
 #endif /* RUBY_PROBES_HELPER_H */
Index: vm.c
===================================================================
--- vm.c	(revision 52337)
+++ vm.c	(revision 52338)
@@ -179,6 +179,46 @@ rb_vm_inc_const_missing_count(void) https://github.com/ruby/ruby/blob/trunk/vm.c#L179
     ruby_vm_const_missing_count +=1;
 }
 
+VALUE rb_class_path_no_cache(VALUE _klass);
+
+int
+ruby_th_dtrace_setup(rb_thread_t *th, VALUE klass, ID id,
+		     struct ruby_dtrace_method_hook_args *args)
+{
+    enum ruby_value_type type;
+    if (!klass) {
+	if (!th) th = GET_THREAD();
+	if (!rb_thread_method_id_and_class(th, &id, &klass) || !klass)
+	    return FALSE;
+    }
+    if (RB_TYPE_P(klass, T_ICLASS)) {
+	klass = RBASIC(klass)->klass;
+    }
+    else if (FL_TEST(klass, FL_SINGLETON)) {
+	klass = rb_attr_get(klass, id__attached__);
+	if (NIL_P(klass)) return FALSE;
+    }
+    type = BUILTIN_TYPE(klass);
+    if (type == T_CLASS || type == T_ICLASS || type == T_MODULE) {
+	VALUE name = rb_class_path_no_cache(klass);
+	const char *classname;
+	const char *methodname = rb_id2name(id);
+	const char *filename = rb_sourcefile();
+	if (methodname && filename) {
+	    if (NIL_P(name) || !(classname = StringValuePtr(name)))
+		classname = "<unknown>";
+	    args->classname = classname;
+	    args->methodname = methodname;
+	    args->filename = filename;
+	    args->line_no = rb_sourceline();
+	    args->klass = klass;
+	    args->name = name;
+	    return TRUE;
+	}
+    }
+    return FALSE;
+}
+
 /*
  *  call-seq:
  *    RubyVM.stat -> Hash

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