* 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, 34 insertions, 8 deletions

diff --git a/vm.c b/vm.c
index 23f6996895..9ba7be364b 100644
--- a/vm.c
+++ b/vm.c
@@ -18,6 +18,7 @@
 #include "vm_core.h"
 #include "iseq.h"
 #include "eval_intern.h"
+#include "probes.h"
 
 static inline VALUE *
 VM_EP_LEP(VALUE *ep)
@@ -65,10 +66,11 @@ rb_vm_control_frame_block_ptr(rb_control_frame_t *cfp)
 #define VM_COLLECT_USAGE_DETAILS 0
 #endif
 
-#if VM_COLLECT_USAGE_DETAILS
 static void vm_collect_usage_operand(int insn, int n, VALUE op);
-static void vm_collect_usage_register(int reg, int isset);
 static void vm_collect_usage_insn(int insn);
+
+#if VM_COLLECT_USAGE_DETAILS
+static void vm_collect_usage_register(int reg, int isset);
 #endif
 
 static VALUE
@@ -1179,6 +1181,7 @@ vm_exec(rb_thread_t *th)
 	    if (UNLIKELY(VM_FRAME_TYPE(th->cfp) == VM_FRAME_MAGIC_CFUNC)) {
 		const rb_method_entry_t *me = th->cfp->me;
 		EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, th->cfp->self, me->called_id, me->klass);
+		RUBY_DTRACE_FUNC_RETURN_HOOK(me->klass, me->called_id);
 	    }
 	    th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
 	}
@@ -1983,6 +1986,10 @@ m_core_hash_from_ary(VALUE self, VALUE ary)
     VALUE hash = rb_hash_new();
     int i;
 
+    if(RUBY_DTRACE_HASH_CREATE_ENABLED()) {
+	RUBY_DTRACE_HASH_CREATE(RARRAY_LEN(ary), rb_sourcefile(), rb_sourceline());
+    }
+
     for (i=0; i<RARRAY_LEN(ary); i+=2) {
 	rb_hash_aset(hash, RARRAY_PTR(ary)[i], RARRAY_PTR(ary)[i+1]);
     }
@@ -2308,6 +2315,11 @@ rb_ruby_debug_ptr(void)
     return ruby_vm_debug_ptr(GET_VM());
 }
 
+/* iseq.c */
+VALUE insn_operand_intern(rb_iseq_t *iseq,
+			  VALUE insn, int op_no, VALUE op,
+			  int len, size_t pos, VALUE *pnop, VALUE child);
+
 #if VM_COLLECT_USAGE_DETAILS
 
 #define HASH_ASET(h, k, v) st_insert(RHASH_TBL(h), (st_data_t)(k), (st_data_t)(v))
@@ -2365,11 +2377,6 @@ vm_analysis_insn(int insn)
     prev_insn = insn;
 }
 
-/* iseq.c */
-VALUE insn_operand_intern(rb_iseq_t *iseq,
-			  VALUE insn, int op_no, VALUE op,
-			  int len, size_t pos, VALUE *pnop, VALUE child);
-
 static void
 vm_analysis_operand(int insn, int n, VALUE op)
 {
@@ -2476,10 +2483,21 @@ usage_analysis_register_stop(VALUE self)
     return Qnil;
 }
 
+#else
+
+void (*ruby_vm_collect_usage_func_insn)(int insn) = NULL;
+void (*ruby_vm_collect_usage_func_operand)(int insn, int n, VALUE op) = NULL;
+void (*ruby_vm_collect_usage_func_register)(int reg, int isset) = NULL;
+
+#endif
+
 /* @param insn instruction number */
 static void
 vm_collect_usage_insn(int insn)
 {
+    if (RUBY_DTRACE_INSN_ENABLED()) {
+	RUBY_DTRACE_INSN(rb_insns_name(insn));
+    }
     if (ruby_vm_collect_usage_func_insn)
       (*ruby_vm_collect_usage_func_insn)(insn);
 }
@@ -2491,10 +2509,18 @@ vm_collect_usage_insn(int insn)
 static void
 vm_collect_usage_operand(int insn, int n, VALUE op)
 {
+    if (RUBY_DTRACE_INSN_OPERAND_ENABLED()) {
+	VALUE valstr;
+
+	valstr = insn_operand_intern(GET_THREAD()->cfp->iseq, insn, n, op, 0, 0, 0, 0);
+
+	RUBY_DTRACE_INSN_OPERAND(RSTRING_PTR(valstr), rb_insns_name(insn));
+    }
     if (ruby_vm_collect_usage_func_operand)
       (*ruby_vm_collect_usage_func_operand)(insn, n, op);
 }
 
+#if VM_COLLECT_USAGE_DETAILS
 /* @param reg register id. see code of vm_analysis_register() */
 /* @param iseset 0: read, 1: write */
 static void
@@ -2503,5 +2529,5 @@ vm_collect_usage_register(int reg, int isset)
     if (ruby_vm_collect_usage_func_register)
       (*ruby_vm_collect_usage_func_register)(reg, isset);
 }
-
 #endif
+