ko1	2013-05-27 19:28:25 +0900 (Mon, 27 May 2013)

  New Revision: 40959

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40959

  Log:
    * include/ruby/ruby.h: rename RUBY_INTERNAL_EVENT_FREE to
      RUBY_INTERNAL_EVENT_FREEOBJ.
    * ext/-test-/tracepoint/tracepoint.c,
      ext/objspace/object_tracing.c,
      gc.c, vm_trace.c: catch up this change.

  Modified files:
    trunk/ChangeLog
    trunk/ext/-test-/tracepoint/tracepoint.c
    trunk/ext/objspace/object_tracing.c
    trunk/gc.c
    trunk/include/ruby/ruby.h
    trunk/vm_trace.c

Index: include/ruby/ruby.h
===================================================================
--- include/ruby/ruby.h	(revision 40958)
+++ include/ruby/ruby.h	(revision 40959)
@@ -1729,7 +1729,7 @@ int ruby_native_thread_p(void); https://github.com/ruby/ruby/blob/trunk/include/ruby/ruby.h#L1729
 #define RUBY_INTERNAL_EVENT_SWITCH        0x040000
                                        /* 0x080000 */
 #define RUBY_INTERNAL_EVENT_NEWOBJ        0x100000
-#define RUBY_INTERNAL_EVENT_FREE          0x200000
+#define RUBY_INTERNAL_EVENT_FREEOBJ       0x200000
 #define RUBY_INTERNAL_EVENT_GC_START      0x400000
 #define RUBY_INTERNAL_EVENT_OBJSPACE_MASK 0x700000
 #define RUBY_INTERNAL_EVENT_MASK        0xfffe0000
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40958)
+++ ChangeLog	(revision 40959)
@@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon May 27 19:25:47 2013  Koichi Sasada  <ko1@a...>
+
+	* include/ruby/ruby.h: rename RUBY_INTERNAL_EVENT_FREE to
+	  RUBY_INTERNAL_EVENT_FREEOBJ.
+
+	* ext/-test-/tracepoint/tracepoint.c,
+	  ext/objspace/object_tracing.c,
+	  gc.c, vm_trace.c: catch up this change.
+
 Mon May 27 18:57:28 2013  Koichi Sasada  <ko1@a...>
 
 	* ext/objspace/objspace.c: support ObjectSpace.trace_object_allocations.
Index: gc.c
===================================================================
--- gc.c	(revision 40958)
+++ gc.c	(revision 40959)
@@ -1121,7 +1121,7 @@ make_io_deferred(RVALUE *p) https://github.com/ruby/ruby/blob/trunk/gc.c#L1121
 static int
 obj_free(rb_objspace_t *objspace, VALUE obj)
 {
-    gc_event_hook(objspace, RUBY_INTERNAL_EVENT_FREE, obj);
+    gc_event_hook(objspace, RUBY_INTERNAL_EVENT_FREEOBJ, obj);
 
     switch (BUILTIN_TYPE(obj)) {
       case T_NIL:
Index: ext/objspace/object_tracing.c
===================================================================
--- ext/objspace/object_tracing.c	(revision 40958)
+++ ext/objspace/object_tracing.c	(revision 40959)
@@ -125,7 +125,7 @@ trace_object_allocations(VALUE objspace) https://github.com/ruby/ruby/blob/trunk/ext/objspace/object_tracing.c#L125
     struct traceobj_arg arg;
 
     arg.newobj_trace = rb_tracepoint_new(0, RUBY_INTERNAL_EVENT_NEWOBJ, newobj_i, &arg);
-    arg.freeobj_trace = rb_tracepoint_new(0, RUBY_INTERNAL_EVENT_FREE, freeobj_i, &arg);
+    arg.freeobj_trace = rb_tracepoint_new(0, RUBY_INTERNAL_EVENT_FREEOBJ, freeobj_i, &arg);
     arg.object_table = st_init_numtable();
     arg.path_table = st_init_strtable();
 
Index: ext/-test-/tracepoint/tracepoint.c
===================================================================
--- ext/-test-/tracepoint/tracepoint.c	(revision 40958)
+++ ext/-test-/tracepoint/tracepoint.c	(revision 40959)
@@ -19,7 +19,7 @@ tracepoint_track_objspace_events_i(VALUE https://github.com/ruby/ruby/blob/trunk/ext/-test-/tracepoint/tracepoint.c#L19
 	    newobj_count++;
 	    break;
 	}
-      case RUBY_INTERNAL_EVENT_FREE:
+      case RUBY_INTERNAL_EVENT_FREEOBJ:
 	{
 	    free_count++;
 	    break;
@@ -37,7 +37,7 @@ tracepoint_track_objspace_events_i(VALUE https://github.com/ruby/ruby/blob/trunk/ext/-test-/tracepoint/tracepoint.c#L37
 VALUE
 tracepoint_track_objspace_events(VALUE self)
 {
-    VALUE tpval = rb_tracepoint_new(0, RUBY_INTERNAL_EVENT_NEWOBJ | RUBY_INTERNAL_EVENT_FREE | RUBY_INTERNAL_EVENT_GC_START, tracepoint_track_objspace_events_i, 0);
+    VALUE tpval = rb_tracepoint_new(0, RUBY_INTERNAL_EVENT_NEWOBJ | RUBY_INTERNAL_EVENT_FREEOBJ | RUBY_INTERNAL_EVENT_GC_START, tracepoint_track_objspace_events_i, 0);
     VALUE result = rb_ary_new();
     int i;
 
Index: vm_trace.c
===================================================================
--- vm_trace.c	(revision 40958)
+++ vm_trace.c	(revision 40959)
@@ -826,7 +826,7 @@ rb_tracearg_raised_exception(rb_trace_ar https://github.com/ruby/ruby/blob/trunk/vm_trace.c#L826
 VALUE
 rb_tracearg_object(rb_trace_arg_t *trace_arg)
 {
-    if (trace_arg->event & (RUBY_INTERNAL_EVENT_NEWOBJ | RUBY_INTERNAL_EVENT_FREE)) {
+    if (trace_arg->event & (RUBY_INTERNAL_EVENT_NEWOBJ | RUBY_INTERNAL_EVENT_FREEOBJ)) {
 	/* ok */
     }
     else {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/