From 0c2746a7bbb02f8417b892408371dba5c4cff222 Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 7 Nov 2017 08:19:25 +0000 Subject: th->ec: dtrace * vm.c (ruby_th_dtrace_setup): rename to rb_dtrace_setup() and accept `ec`. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60696 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- probes_helper.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'probes_helper.h') diff --git a/probes_helper.h b/probes_helper.h index 1becae5a8d..1393436b29 100644 --- a/probes_helper.h +++ b/probes_helper.h @@ -13,13 +13,13 @@ struct ruby_dtrace_method_hook_args { volatile VALUE name; }; -NOINLINE(int ruby_th_dtrace_setup(rb_thread_t *, VALUE, ID, struct ruby_dtrace_method_hook_args *)); +NOINLINE(int rb_dtrace_setup(rb_execution_context_t *, VALUE, ID, struct ruby_dtrace_method_hook_args *)); -#define RUBY_DTRACE_METHOD_HOOK(name, th, klazz, id) \ +#define RUBY_DTRACE_METHOD_HOOK(name, ec, klazz, id) \ do { \ if (UNLIKELY(RUBY_DTRACE_##name##_ENABLED())) { \ struct ruby_dtrace_method_hook_args args; \ - if (ruby_th_dtrace_setup(th, klazz, id, &args)) { \ + if (rb_dtrace_setup(ec, klazz, id, &args)) { \ RUBY_DTRACE_##name(args.classname, \ args.methodname, \ args.filename, \ @@ -28,16 +28,16 @@ do { \ } \ } while (0) -#define RUBY_DTRACE_METHOD_ENTRY_HOOK(th, klass, id) \ - RUBY_DTRACE_METHOD_HOOK(METHOD_ENTRY, th, klass, id) +#define RUBY_DTRACE_METHOD_ENTRY_HOOK(ec, klass, id) \ + RUBY_DTRACE_METHOD_HOOK(METHOD_ENTRY, ec, klass, id) -#define RUBY_DTRACE_METHOD_RETURN_HOOK(th, klass, id) \ - RUBY_DTRACE_METHOD_HOOK(METHOD_RETURN, th, klass, id) +#define RUBY_DTRACE_METHOD_RETURN_HOOK(ec, klass, id) \ + RUBY_DTRACE_METHOD_HOOK(METHOD_RETURN, ec, klass, id) -#define RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, klass, id) \ - RUBY_DTRACE_METHOD_HOOK(CMETHOD_ENTRY, th, klass, id) +#define RUBY_DTRACE_CMETHOD_ENTRY_HOOK(ec, klass, id) \ + RUBY_DTRACE_METHOD_HOOK(CMETHOD_ENTRY, ec, klass, id) -#define RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, klass, id) \ - RUBY_DTRACE_METHOD_HOOK(CMETHOD_RETURN, th, klass, id) +#define RUBY_DTRACE_CMETHOD_RETURN_HOOK(ec, klass, id) \ + RUBY_DTRACE_METHOD_HOOK(CMETHOD_RETURN, ec, klass, id) #endif /* RUBY_PROBES_HELPER_H */ -- cgit v1.2.1