* include/ruby/debug.h: introdudced.

  Debugging/profiling features will be located.
* vm_trace.c: expose C-level TracePoint APIs.
  Note that they are experimental.
* vm_trace.c, include/ruby/debug.h: rename `rb_hook_flag_t'
  to `rb_event_hook_flag_t'.
  Macro names `RUBY_HOOK_FLAG_*' are also renamed to
  `RUBY_EVENT_HOOK_FLAG_*'.
* debug.h, vm_debug.h: rename debug.h to vm_debug.h.
* common.mk: ditto.
* debug.c, main.c, vm_core.h: ditto.



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

8 files changed, 212 insertions, 121 deletions

diff --git a/ChangeLog b/ChangeLog
index 2411ca5f6a..d29b969837 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Tue Nov 20 21:41:04 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/debug.h: introdudced.
+	  Debugging/profiling features will be located.
+
+	* vm_trace.c: expose C-level TracePoint APIs.
+	  Note that they are experimental.
+
+	* vm_trace.c, include/ruby/debug.h: rename `rb_hook_flag_t'
+	  to `rb_event_hook_flag_t'.
+	  Macro names `RUBY_HOOK_FLAG_*' are also renamed to
+	  `RUBY_EVENT_HOOK_FLAG_*'.
+
+	* debug.h, vm_debug.h: rename debug.h to vm_debug.h.
+
+	* common.mk: ditto.
+
+	* debug.c, main.c, vm_core.h: ditto.
+
 Tue Nov 20 21:12:37 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* configure.in (RUBY_DTRACE_AVAILABLE): only check dtrace availability.
diff --git a/common.mk b/common.mk
index bad934697f..1e4f2156b6 100644
--- a/common.mk
+++ b/common.mk
@@ -612,7 +612,7 @@ ID_H_INCLUDES      = {$(VPATH)}id.h
 PROBES_H_INCLUDES  = {$(VPATH)}probes.h
 VM_CORE_H_INCLUDES = {$(VPATH)}vm_core.h {$(VPATH)}thread_$(THREAD_MODEL).h \
 		     {$(VPATH)}node.h {$(VPATH)}method.h {$(VPATH)}ruby_atomic.h \
-		     $(ID_H_INCLUDES)
+	             {$(VPATH)}vm_debug.h $(ID_H_INCLUDES)
 
 addr2line.$(OBJEXT): {$(VPATH)}addr2line.c {$(VPATH)}addr2line.h {$(VPATH)}config.h
 array.$(OBJEXT): {$(VPATH)}array.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
@@ -620,8 +620,7 @@ array.$(OBJEXT): {$(VPATH)}array.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
 bignum.$(OBJEXT): {$(VPATH)}bignum.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
   {$(VPATH)}thread.h {$(VPATH)}internal.h
 class.$(OBJEXT): {$(VPATH)}class.c $(RUBY_H_INCLUDES) \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h {$(VPATH)}internal.h \
-  {$(VPATH)}constant.h
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}internal.h {$(VPATH)}constant.h
 compar.$(OBJEXT): {$(VPATH)}compar.c $(RUBY_H_INCLUDES)
 complex.$(OBJEXT): {$(VPATH)}complex.c $(RUBY_H_INCLUDES) \
   {$(VPATH)}internal.h
@@ -644,23 +643,21 @@ enumerator.$(OBJEXT): {$(VPATH)}enumerator.c $(RUBY_H_INCLUDES) \
   {$(VPATH)}internal.h
 error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}known_errors.inc \
   $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) $(ENCODING_H_INCLUDES) \
-  {$(VPATH)}debug.h \
   {$(VPATH)}internal.h
 eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}eval_intern.h {$(VPATH)}vm.h \
   $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}eval_error.c \
-  {$(VPATH)}eval_jump.c {$(VPATH)}debug.h {$(VPATH)}gc.h {$(VPATH)}iseq.h \
+  {$(VPATH)}eval_jump.c {$(VPATH)}gc.h {$(VPATH)}iseq.h \
   $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h $(PROBES_H_INCLUDES)
 load.$(OBJEXT): {$(VPATH)}load.c {$(VPATH)}eval_intern.h \
   {$(VPATH)}util.h $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) \
-  {$(VPATH)}dln.h {$(VPATH)}debug.h \
-  {$(VPATH)}internal.h $(PROBES_H_INCLUDES)
+  {$(VPATH)}dln.h {$(VPATH)}internal.h $(PROBES_H_INCLUDES)
 file.$(OBJEXT): {$(VPATH)}file.c $(RUBY_H_INCLUDES) {$(VPATH)}io.h \
   $(ENCODING_H_INCLUDES) {$(VPATH)}util.h {$(VPATH)}dln.h \
   {$(VPATH)}internal.h
 gc.$(OBJEXT): {$(VPATH)}gc.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
   {$(VPATH)}regex.h $(ENCODING_H_INCLUDES) $(VM_CORE_H_INCLUDES) \
   {$(VPATH)}gc.h {$(VPATH)}io.h {$(VPATH)}eval_intern.h {$(VPATH)}util.h \
