[svn:parrot] r43917 - in branches/boehm_gc_2: include/parrot src/gc src/interp src/ops src/string

[bacek at svn.parrot.org]

Author: bacek
Date: Fri Feb 12 11:29:13 2010
New Revision: 43917
URL: https://trac.parrot.org/parrot/changeset/43917

Log:
Rename GC_DEBUG into PARROT_GC_DEBUG to avoid clash with Boehm GC

Modified:
   branches/boehm_gc_2/include/parrot/settings.h
   branches/boehm_gc_2/src/gc/gc_boehm.c
   branches/boehm_gc_2/src/gc/gc_ms.c
   branches/boehm_gc_2/src/interp/inter_create.c
   branches/boehm_gc_2/src/ops/core.ops
   branches/boehm_gc_2/src/string/api.c

Modified: branches/boehm_gc_2/include/parrot/settings.h
==============================================================================
--- branches/boehm_gc_2/include/parrot/settings.h	Fri Feb 12 10:58:28 2010	(r43916)
+++ branches/boehm_gc_2/include/parrot/settings.h	Fri Feb 12 11:29:13 2010	(r43917)
@@ -28,9 +28,9 @@
 /* Helpful internal macro for testing whether we are currently
  * debugging garbage collection and memory management. */
 #if DISABLE_GC_DEBUG
-#  define GC_DEBUG(interp) 0
+#  define PARROT_GC_DEBUG(interp) 0
 #else
-#  define GC_DEBUG(interp) Interp_flags_TEST((interp), PARROT_GC_DEBUG_FLAG)
+#  define PARROT_GC_DEBUG(interp) Interp_flags_TEST((interp), PARROT_GC_DEBUG_FLAG)
 #endif /* DISABLE_GC_DEBUG */
 
 /*
@@ -38,7 +38,7 @@
  * MS  -- stop-the-world mark & sweep
  * INF -- infinite memory "collector"
  */
-#define PARROT_GC_DEFAULT_TYPE MS
+#define PARROT_GC_DEFAULT_TYPE BOEHM
 
 /*
  * JIT/i386 can use the CGP run core for external functions instead

Modified: branches/boehm_gc_2/src/gc/gc_boehm.c
==============================================================================
--- branches/boehm_gc_2/src/gc/gc_boehm.c	Fri Feb 12 10:58:28 2010	(r43916)
+++ branches/boehm_gc_2/src/gc/gc_boehm.c	Fri Feb 12 11:29:13 2010	(r43917)
@@ -384,6 +384,9 @@
 {
     ASSERT_ARGS(Parrot_gc_boehm_init)
 
+    //GC_enable_incremental();
+    //GC_time_limit = GC_TIME_UNLIMITED;
+
     interp->gc_sys->do_gc_mark         = gc_boehm_mark_and_sweep;
     interp->gc_sys->finalize_gc_system = NULL;
 

Modified: branches/boehm_gc_2/src/gc/gc_ms.c
==============================================================================
--- branches/boehm_gc_2/src/gc/gc_ms.c	Fri Feb 12 10:58:28 2010	(r43916)
+++ branches/boehm_gc_2/src/gc/gc_ms.c	Fri Feb 12 11:29:13 2010	(r43917)
@@ -1305,7 +1305,7 @@
     Parrot_add_to_free_list(interp, pool, new_arena);
 
     /* Allocate more next time */
-    if (GC_DEBUG(interp)) {
+    if (PARROT_GC_DEBUG(interp)) {
         pool->objects_per_alloc *= GC_DEBUG_UNITS_PER_ALLOC_GROWTH_FACTOR;
         pool->replenish_level =
                 (size_t)(pool->total_objects *

Modified: branches/boehm_gc_2/src/interp/inter_create.c
==============================================================================
--- branches/boehm_gc_2/src/interp/inter_create.c	Fri Feb 12 10:58:28 2010	(r43916)
+++ branches/boehm_gc_2/src/interp/inter_create.c	Fri Feb 12 11:29:13 2010	(r43917)
@@ -165,7 +165,7 @@
     }
 
     /* Must initialize flags before Parrot_gc_initialize() is called
-     * so the GC_DEBUG stuff is available. */
+     * so the PARROT_GC_DEBUG stuff is available. */
     interp->flags = flags;
 
     interp->ctx         = PMCNULL;

Modified: branches/boehm_gc_2/src/ops/core.ops
==============================================================================
--- branches/boehm_gc_2/src/ops/core.ops	Fri Feb 12 10:58:28 2010	(r43916)
+++ branches/boehm_gc_2/src/ops/core.ops	Fri Feb 12 11:29:13 2010	(r43917)
@@ -981,7 +981,7 @@
 
 =item B<gc_debug>(in INT)
 
-If $1 is zero, turn off GC_DEBUG. Otherwise turn it on.
+If $1 is zero, turn off PARROT_GC_DEBUG. Otherwise turn it on.
 
 =cut
 

Modified: branches/boehm_gc_2/src/string/api.c
==============================================================================
--- branches/boehm_gc_2/src/string/api.c	Fri Feb 12 10:58:28 2010	(r43916)
+++ branches/boehm_gc_2/src/string/api.c	Fri Feb 12 11:29:13 2010	(r43917)
@@ -1711,7 +1711,7 @@
 
 #if ! DISABLE_GC_DEBUG
     /* trigger GC for debug */
-    if (interp && GC_DEBUG(interp))
+    if (interp && PARROT_GC_DEBUG(interp))
         Parrot_gc_mark_and_sweep(interp, GC_trace_stack_FLAG);
 #endif
 
@@ -1864,7 +1864,7 @@
 
 #if ! DISABLE_GC_DEBUG
     /* trigger GC for debug */
-    if (interp && GC_DEBUG(interp))
+    if (interp && PARROT_GC_DEBUG(interp))
         Parrot_gc_mark_and_sweep(interp, GC_trace_stack_FLAG);
 #endif
 
@@ -1940,7 +1940,7 @@
 
 #if ! DISABLE_GC_DEBUG
     /* trigger GC for debug */
-    if (interp && GC_DEBUG(interp))
+    if (interp && PARROT_GC_DEBUG(interp))
         Parrot_gc_mark_and_sweep(interp, GC_trace_stack_FLAG);
 #endif
 
@@ -2019,7 +2019,7 @@
 
 #if ! DISABLE_GC_DEBUG
     /* trigger GC for debug */
-    if (interp && GC_DEBUG(interp))
+    if (interp && PARROT_GC_DEBUG(interp))
         Parrot_gc_mark_and_sweep(interp, GC_trace_stack_FLAG);
 #endif