summaryrefslogtreecommitdiff
path: root/gc.h
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-25 02:44:20 (GMT)
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-25 02:44:20 (GMT)
commit4bdb5ced9a06532d33e6aa0dd6be49e863b31d22 (patch)
treee45cc5127c0734b78ea979be8a572f9123dca8e1 /gc.h
parentace2b68ac4215b46f5de94bad68f3fef91df4245 (diff)
* gc.h: add RUBY_ prefix to debug macros.
* cont.c, proc.c, yarvcore.c, * gc.c: define ruby_gc_debug_indent variable to debug mark/free. * vm.c, insnhelper.ci: rename some functions to vm_* or rb_vm_*. move some functions, definitions, declarations to suitable files. * eval.c, yarvcore.h, eval_error.ci, insnhelper.ci: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.h')
-rw-r--r--gc.h44
1 files changed, 21 insertions, 23 deletions
diff --git a/gc.h b/gc.h
index 0c3d351..b059813 100644
--- a/gc.h
+++ b/gc.h
@@ -7,52 +7,50 @@ NOINLINE(void rb_gc_save_machine_context(rb_thread_t *));
/* for GC debug */
-#ifndef MARK_FREE_DEBUG
-#define MARK_FREE_DEBUG 0
+#ifndef RUBY_MARK_FREE_DEBUG
+#define RUBY_MARK_FREE_DEBUG 0
#endif
-
-#if MARK_FREE_DEBUG
-static int g_indent = 0;
+#if RUBY_MARK_FREE_DEBUG
+extern int ruby_gc_debug_indent = 0;
static void
rb_gc_debug_indent(void)
{
- int i;
- for (i = 0; i < g_indent; i++) {
- printf(" ");
- }
+ printf("%*s", ruby_gc_debug_indent, "");
}
static void
rb_gc_debug_body(char *mode, char *msg, int st, void *ptr)
{
if (st == 0) {
- g_indent--;
+ ruby_gc_debug_indent--;
}
rb_gc_debug_indent();
printf("%s: %s %s (%p)\n", mode, st ? "->" : "<-", msg, ptr);
+
if (st) {
- g_indent++;
+ ruby_gc_debug_indent++;
}
+
fflush(stdout);
}
-#define MARK_REPORT_ENTER(msg) rb_gc_debug_body("mark", msg, 1, ptr)
-#define MARK_REPORT_LEAVE(msg) rb_gc_debug_body("mark", msg, 0, ptr)
-#define FREE_REPORT_ENTER(msg) rb_gc_debug_body("free", msg, 1, ptr)
-#define FREE_REPORT_LEAVE(msg) rb_gc_debug_body("free", msg, 0, ptr)
-#define GC_INFO rb_gc_debug_indent(); printf
+#define RUBY_MARK_ENTER(msg) rb_gc_debug_body("mark", msg, 1, ptr)
+#define RUBY_MARK_LEAVE(msg) rb_gc_debug_body("mark", msg, 0, ptr)
+#define RUBY_FREE_ENTER(msg) rb_gc_debug_body("free", msg, 1, ptr)
+#define RUBY_FREE_LEAVE(msg) rb_gc_debug_body("free", msg, 0, ptr)
+#define RUBY_GC_INFO rb_gc_debug_indent(); printf
#else
-#define MARK_REPORT_ENTER(msg)
-#define MARK_REPORT_LEAVE(msg)
-#define FREE_REPORT_ENTER(msg)
-#define FREE_REPORT_LEAVE(msg)
-#define GC_INFO if(0)printf
+#define RUBY_MARK_ENTER(msg)
+#define RUBY_MARK_LEAVE(msg)
+#define RUBY_FREE_ENTER(msg)
+#define RUBY_FREE_LEAVE(msg)
+#define RUBY_GC_INFO if(0)printf
#endif
-#define MARK_UNLESS_NULL(ptr) if(ptr){rb_gc_mark(ptr);}
-#define FREE_UNLESS_NULL(ptr) if(ptr){ruby_xfree(ptr);}
+#define RUBY_MARK_UNLESS_NULL(ptr) if(RTEST(ptr)){rb_gc_mark(ptr);}
+#define RUBY_FREE_UNLESS_NULL(ptr) if(ptr){ruby_xfree(ptr);}
#endif /* RUBY_GC_H */