diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-07 08:19:25 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-07 08:19:25 +0000 |
| commit | e5d46e46994ae8b01a493692ef031615e99040b5 (patch) | |
| tree | cd157086e897dfab6ccb0b8a277e5e71655aff6e /vm_insnhelper.c | |
| parent | 8cd3bf0df4caeb5799b171b6f309aba4706923a0 (diff) | |
| download | ruby-e5d46e46994ae8b01a493692ef031615e99040b5.tar.gz | |
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
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index cbd7b83890..7625cdbcac 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1910,7 +1910,7 @@ vm_call_cfunc_with_frame(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp VALUE block_handler = calling->block_handler; int argc = calling->argc; - RUBY_DTRACE_CMETHOD_ENTRY_HOOK(rb_ec_thread_ptr(ec), me->owner, me->def->original_id); + RUBY_DTRACE_CMETHOD_ENTRY_HOOK(ec, me->owner, me->def->original_id); EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_CALL, recv, me->def->original_id, ci->mid, me->owner, Qundef); vm_push_frame(ec, NULL, VM_FRAME_MAGIC_CFUNC | VM_FRAME_FLAG_CFRAME | VM_ENV_FLAG_LOCAL, recv, @@ -1928,7 +1928,7 @@ vm_call_cfunc_with_frame(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp rb_vm_pop_frame(ec); EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, recv, me->def->original_id, ci->mid, me->owner, val); - RUBY_DTRACE_CMETHOD_RETURN_HOOK(rb_ec_thread_ptr(ec), me->owner, me->def->original_id); + RUBY_DTRACE_CMETHOD_RETURN_HOOK(ec, me->owner, me->def->original_id); return val; } @@ -3018,7 +3018,7 @@ vm_check_keyword(lindex_t bits, lindex_t idx, const VALUE *ep) } static void -vm_dtrace(rb_event_flag_t flag, rb_thread_t *th) +vm_dtrace(rb_event_flag_t flag, rb_execution_context_t *ec) { if (RUBY_DTRACE_METHOD_ENTRY_ENABLED() || RUBY_DTRACE_METHOD_RETURN_ENABLED() || @@ -3027,16 +3027,16 @@ vm_dtrace(rb_event_flag_t flag, rb_thread_t *th) switch (flag) { case RUBY_EVENT_CALL: - RUBY_DTRACE_METHOD_ENTRY_HOOK(th, 0, 0); + RUBY_DTRACE_METHOD_ENTRY_HOOK(ec, 0, 0); return; case RUBY_EVENT_C_CALL: - RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, 0, 0); + RUBY_DTRACE_CMETHOD_ENTRY_HOOK(ec, 0, 0); return; case RUBY_EVENT_RETURN: - RUBY_DTRACE_METHOD_RETURN_HOOK(th, 0, 0); + RUBY_DTRACE_METHOD_RETURN_HOOK(ec, 0, 0); return; case RUBY_EVENT_C_RETURN: - RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, 0, 0); + RUBY_DTRACE_CMETHOD_RETURN_HOOK(ec, 0, 0); return; } } |