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

th->ec: dtrace

Browse Source 
* 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
This commit is contained in:
ko1 2017-11-07 08:19:25 +00:00
parent 8dbaf1bbdd
commit 0c2746a7bb
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
insns.def
View File

@ -789,7 +789,7 @@ trace
{ {
rb_event_flag_t flag = (rb_event_flag_t)nf; rb_event_flag_t flag = (rb_event_flag_t)nf;
vm_dtrace(flag, rb_ec_thread_ptr(ec)); vm_dtrace(flag, ec);
EXEC_EVENT_HOOK(ec, flag, GET_SELF(), 0, 0, 0 /* id and klass are resolved at callee */, EXEC_EVENT_HOOK(ec, flag, GET_SELF(), 0, 0, 0 /* id and klass are resolved at callee */,
(flag & (RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN)) ? TOPN(0) : Qundef); (flag & (RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN)) ? TOPN(0) : Qundef);
} }
@ -807,7 +807,7 @@ trace2
{ {
rb_event_flag_t flag = (rb_event_flag_t)nf; rb_event_flag_t flag = (rb_event_flag_t)nf;
vm_dtrace(flag, rb_ec_thread_ptr(ec)); vm_dtrace(flag, ec);
EXEC_EVENT_HOOK(ec, flag, GET_SELF(), 0, 0, 0 /* id and klass are resolved at callee */, data); EXEC_EVENT_HOOK(ec, flag, GET_SELF(), 0, 0, 0 /* id and klass are resolved at callee */, data);
} }

22
probes_helper.h
View File

@ -13,13 +13,13 @@ struct ruby_dtrace_method_hook_args {
volatile VALUE name; 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 { \ do { \
if (UNLIKELY(RUBY_DTRACE_##name##_ENABLED())) { \ if (UNLIKELY(RUBY_DTRACE_##name##_ENABLED())) { \
struct ruby_dtrace_method_hook_args args; \ 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, \ RUBY_DTRACE_##name(args.classname, \
args.methodname, \ args.methodname, \
args.filename, \ args.filename, \
@ -28,16 +28,16 @@ do { \
} \ } \
} while (0) } while (0)
#define RUBY_DTRACE_METHOD_ENTRY_HOOK(th, klass, id) \ #define RUBY_DTRACE_METHOD_ENTRY_HOOK(ec, klass, id) \
RUBY_DTRACE_METHOD_HOOK(METHOD_ENTRY, th, klass, id) RUBY_DTRACE_METHOD_HOOK(METHOD_ENTRY, ec, klass, id)
#define RUBY_DTRACE_METHOD_RETURN_HOOK(th, klass, id) \ #define RUBY_DTRACE_METHOD_RETURN_HOOK(ec, klass, id) \
RUBY_DTRACE_METHOD_HOOK(METHOD_RETURN, th, klass, id) RUBY_DTRACE_METHOD_HOOK(METHOD_RETURN, ec, klass, id)
#define RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, klass, id) \ #define RUBY_DTRACE_CMETHOD_ENTRY_HOOK(ec, klass, id) \
RUBY_DTRACE_METHOD_HOOK(CMETHOD_ENTRY, th, klass, id) RUBY_DTRACE_METHOD_HOOK(CMETHOD_ENTRY, ec, klass, id)
#define RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, klass, id) \ #define RUBY_DTRACE_CMETHOD_RETURN_HOOK(ec, klass, id) \
RUBY_DTRACE_METHOD_HOOK(CMETHOD_RETURN, th, klass, id) RUBY_DTRACE_METHOD_HOOK(CMETHOD_RETURN, ec, klass, id)
#endif /* RUBY_PROBES_HELPER_H */ #endif /* RUBY_PROBES_HELPER_H */

18
vm.c
View File

@ -335,13 +335,13 @@ rb_vm_inc_const_missing_count(void)
VALUE rb_class_path_no_cache(VALUE _klass); VALUE rb_class_path_no_cache(VALUE _klass);
int int
ruby_th_dtrace_setup(rb_thread_t *th, VALUE klass, ID id, rb_dtrace_setup(rb_execution_context_t *ec, VALUE klass, ID id,
struct ruby_dtrace_method_hook_args *args) struct ruby_dtrace_method_hook_args *args)
{ {
enum ruby_value_type type; enum ruby_value_type type;
if (!klass) { if (!klass) {
if (!th) th = GET_THREAD(); if (!ec) ec = GET_EC();
if (!rb_ec_frame_method_id_and_class(th->ec, &id, 0, &klass) || !klass) if (!rb_ec_frame_method_id_and_class(ec, &id, 0, &klass) || !klass)
return FALSE; return FALSE;
} }
if (RB_TYPE_P(klass, T_ICLASS)) { if (RB_TYPE_P(klass, T_ICLASS)) {
@ -537,7 +537,7 @@ rb_vm_pop_cfunc_frame(void)
const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(cfp); const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(cfp);
EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, cfp->self, me->def->original_id, me->called_id, me->owner, Qnil); EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, cfp->self, me->def->original_id, me->called_id, me->owner, Qnil);
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);
vm_pop_frame(ec, cfp, cfp->ep); vm_pop_frame(ec, cfp, cfp->ep);
} }
@ -999,12 +999,12 @@ invoke_bmethod(rb_execution_context_t *ec, const rb_iseq_t *iseq, VALUE self, co
iseq->body->local_table_size - arg_size, iseq->body->local_table_size - arg_size,
iseq->body->stack_max); iseq->body->stack_max);
RUBY_DTRACE_METHOD_ENTRY_HOOK(rb_ec_thread_ptr(ec), me->owner, me->def->original_id); RUBY_DTRACE_METHOD_ENTRY_HOOK(ec, me->owner, me->def->original_id);
EXEC_EVENT_HOOK(ec, RUBY_EVENT_CALL, self, me->def->original_id, me->called_id, me->owner, Qnil); EXEC_EVENT_HOOK(ec, RUBY_EVENT_CALL, self, me->def->original_id, me->called_id, me->owner, Qnil);
VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_FINISH); VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_FINISH);
ret = vm_exec(ec); ret = vm_exec(ec);
EXEC_EVENT_HOOK(ec, RUBY_EVENT_RETURN, self, me->def->original_id, me->called_id, me->owner, ret); EXEC_EVENT_HOOK(ec, RUBY_EVENT_RETURN, self, me->def->original_id, me->called_id, me->owner, ret);
RUBY_DTRACE_METHOD_RETURN_HOOK(rb_ec_thread_ptr(ec), me->owner, me->def->original_id); RUBY_DTRACE_METHOD_RETURN_HOOK(ec, me->owner, me->def->original_id);
return ret; return ret;
} }
@ -1672,7 +1672,7 @@ hook_before_rewind(rb_execution_context_t *ec, const rb_control_frame_t *cfp, in
} }
switch (VM_FRAME_TYPE(ec->cfp)) { switch (VM_FRAME_TYPE(ec->cfp)) {
case VM_FRAME_MAGIC_METHOD: case VM_FRAME_MAGIC_METHOD:
RUBY_DTRACE_METHOD_RETURN_HOOK(rb_ec_thread_ptr(ec), 0, 0); RUBY_DTRACE_METHOD_RETURN_HOOK(ec, 0, 0);
EXEC_EVENT_HOOK_AND_POP_FRAME(ec, RUBY_EVENT_RETURN, ec->cfp->self, 0, 0, 0, frame_return_value(err)); EXEC_EVENT_HOOK_AND_POP_FRAME(ec, RUBY_EVENT_RETURN, ec->cfp->self, 0, 0, 0, frame_return_value(err));
THROW_DATA_CONSUMED_SET(err); THROW_DATA_CONSUMED_SET(err);
break; break;
@ -1825,7 +1825,7 @@ vm_exec(rb_execution_context_t *ec)
rb_vm_frame_method_entry(ec->cfp)->def->original_id, rb_vm_frame_method_entry(ec->cfp)->def->original_id,
rb_vm_frame_method_entry(ec->cfp)->called_id, rb_vm_frame_method_entry(ec->cfp)->called_id,
rb_vm_frame_method_entry(ec->cfp)->owner, Qnil); rb_vm_frame_method_entry(ec->cfp)->owner, Qnil);
RUBY_DTRACE_CMETHOD_RETURN_HOOK(rb_ec_thread_ptr(ec), RUBY_DTRACE_CMETHOD_RETURN_HOOK(ec,
rb_vm_frame_method_entry(ec->cfp)->owner, rb_vm_frame_method_entry(ec->cfp)->owner,
rb_vm_frame_method_entry(ec->cfp)->def->original_id); rb_vm_frame_method_entry(ec->cfp)->def->original_id);
} }