-  {$(VPATH)}debug.h {$(VPATH)}internal.h {$(VPATH)}constant.h \
+  {$(VPATH)}internal.h {$(VPATH)}constant.h \
   {$(VPATH)}thread.h $(PROBES_H_INCLUDES)
 hash.$(OBJEXT): {$(VPATH)}hash.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
   $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h $(PROBES_H_INCLUDES)
@@ -669,14 +666,13 @@ inits.$(OBJEXT): {$(VPATH)}inits.c $(RUBY_H_INCLUDES) \
 io.$(OBJEXT): {$(VPATH)}io.c $(RUBY_H_INCLUDES) {$(VPATH)}io.h \
   {$(VPATH)}util.h $(ENCODING_H_INCLUDES) {$(VPATH)}dln.h \
   {$(VPATH)}internal.h {$(VPATH)}thread.h
-main.$(OBJEXT): {$(VPATH)}main.c $(RUBY_H_INCLUDES) {$(VPATH)}debug.h \
-  {$(VPATH)}node.h
+main.$(OBJEXT): {$(VPATH)}main.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h {$(VPATH)}vm_debug.h
 marshal.$(OBJEXT): {$(VPATH)}marshal.c $(RUBY_H_INCLUDES) {$(VPATH)}io.h \
   $(ENCODING_H_INCLUDES) {$(VPATH)}util.h {$(VPATH)}internal.h
 math.$(OBJEXT): {$(VPATH)}math.c $(RUBY_H_INCLUDES) \
   {$(VPATH)}internal.h
 node.$(OBJEXT): {$(VPATH)}node.c $(RUBY_H_INCLUDES) \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
+  $(VM_CORE_H_INCLUDES)
 numeric.$(OBJEXT): {$(VPATH)}numeric.c $(RUBY_H_INCLUDES) \
   {$(VPATH)}util.h $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h
 object.$(OBJEXT): {$(VPATH)}object.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
@@ -691,10 +687,10 @@ parse.$(OBJEXT): {$(VPATH)}parse.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \
   {$(VPATH)}internal.h $(PROBES_H_INCLUDES)
 proc.$(OBJEXT): {$(VPATH)}proc.c {$(VPATH)}eval_intern.h \
   $(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \
-  {$(VPATH)}debug.h {$(VPATH)}internal.h {$(VPATH)}iseq.h
+  {$(VPATH)}internal.h {$(VPATH)}iseq.h
 process.$(OBJEXT): {$(VPATH)}process.c $(RUBY_H_INCLUDES) \
   {$(VPATH)}util.h {$(VPATH)}io.h $(ENCODING_H_INCLUDES) {$(VPATH)}dln.h \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h {$(VPATH)}internal.h \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}internal.h \
   {$(VPATH)}thread.h
 random.$(OBJEXT): {$(VPATH)}random.c $(RUBY_H_INCLUDES) \
   {$(VPATH)}siphash.c {$(VPATH)}siphash.h
@@ -720,11 +716,10 @@ regsyntax.$(OBJEXT): {$(VPATH)}regsyntax.c {$(VPATH)}regint.h \
   {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h $(RUBY_H_INCLUDES)
 ruby.$(OBJEXT): {$(VPATH)}ruby.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
   $(ENCODING_H_INCLUDES) {$(VPATH)}eval_intern.h $(VM_CORE_H_INCLUDES) \
-  {$(VPATH)}dln.h {$(VPATH)}debug.h {$(VPATH)}internal.h
-safe.$(OBJEXT): {$(VPATH)}safe.c $(RUBY_H_INCLUDES) \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
+  {$(VPATH)}dln.h {$(VPATH)}internal.h
+safe.$(OBJEXT): {$(VPATH)}safe.c $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES)
 signal.$(OBJEXT): {$(VPATH)}signal.c $(RUBY_H_INCLUDES) \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
+  $(VM_CORE_H_INCLUDES)
 sprintf.$(OBJEXT): {$(VPATH)}sprintf.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
   {$(VPATH)}regex.h {$(VPATH)}vsnprintf.c $(ENCODING_H_INCLUDES)
 st.$(OBJEXT): {$(VPATH)}st.c $(RUBY_H_INCLUDES)
