[pypy-svn] r58557 - pypy/branch/gc-experiments/pypy/rpython/memory/gc

[fijal at codespeak.net]

Author: fijal
Date: Thu Oct  2 11:28:31 2008
New Revision: 58557

Modified:
   pypy/branch/gc-experiments/pypy/rpython/memory/gc/markcompact.py
   pypy/branch/gc-experiments/pypy/rpython/memory/gc/semispace.py
Log:
Kill some dead code and make space smaller by default (this makes test_gc pass)


Modified: pypy/branch/gc-experiments/pypy/rpython/memory/gc/markcompact.py
==============================================================================
--- pypy/branch/gc-experiments/pypy/rpython/memory/gc/markcompact.py	(original)
+++ pypy/branch/gc-experiments/pypy/rpython/memory/gc/markcompact.py	Thu Oct  2 11:28:31 2008
@@ -57,7 +57,7 @@
     inline_simple_malloc = True
     inline_simple_malloc_varsize = True
 
-    def __init__(self, chunk_size=DEFAULT_CHUNK_SIZE, space_size=2*(1024**2)):
+    def __init__(self, chunk_size=DEFAULT_CHUNK_SIZE, space_size=4096):
         self.space_size = space_size
         MovingGCBase.__init__(self, chunk_size)
 
@@ -301,11 +301,7 @@
                 forward_ptr = hdr.forward_ptr
                 hdr.forward_ptr = NULL
                 hdr.tid &= ~(GCFLAG_MARKBIT|GCFLAG_FINALIZATION_ORDERING)
-                #llop.debug_print(lltype.Void, fromaddr, "copied to", forward_ptr,
-                #                 "\ntid", self.header(obj).tid,
-                #                 "\nsize", totalsize)
                 llmemory.raw_memmove(fromaddr, forward_ptr, totalsize)
-                #llarena.arena_reset(fromaddr, totalsize, False)
             fromaddr += totalsize
 
     def debug_check_object(self, obj):

Modified: pypy/branch/gc-experiments/pypy/rpython/memory/gc/semispace.py
==============================================================================
--- pypy/branch/gc-experiments/pypy/rpython/memory/gc/semispace.py	(original)
+++ pypy/branch/gc-experiments/pypy/rpython/memory/gc/semispace.py	Thu Oct  2 11:28:31 2008
@@ -508,7 +508,6 @@
         self.finalizer_lock_count += 1
         try:
             while self.run_finalizers.non_empty():
-                #print "finalizer"
                 if self.finalizer_lock_count > 1:
                     # the outer invocation of execute_finalizers() will do it
                     break