diff options
Diffstat (limited to 'load.c')
-rw-r--r-- | load.c | 36 |
1 files changed, 6 insertions, 30 deletions
@@ -698,11 +698,7 @@ rb_f_load(int argc, VALUE *argv) rb_scan_args(argc, argv, "11", &fname, &wrap); - if (RUBY_DTRACE_LOAD_ENTRY_ENABLED()) { - RUBY_DTRACE_LOAD_ENTRY(StringValuePtr(fname), - rb_sourcefile(), - rb_sourceline()); - } + RUBY_DTRACE_HOOK(LOAD_ENTRY, StringValuePtr(fname)); orig_fname = FilePathValue(fname); fname = rb_str_encode_ospath(orig_fname); @@ -714,11 +710,7 @@ rb_f_load(int argc, VALUE *argv) } rb_load_internal(path, RTEST(wrap)); - if (RUBY_DTRACE_LOAD_RETURN_ENABLED()) { - RUBY_DTRACE_LOAD_RETURN(StringValuePtr(fname), - rb_sourcefile(), - rb_sourceline()); - } + RUBY_DTRACE_HOOK(LOAD_RETURN, StringValuePtr(fname)); return Qtrue; } @@ -967,11 +959,7 @@ rb_require_internal(VALUE fname, int safe) } volatile saved; char *volatile ftptr = 0; - if (RUBY_DTRACE_REQUIRE_ENTRY_ENABLED()) { - RUBY_DTRACE_REQUIRE_ENTRY(StringValuePtr(fname), - rb_sourcefile(), - rb_sourceline()); - } + RUBY_DTRACE_HOOK(REQUIRE_ENTRY, StringValuePtr(fname)); TH_PUSH_TAG(th); saved.safe = rb_safe_level(); @@ -984,20 +972,12 @@ rb_require_internal(VALUE fname, int safe) FilePathValue(fname); rb_set_safe_level_force(0); - if (RUBY_DTRACE_FIND_REQUIRE_ENTRY_ENABLED()) { - RUBY_DTRACE_FIND_REQUIRE_ENTRY(StringValuePtr(fname), - rb_sourcefile(), - rb_sourceline()); - } + RUBY_DTRACE_HOOK(FIND_REQUIRE_ENTRY, StringValuePtr(fname)); path = rb_str_encode_ospath(fname); found = search_required(path, &path, safe); - if (RUBY_DTRACE_FIND_REQUIRE_RETURN_ENABLED()) { - RUBY_DTRACE_FIND_REQUIRE_RETURN(StringValuePtr(fname), - rb_sourcefile(), - rb_sourceline()); - } + RUBY_DTRACE_HOOK(FIND_REQUIRE_RETURN, StringValuePtr(fname)); if (found) { if (!path || !(ftptr = load_lock(RSTRING_PTR(path)))) { result = 0; @@ -1036,11 +1016,7 @@ rb_require_internal(VALUE fname, int safe) th->errinfo = errinfo; - if (RUBY_DTRACE_REQUIRE_RETURN_ENABLED()) { - RUBY_DTRACE_REQUIRE_RETURN(StringValuePtr(fname), - rb_sourcefile(), - rb_sourceline()); - } + RUBY_DTRACE_HOOK(REQUIRE_RETURN, StringValuePtr(fname)); return result; } |