@@ -735,13 +730,13 @@ string.$(OBJEXT): {$(VPATH)}string.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
 struct.$(OBJEXT): {$(VPATH)}struct.c $(RUBY_H_INCLUDES) {$(VPATH)}internal.h
 thread.$(OBJEXT): {$(VPATH)}thread.c {$(VPATH)}eval_intern.h \
   $(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \
-  {$(VPATH)}debug.h {$(VPATH)}thread_$(THREAD_MODEL).c $(ENCODING_H_INCLUDES) \
+  {$(VPATH)}thread_$(THREAD_MODEL).c $(ENCODING_H_INCLUDES) \
   {$(VPATH)}internal.h {$(VPATH)}io.h {$(VPATH)}thread.h
 transcode.$(OBJEXT): {$(VPATH)}transcode.c $(RUBY_H_INCLUDES) \
   $(ENCODING_H_INCLUDES) {$(VPATH)}transcode_data.h {$(VPATH)}internal.h
 cont.$(OBJEXT): {$(VPATH)}cont.c $(RUBY_H_INCLUDES) \
   $(VM_CORE_H_INCLUDES) {$(VPATH)}gc.h {$(VPATH)}eval_intern.h \
-  {$(VPATH)}debug.h {$(VPATH)}internal.h
+  {$(VPATH)}internal.h
 time.$(OBJEXT): {$(VPATH)}time.c $(RUBY_H_INCLUDES) \
   $(ENCODING_H_INCLUDES) {$(VPATH)}timev.h {$(VPATH)}internal.h
 util.$(OBJEXT): {$(VPATH)}util.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
@@ -756,41 +751,41 @@ dmyversion.$(OBJEXT): {$(VPATH)}dmyversion.c version.$(OBJEXT)
 
 compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \
   $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
-  {$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc {$(VPATH)}debug.h \
+  {$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc \
   {$(VPATH)}optunifs.inc {$(VPATH)}opt_sc.inc {$(VPATH)}insns.inc \
   {$(VPATH)}internal.h
 iseq.$(OBJEXT): {$(VPATH)}iseq.c {$(VPATH)}gc.h {$(VPATH)}iseq.h \
   $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
-  {$(VPATH)}insns_info.inc {$(VPATH)}node_name.inc {$(VPATH)}debug.h {$(VPATH)}internal.h
+  {$(VPATH)}insns_info.inc {$(VPATH)}node_name.inc {$(VPATH)}internal.h
 vm.$(OBJEXT): {$(VPATH)}vm.c {$(VPATH)}gc.h {$(VPATH)}iseq.h \
   {$(VPATH)}eval_intern.h $(RUBY_H_INCLUDES) $(ENCODING_H_INCLUDES) \
   $(VM_CORE_H_INCLUDES) {$(VPATH)}vm_method.c {$(VPATH)}vm_eval.c \
   {$(VPATH)}vm_insnhelper.c {$(VPATH)}vm_insnhelper.h {$(VPATH)}vm_exec.c \
   {$(VPATH)}vm_exec.h {$(VPATH)}insns.def {$(VPATH)}vmtc.inc \
-  {$(VPATH)}vm.inc {$(VPATH)}insns.inc {$(VPATH)}debug.h \
+  {$(VPATH)}vm.inc {$(VPATH)}insns.inc \
   {$(VPATH)}internal.h {$(VPATH)}vm.h {$(VPATH)}constant.h \
   $(PROBES_H_INCLUDES) {$(VPATH)}probes_helper.h
 vm_dump.$(OBJEXT): {$(VPATH)}vm_dump.c $(RUBY_H_INCLUDES) \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h {$(VPATH)}addr2line.h \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}addr2line.h \
   {$(VPATH)}internal.h
 debug.$(OBJEXT): {$(VPATH)}debug.c $(RUBY_H_INCLUDES) \
   $(ENCODING_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}eval_intern.h \
-  {$(VPATH)}util.h {$(VPATH)}debug.h
+  {$(VPATH)}util.h
 id.$(OBJEXT): {$(VPATH)}id.c $(RUBY_H_INCLUDES) $(ID_H_INCLUDES) {$(VPATH)}vm_opts.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}vm_backtrace.c \
   $(VM_CORE_H_INCLUDES) $(RUBY_H_INCLUDES) $(ENCODING_H_INCLUDES) \
   {$(VPATH)}internal.h {$(VPATH)}iseq.h
 vm_trace.$(OBJEXT): {$(VPATH)}vm_trace.c $(ENCODING_H_INCLUDES) \
-  $(VM_CORE_H_INCLUDES) $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) $(RUBY_H_INCLUDES) {$(VPATH)}debug.h \
   {$(VPATH)}internal.h
 miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c $(RUBY_H_INCLUDES) \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h {$(VPATH)}internal.h
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}internal.h
 prelude.$(OBJEXT): {$(VPATH)}prelude.c $(RUBY_H_INCLUDES) \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h {$(VPATH)}internal.h
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}internal.h
 golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.c $(RUBY_H_INCLUDES) \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h {$(VPATH)}internal.h
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}internal.h
 goruby.$(OBJEXT): {$(VPATH)}goruby.c {$(VPATH)}main.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}debug.h {$(VPATH)}node.h
+  {$(VPATH)}vm_debug.h {$(VPATH)}node.h
 
 ascii.$(OBJEXT): {$(VPATH)}ascii.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
   {$(VPATH)}oniguruma.h {$(VPATH)}missing.h $(RUBY_H_INCLUDES)
diff --git a/debug.c b/debug.c
index b77be0efba..4909a45d17 100644
--- a/debug.c
+++ b/debug.c
@@ -12,7 +12,7 @@
 #include "ruby/ruby.h"
 #include "ruby/encoding.h"
 #include "ruby/util.h"
-#include "debug.h"
+#include "vm_debug.h"
 #include "eval_intern.h"
 #include "vm_core.h"
 #include "id.h"