4
vm_eval.c
View File

@ -70,7 +70,7 @@ vm_call0_cfunc_with_frame(rb_execution_context_t* ec, struct rb_calling_info *ca
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(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, mid, me->owner, Qnil); EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_CALL, recv, me->def->original_id, mid, me->owner, Qnil);
{ {
rb_control_frame_t *reg_cfp = ec->cfp; rb_control_frame_t *reg_cfp = ec->cfp;
@ -89,7 +89,7 @@ vm_call0_cfunc_with_frame(rb_execution_context_t* ec, struct rb_calling_info *ca
rb_vm_pop_frame(ec); rb_vm_pop_frame(ec);
} }
EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, recv, me->def->original_id, mid, me->owner, val); EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, recv, me->def->original_id, 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; return val;
} }

14
vm_insnhelper.c
View File

@ -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; VALUE block_handler = calling->block_handler;
int argc = calling->argc; 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); 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, 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); rb_vm_pop_frame(ec);
EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, recv, me->def->original_id, ci->mid, me->owner, val); 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; return val;
} }
@ -3018,7 +3018,7 @@ vm_check_keyword(lindex_t bits, lindex_t idx, const VALUE *ep)
} }
static void 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() || if (RUBY_DTRACE_METHOD_ENTRY_ENABLED() ||
RUBY_DTRACE_METHOD_RETURN_ENABLED() || RUBY_DTRACE_METHOD_RETURN_ENABLED() ||
@ -3027,16 +3027,16 @@ vm_dtrace(rb_event_flag_t flag, rb_thread_t *th)
switch (flag) { switch (flag) {
case RUBY_EVENT_CALL: case RUBY_EVENT_CALL:
RUBY_DTRACE_METHOD_ENTRY_HOOK(th, 0, 0); RUBY_DTRACE_METHOD_ENTRY_HOOK(ec, 0, 0);
return; return;
case RUBY_EVENT_C_CALL: case RUBY_EVENT_C_CALL:
RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, 0, 0); RUBY_DTRACE_CMETHOD_ENTRY_HOOK(ec, 0, 0);
return; return;
case RUBY_EVENT_RETURN: case RUBY_EVENT_RETURN:
RUBY_DTRACE_METHOD_RETURN_HOOK(th, 0, 0); RUBY_DTRACE_METHOD_RETURN_HOOK(ec, 0, 0);
return; return;
case RUBY_EVENT_C_RETURN: case RUBY_EVENT_C_RETURN:
RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, 0, 0); RUBY_DTRACE_CMETHOD_RETURN_HOOK(ec, 0, 0);
return; return;
} }
} }