* probes.d: add DTrace probe declarations. [ruby-core:27448]

* array.c (empty_ary_alloc, ary_new): added array create DTrace probe.

* compile.c (rb_insns_name): allowing DTrace probes to access
  instruction sequence name.

* Makefile.in: translate probes.d file to appropriate header file.

* common.mk: declare dependencies on the DTrace header.

* configure.in: add a test for existence of DTrace.

* eval.c (setup_exception): add a probe for when an exception is
  raised.

* gc.c: Add DTrace probes for mark begin and end, and sweep begin and
  end.

* hash.c (empty_hash_alloc): Add a probe for hash allocation.

* insns.def: Add probes for function entry and return.

* internal.h: function declaration for compile.c change.

* load.c (rb_f_load): add probes for `load` entry and exit, require
  entry and exit, and wrapping search_required for load path search.

* object.c (rb_obj_alloc): added a probe for general object creation.

* parse.y (yycompile0): added a probe around parse and compile phase.

* string.c (empty_str_alloc, str_new): DTrace probes for string
  allocation.

* test/dtrace/*: tests for DTrace probes.

* vm.c (vm_invoke_proc): add probes for function return on exception
  raise, hash create, and instruction sequence execution.

* vm_core.h: add probe declarations for function entry and exit.

* vm_dump.c: add probes header file.

* vm_eval.c (vm_call0_cfunc, vm_call0_cfunc_with_frame): add probe on
  function entry and return.

* vm_exec.c: expose instruction number to instruction name function.

* vm_insnshelper.c: add function entry and exit probes for cfunc
  methods.

* vm_insnhelper.h: vm usage information is always collected, so
  uncomment the functions.

12 19:14:50 2012  Akinori MUSHA  <knu@iDaemons.org>

* configure.in (isinf, isnan): isinf() and isnan() are macros on
  DragonFly which cannot be found by AC_REPLACE_FUNCS().  This
  workaround enforces the fact that they exist on DragonFly.

12 15:59:38 2012  Shugo Maeda  <shugo@ruby-lang.org>

* vm_core.h (rb_call_info_t::refinements), compile.c (new_callinfo),
  vm_insnhelper.c (vm_search_method): revert r37616 because it's too
  slow.  [ruby-dev:46477]

* test/ruby/test_refinement.rb (test_inline_method_cache): skip
  the test until the bug is fixed efficiently.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 40 insertions, 0 deletions

diff --git a/load.c b/load.c
index 827679ebac..98a5900b5b 100644
--- a/load.c
+++ b/load.c
@@ -7,6 +7,7 @@
 #include "internal.h"
 #include "dln.h"
 #include "eval_intern.h"
+#include "probes.h"
 
 VALUE ruby_dln_librefs;
 
@@ -621,6 +622,14 @@ rb_f_load(int argc, VALUE *argv)
     VALUE fname, wrap, path;
 
     rb_scan_args(argc, argv, "11", &fname, &wrap);
+
+    if(RUBY_DTRACE_LOAD_ENTRY_ENABLED()) {
+      RUBY_DTRACE_LOAD_ENTRY(
+          StringValuePtr(fname),
+          rb_sourcefile(),
+          rb_sourceline());
+    }
+
     path = rb_find_file(FilePathValue(fname));
     if (!path) {
 	if (!rb_file_load_ok(RSTRING_PTR(fname)))
@@ -628,6 +637,11 @@ rb_f_load(int argc, VALUE *argv)
 	path = fname;
     }
     rb_load_internal(path, RTEST(wrap));
+
+    if(RUBY_DTRACE_LOAD_RETURN_ENABLED()) {
+      RUBY_DTRACE_LOAD_RETURN(StringValuePtr(fname));
+    }
+
     return Qtrue;
 }
 
@@ -861,6 +875,13 @@ rb_require_safe(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());
+    }
+
     PUSH_TAG();
     saved.safe = rb_safe_level();
     if ((state = EXEC_TAG()) == 0) {
@@ -871,7 +892,22 @@ rb_require_safe(VALUE fname, int safe)
 	rb_set_safe_level_force(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());
+	}
+
 	found = search_required(fname, &path, safe);
+
+	if(RUBY_DTRACE_FIND_REQUIRE_RETURN_ENABLED()) {
+	    RUBY_DTRACE_FIND_REQUIRE_RETURN(
+		    StringValuePtr(fname),
+		    rb_sourcefile(),
+		    rb_sourceline());
+	}
 	if (found) {
 	    if (!path || !(ftptr = load_lock(RSTRING_PTR(path)))) {
 		result = Qfalse;
@@ -907,6 +943,10 @@ rb_require_safe(VALUE fname, int safe)
 
     th->errinfo = errinfo;
 
+    if(RUBY_DTRACE_REQUIRE_RETURN_ENABLED()) {
+      RUBY_DTRACE_REQUIRE_RETURN(StringValuePtr(fname));
+    }
+
     return result;
 }