diff --git a/include/ruby/debug.h b/include/ruby/debug.h
new file mode 100644
index 0000000000..ff259910f6
--- /dev/null
+++ b/include/ruby/debug.h
@@ -0,0 +1,75 @@
+/**********************************************************************

+

+  ruby/debug.h -

+

+  $Author: ko1 $

+  created at: Tue Nov 20 20:35:08 2012

+

+  Copyright (C) 2012 Yukihiro Matsumoto

+

+**********************************************************************/

+

+#ifndef RB_DEBUG_H

+#define RB_DEBUG_H 1

+

+#if defined(__cplusplus)

+extern "C" {

+#if 0

+} /* satisfy cc-mode */

+#endif

+#endif

+

+#if defined __GNUC__ && __GNUC__ >= 4

+#pragma GCC visibility push(default)

+#endif

+

+/* Note: This file contains experimental APIs. */

+/* APIs can be replaced at Ruby 2.0.1 or later */

+

+typedef enum {

+    RUBY_EVENT_HOOK_FLAG_SAFE    = 0x01,

+    RUBY_EVENT_HOOK_FLAG_DELETED = 0x02,

+    RUBY_EVENT_HOOK_FLAG_RAW_ARG = 0x04

+} rb_event_hook_flag_t;

+

+/* Safe API.  Callback will be called under PUSH_TAG() */

+void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data);

+int rb_remove_event_hook(rb_event_hook_func_t func);

+int rb_remove_event_hook_with_data(rb_event_hook_func_t func, VALUE data);

+void rb_thread_add_event_hook(VALUE thval, rb_event_hook_func_t func, rb_event_flag_t events, VALUE data);

+int rb_thread_remove_event_hook(VALUE thval, rb_event_hook_func_t func);

+int rb_thread_remove_event_hook_with_data(VALUE thval, rb_event_hook_func_t func, VALUE data);

+

+/* advanced version */

+void rb_add_event_hook2(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data, rb_event_hook_flag_t hook_flag);

+void rb_thread_add_event_hook2(VALUE thval, rb_event_hook_func_t func, rb_event_flag_t events, VALUE data, rb_event_hook_flag_t hook_flag);

+

+/* TracePoint APIs */

+

+VALUE rb_tracepoint_new(VALUE target_thread_not_supported_yet, rb_event_flag_t events, void (*func)(VALUE, void *), void *data);

+VALUE rb_tracepoint_enable(VALUE tpval);

+VALUE rb_tracepoint_disable(VALUE tpval);

+VALUE rb_tracepoint_enabled_p(VALUE tpval);

+

+VALUE rb_tracepoint_attr_event(VALUE tpval);

+VALUE rb_tracepoint_attr_line(VALUE tpval);

+VALUE rb_tracepoint_attr_file(VALUE tpval);

+VALUE rb_tracepoint_attr_id(VALUE tpval);

+VALUE rb_tracepoint_attr_klass(VALUE tpval);

+VALUE rb_tracepoint_attr_binding(VALUE tpval);

+VALUE rb_tracepoint_attr_self(VALUE tpval);

+VALUE rb_tracepoint_attr_return_value(VALUE tpval);

+VALUE rb_tracepoint_attr_raised_exception(VALUE tpval);

+

+#if defined __GNUC__ && __GNUC__ >= 4

+#pragma GCC visibility pop

+#endif

+

+#if defined(__cplusplus)

+#if 0

+{ /* satisfy cc-mode */

+#endif

+}  /* extern "C" { */

+#endif

+

+#endif /* RUBY_DEBUG_H */

diff --git a/main.c b/main.c
index f4d526ad95..16da117732 100644
--- a/main.c
+++ b/main.c
@@ -11,7 +11,7 @@
 
 #undef RUBY_EXPORT
 #include "ruby.h"
-#include "debug.h"
+#include "vm_debug.h"
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif
diff --git a/vm_core.h b/vm_core.h
index d2f9474d34..fffaa5e986 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -18,7 +18,7 @@
 #include "ruby/st.h"
 
 #include "node.h"
-#include "debug.h"
+#include "vm_debug.h"
 #include "vm_opts.h"
 #include "id.h"
 #include "method.h"
diff --git a/debug.h b/vm_debug.h
index f1d11304f0..424390fade 100644
--- a/debug.h
+++ b/vm_debug.h
@@ -1,6 +1,6 @@
 /**********************************************************************
 
-  debug.h - YARV Debug function interface
+  vm_debug.h - YARV Debug function interface
 
   $Author$
   created at: 04/08/25 02:33:49 JST
diff --git a/vm_trace.c b/vm_trace.c
index bd6601984f..a2ede6498b 100644
--- a/vm_trace.c
+++ b/vm_trace.c
@@ -22,6 +22,7 @@
  */
 
 #include "ruby/ruby.h"
+#include "ruby/debug.h"
 #include "ruby/encoding.h"
 
 #include "internal.h"
@@ -30,14 +31,8 @@
 
 /* (1) trace mechanisms */
 
