diff options
author | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-05 15:30:55 +0000 |
---|---|---|
committer | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-05 15:30:55 +0000 |
commit | 403d132b3c7bbcc5e58fe01aa92115c3a03ba34f (patch) | |
tree | 09b9e19e4a83b444b02acd122f9e55d8e90a6911 | |
parent | eb2074baded8c9aaf13c2a1669a45341741cc10f (diff) | |
download | ruby-403d132b3c7bbcc5e58fe01aa92115c3a03ba34f.tar.gz |
* vm_eval.c (vm_call0_cfunc_with_frame): pass method id to
dtrace hook. follow up r56592.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56605 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | vm_eval.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Nov 6 00:22:51 2016 Kazuki Tsujimoto <kazuki@callcc.net> + + * vm_eval.c (vm_call0_cfunc_with_frame): pass method id to + dtrace hook. follow up r56592. + Sun Nov 6 00:06:38 2016 Tanaka Akira <akr@fsij.org> * lib/resolv.rb (Resolv::LOC::Coord.create): fixed. @@ -116,7 +116,7 @@ vm_call0_cfunc_with_frame(rb_thread_t* th, struct rb_calling_info *calling, cons ID mid = ci->mid; VALUE block_handler = calling->block_handler; - RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, me->owner, mid); + RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, me->owner, me->def->original_id); EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, me->def->original_id, mid, me->owner, Qnil); { rb_control_frame_t *reg_cfp = th->cfp; @@ -137,7 +137,7 @@ vm_call0_cfunc_with_frame(rb_thread_t* th, struct rb_calling_info *calling, cons rb_vm_pop_frame(th); } EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, recv, me->def->original_id, mid, me->owner, val); - RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, me->owner, mid); + RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, me->owner, me->def->original_id); return val; } |