nari	2012-11-23 00:03:46 +0900 (Fri, 23 Nov 2012)

  New Revision: 37809

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

  Log:
    * gc.c (is_swept_object): extract from is_dead_object().
    
    * gc.c (rb_gcdebug_print_obj_condition): add the function for debug.
      This function shows some conditions of given object (e.g.,
      marked, in heap, swept).
    
    * gc.c (rb_gcdebug_sentinel): add the function for debug.
      This function allow check to inadvertently free up an object.

  Modified files:
    trunk/ChangeLog
    trunk/gc.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37808)
+++ ChangeLog	(revision 37809)
@@ -1,3 +1,14 @@
+Thu Nov 22 23:48:10 2012  Narihiro Nakamura  <authornari@g...>
+
+	* gc.c (is_swept_object): extract from is_dead_object().
+
+	* gc.c (rb_gcdebug_print_obj_condition): add the function for debug.
+	  This function shows some conditions of given object (e.g.,
+	  marked, in heap, swept).
+
+	* gc.c (rb_gcdebug_sentinel): add the function for debug.
+	  This function allow check to inadvertently free up an object.
+
 Thu Nov 22 23:45:18 2012  Hiroshi Shirosaki  <h.shirosaki@g...>
 
 	* array.c (rb_ary_shared_with_p): fix cache validity check.
Index: gc.c
===================================================================
--- gc.c	(revision 37808)
+++ gc.c	(revision 37809)
@@ -1582,16 +1582,25 @@
 }
 
 static inline int
-is_dead_object(rb_objspace_t *objspace, VALUE ptr)
+is_swept_object(rb_objspace_t *objspace, VALUE ptr)
 {
     struct heaps_slot *slot = objspace->heap.sweep_slots;
-    if (!is_lazy_sweeping(objspace) || MARKED_IN_BITMAP(GET_HEAP_BITMAP(ptr), ptr))
-	return FALSE;
+
     while (slot) {
 	if ((VALUE)slot->header->start <= ptr && ptr < (VALUE)(slot->header->end))
-	    return TRUE;
+	    return FALSE;
 	slot = slot->next;
     }
+    return TRUE;
+}
+
+static inline int
+is_dead_object(rb_objspace_t *objspace, VALUE ptr)
+{
+    if (!is_lazy_sweeping(objspace) || MARKED_IN_BITMAP(GET_HEAP_BITMAP(ptr), ptr))
+	return FALSE;
+    if (!is_swept_object(objspace, ptr))
+	return TRUE;
     return FALSE;
 }
 
@@ -4304,7 +4313,52 @@
     return Qnil;
 }
 
+#ifdef GC_DEBUG
+
 /*
+  ------------------------------ DEBUG ------------------------------
+*/
+
+void
+rb_gcdebug_print_obj_condition(VALUE obj)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+
+    if (is_pointer_to_heap(objspace, (void *)obj)) {
+        fprintf(stderr, "pointer to heap?: true\n");
+    }
+    else {
+        fprintf(stderr, "pointer to heap?: false\n");
+        return;
+    }
+    fprintf(stderr, "marked?: %s\n",
+            MARKED_IN_BITMAP(GET_HEAP_BITMAP(obj), obj) ? "true" : "false");
+    if (is_lazy_sweeping(objspace)) {
+        fprintf(stderr, "lazy sweeping?: true\n");
+        fprintf(stderr, "swept?: %s\n",
+                is_swept_object(objspace, obj) ? "done" : "not yet");
+    }
+    else {
+        fprintf(stderr, "lazy sweeping?: false\n");
+    }
+}
+
+static VALUE
+gcdebug_sential(VALUE obj, VALUE name)
+{
+    fprintf(stderr, "WARNING: object %s(%p) is inadvertently collected\n", (char *)name, (void *)obj);
+    return Qnil;
+}
+
+void
+rb_gcdebug_sentinel(VALUE obj, const char *name)
+{
+    rb_define_final(obj, rb_proc_new(gcdebug_sential, (VALUE)name));
+}
+#endif /* GC_DEBUG */
+
+
+/*
  * Document-class: ObjectSpace
  *
  *  The <code>ObjectSpace</code> module contains a number of routines

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