-typedef enum {
-    RUBY_HOOK_FLAG_SAFE    = 0x01,
-    RUBY_HOOK_FLAG_DELETED = 0x02,
-    RUBY_HOOK_FLAG_RAW_ARG = 0x04
-} rb_hook_flag_t;
-
 typedef struct rb_event_hook_struct {
-    rb_hook_flag_t hook_flags;
+    rb_event_hook_flag_t hook_flags;
     rb_event_flag_t events;
     rb_event_hook_func_t func;
     VALUE data;
@@ -50,18 +45,6 @@ typedef void (*rb_event_hook_raw_arg_func_t)(VALUE data, const rb_trace_arg_t *a
 
 static int ruby_event_flag_count[MAX_EVENT_NUM] = {0};
 
-/* Safe API.  Callback will be called under PUSH_TAG() */
-void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data);
-int rb_remove_event_hook(rb_event_hook_func_t func);
-int rb_remove_event_hook_with_data(rb_event_hook_func_t func, VALUE data);
-void rb_thread_add_event_hook(VALUE thval, rb_event_hook_func_t func, rb_event_flag_t events, VALUE data);
-int rb_thread_remove_event_hook(VALUE thval, rb_event_hook_func_t func);
-int rb_thread_remove_event_hook_with_data(VALUE thval, rb_event_hook_func_t func, VALUE data);
-
-/* advanced version */
-void rb_add_event_hook2(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data, rb_hook_flag_t hook_flag);
-void rb_thread_add_event_hook2(VALUE thval, rb_event_hook_func_t func, rb_event_flag_t events, VALUE data, rb_hook_flag_t hook_flag);
-
 /* called from vm.c */
 
 void
@@ -116,7 +99,7 @@ thval2thread_t(VALUE thval)
 }
 
 static rb_event_hook_t *
-alloc_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data, rb_hook_flag_t hook_flags)
+alloc_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data, rb_event_hook_flag_t hook_flags)
 {
     rb_event_hook_t *hook = ALLOC(rb_event_hook_t);
     hook->hook_flags = hook_flags;
@@ -136,7 +119,7 @@ connect_event_hook(rb_hook_list_t *list, rb_event_hook_t *hook)
 }
 
 static void
