diff options
author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-01 02:13:06 +0000 |
---|---|---|
committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-01 02:13:06 +0000 |
commit | afb02bbe92e55f877d50ed8705c95a41d541458d (patch) | |
tree | 8012de32b7703a09be9d25ecfa1915990f1679a4 /insns.def | |
parent | d3c6187a4d968549b689757bb360e482bd881e07 (diff) | |
download | ruby-afb02bbe92e55f877d50ed8705c95a41d541458d.tar.gz |
* variable.c (rb_class_path_no_cache): add a function to get the class
path without caching the computed path. Some classes are frozen, and
will raise an exception without this.
* probes.d (cmethod-entry, cmethod-return): separate cmethods from
regular methods to match set trace func.
* probes_helper.h: refactor macros. Fix probes to avoid calling
#inspect when profiling.
* insns.def: update for use with new macros.
* vm_eval.c: ditto
* vm_insnhelper.c: ditto
* test/dtrace/test_singleton_function.rb: fix test for new output.
* test/dtrace/test_cmethod.rb: test the cmethod probes.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'insns.def')
-rw-r--r-- | insns.def | 44 |
1 files changed, 18 insertions, 26 deletions
@@ -843,32 +843,24 @@ trace { rb_event_flag_t flag = (rb_event_flag_t)nf; - if (RUBY_DTRACE_METHOD_ENTRY_ENABLED()) { - if (flag == RUBY_EVENT_CALL || flag == RUBY_EVENT_C_CALL) { - VALUE klass; - ID called_id; - - rb_thread_method_id_and_class(th, &called_id, &klass); - - RUBY_DTRACE_METHOD_ENTRY( - RSTRING_PTR(rb_inspect(klass)), - rb_id2name(called_id), - rb_sourcefile(), - rb_sourceline()); - } - } - if (RUBY_DTRACE_METHOD_RETURN_ENABLED()) { - if (flag == RUBY_EVENT_RETURN || flag == RUBY_EVENT_C_RETURN) { - VALUE klass; - ID called_id; - - rb_thread_method_id_and_class(th, &called_id, &klass); - - RUBY_DTRACE_METHOD_RETURN( - RSTRING_PTR(rb_inspect(klass)), - rb_id2name(called_id), - rb_sourcefile(), - rb_sourceline()); + if (RUBY_DTRACE_METHOD_ENTRY_ENABLED() || + RUBY_DTRACE_METHOD_RETURN_ENABLED() || + RUBY_DTRACE_CMETHOD_ENTRY_ENABLED() || + RUBY_DTRACE_CMETHOD_RETURN_ENABLED()) { + + switch(flag) { + case RUBY_EVENT_CALL: + RUBY_DTRACE_METHOD_ENTRY_HOOK(th, 0, 0); + break; + case RUBY_EVENT_C_CALL: + RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, 0, 0); + break; + case RUBY_EVENT_RETURN: + RUBY_DTRACE_METHOD_RETURN_HOOK(th, 0, 0); + break; + case RUBY_EVENT_C_RETURN: + RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, 0, 0); + break; } } |