1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* vm_eval.c (vm_call0_cfunc_with_frame): pass method id to

Browse Source 
dtrace hook. follow up r56592.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56605 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ktsj 2016-11-05 15:30:55 +00:00
parent 7d27c0a2d8
commit 3f2f64dbeb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> Sun Nov 6 00:06:38 2016 Tanaka Akira <akr@fsij.org>
* lib/resolv.rb (Resolv::LOC::Coord.create): fixed. * lib/resolv.rb (Resolv::LOC::Coord.create): fixed.

4
vm_eval.c
View File

@ -116,7 +116,7 @@ vm_call0_cfunc_with_frame(rb_thread_t* th, struct rb_calling_info *calling, cons
ID mid = ci->mid; ID mid = ci->mid;
VALUE block_handler = calling->block_handler; 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); 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; 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); rb_vm_pop_frame(th);
} }
EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, recv, me->def->original_id, mid, me->owner, val); 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; return val;
} }