-rb_threadptr_add_event_hook(rb_thread_t *th, rb_event_hook_func_t func, rb_event_flag_t events, VALUE data, rb_hook_flag_t hook_flags)
+rb_threadptr_add_event_hook(rb_thread_t *th, rb_event_hook_func_t func, rb_event_flag_t events, VALUE data, rb_event_hook_flag_t hook_flags)
 {
     rb_event_hook_t *hook = alloc_event_hook(func, events, data, hook_flags);
     connect_event_hook(&th->event_hooks, hook);
@@ -145,24 +128,24 @@ rb_threadptr_add_event_hook(rb_thread_t *th, rb_event_hook_func_t func, rb_event
 void
 rb_thread_add_event_hook(VALUE thval, rb_event_hook_func_t func, rb_event_flag_t events, VALUE data)
 {
-    rb_threadptr_add_event_hook(thval2thread_t(thval), func, events, data, RUBY_HOOK_FLAG_SAFE);
+    rb_threadptr_add_event_hook(thval2thread_t(thval), func, events, data, RUBY_EVENT_HOOK_FLAG_SAFE);
 }
 
 void
 rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data)
 {
-    rb_event_hook_t *hook = alloc_event_hook(func, events, data, RUBY_HOOK_FLAG_SAFE);
+    rb_event_hook_t *hook = alloc_event_hook(func, events, data, RUBY_EVENT_HOOK_FLAG_SAFE);
     connect_event_hook(&GET_VM()->event_hooks, hook);
 }
 
 void
-rb_thread_add_event_hook2(VALUE thval, rb_event_hook_func_t func, rb_event_flag_t events, VALUE data, rb_hook_flag_t hook_flags)
+rb_thread_add_event_hook2(VALUE thval, rb_event_hook_func_t func, rb_event_flag_t events, VALUE data, rb_event_hook_flag_t hook_flags)
 {
     rb_threadptr_add_event_hook(thval2thread_t(thval), func, events, data, hook_flags);
 }
 
 void
-rb_add_event_hook2(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data, rb_hook_flag_t hook_flags)
+rb_add_event_hook2(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data, rb_event_hook_flag_t hook_flags)
 {
     rb_event_hook_t *hook = alloc_event_hook(func, events, data, hook_flags);
     connect_event_hook(&GET_VM()->event_hooks, hook);
@@ -178,7 +161,7 @@ remove_event_hook(rb_hook_list_t *list, rb_event_hook_func_t func, VALUE data)
     while (hook) {
 	if (func == 0 || hook->func == func) {
 	    if (data == Qundef || hook->data == data) {
-		hook->hook_flags |= RUBY_HOOK_FLAG_DELETED;
+		hook->hook_flags |= RUBY_EVENT_HOOK_FLAG_DELETED;
 		ret+=1;
 		list->need_clean++;
 	    }
@@ -246,7 +229,7 @@ clean_hooks(rb_hook_list_t *list)
     list->need_clean = 0;
 
     while ((hook = *nextp) != 0) {
-	if (hook->hook_flags & RUBY_HOOK_FLAG_DELETED) {
+	if (hook->hook_flags & RUBY_EVENT_HOOK_FLAG_DELETED) {
 	    *nextp = hook->next;
 	    recalc_remove_ruby_vm_event_flags(hook->events);
 	    xfree(hook);
@@ -270,15 +253,15 @@ exec_hooks(rb_thread_t *th, rb_hook_list_t *list, const rb_trace_arg_t *trace_ar
 
     raised = rb_threadptr_reset_raised(th);
 
-    /* TODO: Support !RUBY_HOOK_FLAG_SAFE hooks */
+    /* TODO: Support !RUBY_EVENT_HOOK_FLAG_SAFE hooks */
 
     TH_PUSH_TAG(th);
     if ((state = TH_EXEC_TAG()) == 0) {
 	rb_event_hook_t *hook;
 
 	for (hook = list->hooks; hook; hook = hook->next) {
-	    if (LIKELY(!(hook->hook_flags & RUBY_HOOK_FLAG_DELETED)) && (trace_arg->event & hook->events)) {
-		if (!(hook->hook_flags & RUBY_HOOK_FLAG_RAW_ARG)) {
+	    if (LIKELY(!(hook->hook_flags & RUBY_EVENT_HOOK_FLAG_DELETED)) && (trace_arg->event & hook->events)) {
+		if (!(hook->hook_flags & RUBY_EVENT_HOOK_FLAG_RAW_ARG)) {
 		    (*hook->func)(trace_arg->event, hook->data, trace_arg->self, trace_arg->id, trace_arg->klass);
 		}
 		else {
@@ -447,7 +430,7 @@ thread_add_trace_func(rb_thread_t *th, VALUE trace)
 	rb_raise(rb_eTypeError, "trace_func needs to be Proc");
     }
 
-    rb_threadptr_add_event_hook(th, call_trace_func, RUBY_EVENT_ALL, trace, RUBY_HOOK_FLAG_SAFE);
+    rb_threadptr_add_event_hook(th, call_trace_func, RUBY_EVENT_ALL, trace, RUBY_EVENT_HOOK_FLAG_SAFE);
 }
 
 /*
@@ -570,9 +553,12 @@ static VALUE rb_cTracePoint;
 typedef struct rb_tp_struct {
     rb_event_flag_t events;
     rb_thread_t *target_th;
+    void (*func)(VALUE tpval, void *data);
+    void *data;
     VALUE proc;
     rb_trace_arg_t *trace_arg;
     int tracing;
+    VALUE self;
 } rb_tp_t;
 
 static void
@@ -644,8 +630,8 @@ tp_attr_check_active(rb_tp_t *tp)
     }
 }
 
-static VALUE
-tp_attr_event_m(VALUE tpval)
+VALUE
+rb_tracepoint_attr_event(VALUE tpval)
 {
     rb_tp_t *tp = tpptr(tpval);
     tp_attr_check_active(tp);
@@ -656,8 +642,8 @@ rb_control_frame_t *rb_vm_get_ruby_level_next_cfp(rb_thread_t *th, rb_control_fr
 int rb_vm_control_frame_id_and_class(rb_control_frame_t *cfp, ID *idp, VALUE *klassp);
 VALUE rb_binding_new_with_cfp(rb_thread_t *th, rb_control_frame_t *src_cfp);
 
-static VALUE
-tp_attr_line_m(VALUE tpval)
+VALUE
+rb_tracepoint_attr_line(VALUE tpval)
 {
     rb_tp_t *tp = tpptr(tpval);
     rb_control_frame_t *cfp;
@@ -672,8 +658,8 @@ tp_attr_line_m(VALUE tpval)
     }
 }
 
-static VALUE
-tp_attr_file_m(VALUE tpval)
+VALUE
+rb_tracepoint_attr_file(VALUE tpval)
 {
     rb_tp_t *tp = tpptr(tpval);
     rb_control_frame_t *cfp;
@@ -704,8 +690,8 @@ fill_id_and_klass(rb_trace_arg_t *trace_arg)
     }
 }
 
-static VALUE
-tp_attr_id_m(VALUE tpval)
+VALUE
+rb_tracepoint_attr_id(VALUE tpval)
 {
     rb_tp_t *tp = tpptr(tpval);
     tp_attr_check_active(tp);
@@ -718,8 +704,8 @@ tp_attr_id_m(VALUE tpval)
     }
 }
 
-static VALUE
-tp_attr_klass_m(VALUE tpval)
+VALUE
+rb_tracepoint_attr_klass(VALUE tpval)
 {
     rb_tp_t *tp = tpptr(tpval);
     tp_attr_check_active(tp);
@@ -733,8 +719,8 @@ tp_attr_klass_m(VALUE tpval)
     }
 }
 
-static VALUE
-tp_attr_binding_m(VALUE tpval)
+VALUE
+rb_tracepoint_attr_binding(VALUE tpval)
 {
     rb_tp_t *tp = tpptr(tpval);
     rb_control_frame_t *cfp;
@@ -749,8 +735,8 @@ tp_attr_binding_m(VALUE tpval)
     }
 }
 
-static VALUE
-tp_attr_self_m(VALUE tpval)
+VALUE
+rb_tracepoint_attr_self(VALUE tpval)
 {
     rb_tp_t *tp = tpptr(tpval);
     tp_attr_check_active(tp);
@@ -758,8 +744,8 @@ tp_attr_self_m(VALUE tpval)
     return tp->trace_arg->self;
 }
 
-static VALUE
-tp_attr_return_value_m(VALUE tpval)
+VALUE
+rb_tracepoint_attr_return_value(VALUE tpval)
 {
     rb_tp_t *tp = tpptr(tpval);
     tp_attr_check_active(tp);
@@ -776,8 +762,8 @@ tp_attr_return_value_m(VALUE tpval)
     return tp->trace_arg->data;
 }
 
-static VALUE
-tp_attr_raised_exception_m(VALUE tpval)
+VALUE
+rb_tracepoint_attr_raised_exception(VALUE tpval)
 {
     rb_tp_t *tp = tpptr(tpval);
     tp_attr_check_active(tp);
@@ -806,7 +792,12 @@ tp_call_trace(VALUE tpval, rb_trace_arg_t *trace_arg)
 
     TH_PUSH_TAG(th);
     if ((state = TH_EXEC_TAG()) == 0) {
-	rb_proc_call_with_block(tp->proc, 1, &tpval, Qnil);
+	if (tp->func) {
+	    (*tp->func)(tpval, tp->data);
+	}
+	else {
+	    rb_proc_call_with_block((VALUE)tp->proc, 1, &tpval, Qnil);
+	}
     }
     TH_POP_TAG();
 
@@ -817,23 +808,23 @@ tp_call_trace(VALUE tpval, rb_trace_arg_t *trace_arg)
     }
 }
 
-static VALUE
-tp_enable(VALUE tpval)
+VALUE
+rb_tracepoint_enable(VALUE tpval)
 {
     rb_tp_t *tp = tpptr(tpval);
 
     if (tp->target_th) {
-	rb_thread_add_event_hook2(tp->target_th->self, (rb_event_hook_func_t)tp_call_trace, tp->events, tpval, RUBY_HOOK_FLAG_SAFE | RUBY_HOOK_FLAG_RAW_ARG);
+	rb_thread_add_event_hook2(tp->target_th->self, (rb_event_hook_func_t)tp_call_trace, tp->events, tpval, RUBY_EVENT_HOOK_FLAG_SAFE | RUBY_EVENT_HOOK_FLAG_RAW_ARG);
     }
     else {
-	rb_add_event_hook2((rb_event_hook_func_t)tp_call_trace, tp->events, tpval, RUBY_HOOK_FLAG_SAFE | RUBY_HOOK_FLAG_RAW_ARG);
+	rb_add_event_hook2((rb_event_hook_func_t)tp_call_trace, tp->events, tpval, RUBY_EVENT_HOOK_FLAG_SAFE | RUBY_EVENT_HOOK_FLAG_RAW_ARG);
     }
     tp->tracing = 1;
     return Qundef;
 }
 
-static VALUE
-tp_disable(VALUE tpval)
+VALUE
+rb_tracepoint_disable(VALUE tpval)
 {
     rb_tp_t *tp = tpptr(tpval);
 
@@ -847,10 +838,8 @@ tp_disable(VALUE tpval)
     return Qundef;
 }
 
-
-
 static VALUE
-tp_enable_m(VALUE tpval)
+tracepoint_enable_m(VALUE tpval)
 {
     rb_tp_t *tp = tpptr(tpval);
 
@@ -858,9 +847,9 @@ tp_enable_m(VALUE tpval)
 	rb_raise(rb_eRuntimeError, "trace is already enable");
     }
 
-    tp_enable(tpval);
+    rb_tracepoint_enable(tpval);
     if (rb_block_given_p()) {
-	return rb_ensure(rb_yield, tpval, tp_disable, tpval);
+	return rb_ensure(rb_yield, tpval, rb_tracepoint_disable, tpval);
     }
     else {
 	return tpval;
@@ -868,7 +857,7 @@ tp_enable_m(VALUE tpval)
 }
 
 static VALUE
-tp_disable_m(VALUE tpval)
+tracepoint_disable_m(VALUE tpval)
 {
     rb_tp_t *tp = tpptr(tpval);
 
@@ -876,37 +865,50 @@ tp_disable_m(VALUE tpval)
 	rb_raise(rb_eRuntimeError, "trace is not enable");
     }
 
-    tp_disable(tpval);
+    rb_tracepoint_disable(tpval);
     if (rb_block_given_p()) {
-	return rb_ensure(rb_yield, tpval, tp_enable, tpval);
+	return rb_ensure(rb_yield, tpval, rb_tracepoint_enable, tpval);
     }
     else {
 	return tpval;
     }
 }
 
-static VALUE
-tp_enabled_p(VALUE tpval)
+VALUE
+rb_tracepoint_enabled_p(VALUE tpval)
 {
     rb_tp_t *tp = tpptr(tpval);
     return tp->tracing ? Qtrue : Qfalse;
 }
 
 static VALUE
-tp_initialize(VALUE klass, rb_thread_t *target_th, rb_event_flag_t events, VALUE proc)
+tracepoint_new(VALUE klass, rb_thread_t *target_th, rb_event_flag_t events, void (func)(VALUE, void*), void *data, VALUE proc)
 {
     VALUE tpval = tp_alloc(klass);
     rb_tp_t *tp;
     TypedData_Get_Struct(tpval, rb_tp_t, &tp_data_type, tp);
 
     tp->proc = proc;
+    tp->func = func;
+    tp->data = data;
     tp->events = events;
+    tp->self = tpval;
 
     return tpval;
 }
 
+VALUE
+rb_tracepoint_new(VALUE target_thread, rb_event_flag_t events, void (*func)(VALUE, void *), void *data)
+{
+    rb_thread_t *target_th = 0;
+    if (RTEST(target_thread)) {
+	/* TODO: now unsupported */
+    }
+    return tracepoint_new(rb_cTracePoint, target_th, events, func, data, Qundef);
+}
+
 static VALUE
-tp_new_s(int argc, VALUE *argv, VALUE self)
+tracepoint_new_s(int argc, VALUE *argv, VALUE self)
 {
     rb_event_flag_t events = 0;
     int i;
@@ -924,14 +926,14 @@ tp_new_s(int argc, VALUE *argv, VALUE self)
 	rb_raise(rb_eThreadError, "must be called with a block");
     }
 
-    return tp_initialize(self, 0, events, rb_block_proc());
+    return tracepoint_new(self, 0, events, 0, 0, rb_block_proc());
 }
 
 static VALUE
-tp_trace_s(int argc, VALUE *argv, VALUE self)
+tracepoint_trace_s(int argc, VALUE *argv, VALUE self)
 {
-    VALUE trace = tp_new_s(argc, argv, self);
-    tp_enable(trace);
+    VALUE trace = tracepoint_new_s(argc, argv, self);
+    rb_tracepoint_enable(trace);
     return trace;
 }
 
@@ -948,20 +950,20 @@ Init_vm_trace(void)
     rb_cTracePoint = rb_define_class("TracePoint", rb_cObject);
     rb_undef_alloc_func(rb_cTracePoint);
     rb_undef_method(CLASS_OF(rb_cTracePoint), "new");
-    rb_define_singleton_method(rb_cTracePoint, "new", tp_new_s, -1);
-    rb_define_singleton_method(rb_cTracePoint, "trace", tp_trace_s, -1);
-
-    rb_define_method(rb_cTracePoint, "enable", tp_enable_m, 0);
-    rb_define_method(rb_cTracePoint, "disable", tp_disable_m, 0);
-    rb_define_method(rb_cTracePoint, "enabled?", tp_enabled_p, 0);
-
-    rb_define_method(rb_cTracePoint, "event", tp_attr_event_m, 0);
-    rb_define_method(rb_cTracePoint, "line", tp_attr_line_m, 0);
-    rb_define_method(rb_cTracePoint, "file", tp_attr_file_m, 0);
-    rb_define_method(rb_cTracePoint, "id", tp_attr_id_m, 0);
-    rb_define_method(rb_cTracePoint, "klass", tp_attr_klass_m, 0);
-    rb_define_method(rb_cTracePoint, "binding", tp_attr_binding_m, 0);
-    rb_define_method(rb_cTracePoint, "self", tp_attr_self_m, 0);
-    rb_define_method(rb_cTracePoint, "return_value", tp_attr_return_value_m, 0);
-    rb_define_method(rb_cTracePoint, "raised_exception", tp_attr_raised_exception_m, 0);
+    rb_define_singleton_method(rb_cTracePoint, "new", tracepoint_new_s, -1);
+    rb_define_singleton_method(rb_cTracePoint, "trace", tracepoint_trace_s, -1);
+
+    rb_define_method(rb_cTracePoint, "enable", tracepoint_enable_m, 0);
+    rb_define_method(rb_cTracePoint, "disable", tracepoint_disable_m, 0);
+    rb_define_method(rb_cTracePoint, "enabled?", rb_tracepoint_enabled_p, 0);
+
+    rb_define_method(rb_cTracePoint, "event", rb_tracepoint_attr_event, 0);
+    rb_define_method(rb_cTracePoint, "line", rb_tracepoint_attr_line, 0);
+    rb_define_method(rb_cTracePoint, "file", rb_tracepoint_attr_file, 0);
+    rb_define_method(rb_cTracePoint, "id", rb_tracepoint_attr_id, 0);
+    rb_define_method(rb_cTracePoint, "klass", rb_tracepoint_attr_klass, 0);
+    rb_define_method(rb_cTracePoint, "binding", rb_tracepoint_attr_binding, 0);
+    rb_define_method(rb_cTracePoint, "self", rb_tracepoint_attr_self, 0);
+    rb_define_method(rb_cTracePoint, "return_value", rb_tracepoint_attr_return_value, 0);
+    rb_define_method(rb_cTracePoint, "raised_exception", rb_tracepoint_attr_raised_exception, 0);
 }