* eval.c, node.h, thread.c, yarvcore.[ch], eval_intern.h:

  support set_trace_func (incomplete.  id and klass
  don't be passed).  And support Thread#set_trace_func
  which hook only specified thread and Thread#add_trace_func
  which add new trace func instead of replace old one.
  C level API was modified.  See thread.c (logic) and
  yarvcore.h (data structures).
* vm.c, vm_macro.def: add hook points.
* compile.c, insns.def: fix "trace" instruction.
* iseq.c, vm_macro.h: add compile option "trace_instruction".
* test/ruby/test_settracefunc.rb: hook "c-return" of set_trace_func.



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

1 files changed, 23 insertions, 18 deletions

diff --git a/vm.c b/vm.c
index 37f0d8cd6e..c3cba1ea21 100644
--- a/vm.c
+++ b/vm.c
@@ -534,25 +534,28 @@ th_call0(rb_thread_t *th, VALUE klass, VALUE recv,
 	  break;
       }
       case NODE_CFUNC: {
-	  rb_control_frame_t *reg_cfp = th->cfp;
-	  rb_control_frame_t *cfp =
-	    push_frame(th, 0, FRAME_MAGIC_CFUNC,
-		       recv, (VALUE)blockptr, 0, reg_cfp->sp, 0, 1);
-
-	  cfp->callee_id = oid;
-	  cfp->method_id = id;
-	  cfp->method_klass = klass;
-
-	  val = call_cfunc(body->nd_cfnc, recv, body->nd_argc, argc, argv);
-
-	  if (reg_cfp != th->cfp + 1) {
-	      SDR2(reg_cfp);
-	      SDR2(th->cfp-5);
-	      rb_bug("cfp consistency error - call0");
-	      th->cfp = reg_cfp;
+	  EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, id, klass);
+	  {
+	      rb_control_frame_t *reg_cfp = th->cfp;
+	      rb_control_frame_t *cfp =
+		push_frame(th, 0, FRAME_MAGIC_CFUNC,
+			   recv, (VALUE)blockptr, 0, reg_cfp->sp, 0, 1);
+
+	      cfp->callee_id = oid;
+	      cfp->method_id = id;
+	      cfp->method_klass = klass;
+
+	      val = call_cfunc(body->nd_cfnc, recv, body->nd_argc, argc, argv);
+
+	      if (reg_cfp != th->cfp + 1) {
+		  SDR2(reg_cfp);
+		  SDR2(th->cfp-5);
+		  rb_bug("cfp consistency error - call0");
+		  th->cfp = reg_cfp;
+	      }
+	      pop_frame(th);
 	  }
-	  pop_frame(th);
-
+	  EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, recv, id, klass);
 	  break;
       }
       case NODE_ATTRSET:{
@@ -1472,6 +1475,8 @@ yarv_init_redefined_flag(void)
     }
 }
 
+
+
 #include "vm_evalbody.ci"
 
 /*                  finish