[svn:parrot] r40725 - in branches/pmc_sans_unionval: include/parrot src/gc

[whiteknight at svn.parrot.org]

Author: whiteknight
Date: Sun Aug 23 00:54:33 2009
New Revision: 40725
URL: https://trac.parrot.org/parrot/changeset/40725

Log:
[pmc_sans_unionval] Found the source of the test failure, it was the fixed-size allocator. Disabled that for now, will examine it more in a different venue. This branch is ready to merge into trunk now

Modified:
   branches/pmc_sans_unionval/include/parrot/gc_api.h
   branches/pmc_sans_unionval/src/gc/api.c

Modified: branches/pmc_sans_unionval/include/parrot/gc_api.h
==============================================================================
--- branches/pmc_sans_unionval/include/parrot/gc_api.h	Sat Aug 22 21:47:42 2009	(r40724)
+++ branches/pmc_sans_unionval/include/parrot/gc_api.h	Sun Aug 23 00:54:33 2009	(r40725)
@@ -23,7 +23,7 @@
 #if defined(_WIN32) || defined(_WIN64)
 #  define GC_USE_FIXED_SIZE_ALLOCATOR 0
 #else
-#  define GC_USE_FIXED_SIZE_ALLOCATOR 1
+#  define GC_USE_FIXED_SIZE_ALLOCATOR 0
 #endif
 
 /*

Modified: branches/pmc_sans_unionval/src/gc/api.c
==============================================================================
--- branches/pmc_sans_unionval/src/gc/api.c	Sat Aug 22 21:47:42 2009	(r40724)
+++ branches/pmc_sans_unionval/src/gc/api.c	Sun Aug 23 00:54:33 2009	(r40725)
@@ -369,11 +369,11 @@
 
     Parrot_gc_free_pmc_sync(interp, pmc);
     if (PMC_data(pmc) && pmc->vtable->attr_size) {
-#if 0
+#if GC_USE_FIXED_SIZE_ALLOCATOR
+        Parrot_gc_free_pmc_attributes(interp, pmc, pmc->vtable->attr_size);
+#else
         mem_sys_free(PMC_data(pmc));
         PMC_data(pmc) = NULL;
-#else
-        Parrot_gc_free_pmc_attributes(interp, pmc, pmc->vtable->attr_size);
 #endif
     }
     PARROT_ASSERT(NULL == PMC_data(pmc));