[pypy-svn] r33056 - in pypy/dist/pypy: module/_stackless/test rpython/memory rpython/memory/gctransform rpython/memory/gctransform/test rpython/memory/test translator/backendopt/test translator/c translator/c/test
mwh at codespeak.net
mwh at codespeak.net
Mon Oct 9 16:06:06 CEST 2006
Author: mwh
Date: Mon Oct 9 16:06:01 2006
New Revision: 33056
Added:
pypy/dist/pypy/rpython/memory/gctransform/
- copied from r32943, pypy/dist/pypy/rpython/memory/gctransform2/
pypy/dist/pypy/rpython/memory/gctransform/__init__.py
- copied unchanged from r33055, pypy/dist/pypy/rpython/memory/gctransform2/__init__.py
pypy/dist/pypy/rpython/memory/gctransform/boehm.py
- copied, changed from r33055, pypy/dist/pypy/rpython/memory/gctransform2/boehm.py
pypy/dist/pypy/rpython/memory/gctransform/framework.py
- copied, changed from r33055, pypy/dist/pypy/rpython/memory/gctransform2/framework.py
pypy/dist/pypy/rpython/memory/gctransform/refcounting.py
- copied, changed from r33055, pypy/dist/pypy/rpython/memory/gctransform2/refcounting.py
pypy/dist/pypy/rpython/memory/gctransform/stacklessframework.py
- copied, changed from r33055, pypy/dist/pypy/rpython/memory/gctransform2/stacklessframework.py
pypy/dist/pypy/rpython/memory/gctransform/statistics.py
- copied unchanged from r33055, pypy/dist/pypy/rpython/memory/gctransform2/statistics.py
pypy/dist/pypy/rpython/memory/gctransform/support.py
- copied unchanged from r33055, pypy/dist/pypy/rpython/memory/gctransform2/support.py
pypy/dist/pypy/rpython/memory/gctransform/test/
- copied from r33055, pypy/dist/pypy/rpython/memory/gctransform2/test/
pypy/dist/pypy/rpython/memory/gctransform/transform.py
- copied unchanged from r33055, pypy/dist/pypy/rpython/memory/gctransform2/transform.py
Removed:
pypy/dist/pypy/rpython/memory/gctransform.py
pypy/dist/pypy/rpython/memory/test/test_gctransform.py
Modified:
pypy/dist/pypy/module/_stackless/test/test_interp_clonable.py
pypy/dist/pypy/rpython/memory/gc.py
pypy/dist/pypy/rpython/memory/gctransform/test/test_boehm.py
pypy/dist/pypy/rpython/memory/gctransform/test/test_framework.py
pypy/dist/pypy/rpython/memory/gctransform/test/test_protect.py
pypy/dist/pypy/rpython/memory/gctransform/test/test_refcounting.py
pypy/dist/pypy/rpython/memory/gctransform/test/test_stacklessframework.py
pypy/dist/pypy/rpython/memory/gctransform/test/test_statistics.py
pypy/dist/pypy/rpython/memory/gctransform/test/test_transform.py
pypy/dist/pypy/rpython/memory/test/test_transformed_gc.py
pypy/dist/pypy/translator/backendopt/test/test_propagate.py
pypy/dist/pypy/translator/c/gc.py
pypy/dist/pypy/translator/c/test/test_newgc.py
Log:
replace the old gctransformer with the new one.
disable to non-zeroing of memory allocated by the framework as it always was
buggy, but we've only just noticed...
Modified: pypy/dist/pypy/module/_stackless/test/test_interp_clonable.py
==============================================================================
--- pypy/dist/pypy/module/_stackless/test/test_interp_clonable.py (original)
+++ pypy/dist/pypy/module/_stackless/test/test_interp_clonable.py Mon Oct 9 16:06:01 2006
@@ -3,7 +3,7 @@
"""
from pypy.translator.c import gc
-from pypy.rpython.memory import gctransform
+from pypy.rpython.memory.gctransform2 import stacklessframework
from pypy.rpython.memory.test import test_transformed_gc
from pypy.module._stackless.interp_clonable import InterpClonableCoroutine as ClonableCoroutine
from pypy.module._stackless.interp_clonable import AbstractThunk, fork
@@ -12,7 +12,7 @@
class TestClonableCoroutine(test_transformed_gc.GCTest):
class gcpolicy(gc.StacklessFrameworkGcPolicy):
- class transformerclass(gctransform.StacklessFrameworkGCTransformer):
+ class transformerclass(stacklessframework.StacklessFrameworkGCTransformer):
GC_PARAMS = {'start_heap_size': 4096 }
def test_clone(self):
Modified: pypy/dist/pypy/rpython/memory/gc.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gc.py (original)
+++ pypy/dist/pypy/rpython/memory/gc.py Mon Oct 9 16:06:01 2006
@@ -109,7 +109,7 @@
return
init_gc_object_immortal = init_gc_object
-DEBUG_PRINT = False
+DEBUG_PRINT = True
memoryError = MemoryError()
class MarkSweepGC(GCBase):
_alloc_flavor_ = "raw"
Modified: pypy/dist/pypy/rpython/memory/gctransform/test/test_boehm.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gctransform2/test/test_boehm.py (original)
+++ pypy/dist/pypy/rpython/memory/gctransform/test/test_boehm.py Mon Oct 9 16:06:01 2006
@@ -1,6 +1,6 @@
-from pypy.rpython.memory.gctransform2.boehm import BoehmGCTransformer
-from pypy.rpython.memory.gctransform2.test.test_transform import rtype_and_transform, getops
-from pypy.rpython.memory.gctransform2.test.test_refcounting import make_deallocator
+from pypy.rpython.memory.gctransform.boehm import BoehmGCTransformer
+from pypy.rpython.memory.gctransform.test.test_transform import rtype_and_transform, getops
+from pypy.rpython.memory.gctransform.test.test_refcounting import make_deallocator
from pypy.rpython.lltypesystem import lltype
from pypy.translator.translator import graphof
from pypy import conftest
Modified: pypy/dist/pypy/rpython/memory/gctransform/test/test_framework.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gctransform2/test/test_framework.py (original)
+++ pypy/dist/pypy/rpython/memory/gctransform/test/test_framework.py Mon Oct 9 16:06:01 2006
@@ -1,5 +1,5 @@
-from pypy.rpython.memory.gctransform2.test.test_transform import rtype
-from pypy.rpython.memory.gctransform2.framework import FrameworkGCTransformer
+from pypy.rpython.memory.gctransform.test.test_transform import rtype
+from pypy.rpython.memory.gctransform.framework import FrameworkGCTransformer
from pypy.rpython.lltypesystem import lltype
from pypy.translator.c.gc import FrameworkGcPolicy
from pypy.translator.translator import TranslationContext, graphof
Modified: pypy/dist/pypy/rpython/memory/gctransform/test/test_protect.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gctransform2/test/test_protect.py (original)
+++ pypy/dist/pypy/rpython/memory/gctransform/test/test_protect.py Mon Oct 9 16:06:01 2006
@@ -1,8 +1,8 @@
-from pypy.rpython.memory.gctransform2.refcounting import \
+from pypy.rpython.memory.gctransform.refcounting import \
RefcountingGCTransformer
-from pypy.rpython.memory.gctransform2.boehm import \
+from pypy.rpython.memory.gctransform.boehm import \
BoehmGCTransformer
-from pypy.rpython.memory.gctransform2.test.test_transform import \
+from pypy.rpython.memory.gctransform.test.test_transform import \
rtype, rtype_and_transform, getops
from pypy.rpython.lltypesystem.lloperation import llop
from pypy.rpython.lltypesystem import lltype
Modified: pypy/dist/pypy/rpython/memory/gctransform/test/test_refcounting.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gctransform2/test/test_refcounting.py (original)
+++ pypy/dist/pypy/rpython/memory/gctransform/test/test_refcounting.py Mon Oct 9 16:06:01 2006
@@ -1,5 +1,5 @@
-from pypy.rpython.memory.gctransform2.test.test_transform import rtype, rtype_and_transform, getops
-from pypy.rpython.memory.gctransform2.refcounting import RefcountingGCTransformer
+from pypy.rpython.memory.gctransform.test.test_transform import rtype, rtype_and_transform, getops
+from pypy.rpython.memory.gctransform.refcounting import RefcountingGCTransformer
from pypy.rpython.lltypesystem import lltype
from pypy.translator.c.gc import RefcountingGcPolicy
from pypy.translator.translator import TranslationContext, graphof
Modified: pypy/dist/pypy/rpython/memory/gctransform/test/test_stacklessframework.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gctransform2/test/test_stacklessframework.py (original)
+++ pypy/dist/pypy/rpython/memory/gctransform/test/test_stacklessframework.py Mon Oct 9 16:06:01 2006
@@ -1,5 +1,5 @@
-from pypy.rpython.memory.gctransform2.test.test_transform import rtype
-from pypy.rpython.memory.gctransform2.stacklessframework import \
+from pypy.rpython.memory.gctransform.test.test_transform import rtype
+from pypy.rpython.memory.gctransform.stacklessframework import \
StacklessFrameworkGCTransformer
from pypy.rpython.lltypesystem import lltype
from pypy.translator.c.gc import StacklessFrameworkGcPolicy
Modified: pypy/dist/pypy/rpython/memory/gctransform/test/test_statistics.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gctransform2/test/test_statistics.py (original)
+++ pypy/dist/pypy/rpython/memory/gctransform/test/test_statistics.py Mon Oct 9 16:06:01 2006
@@ -1,7 +1,7 @@
from pypy.rpython.lltypesystem import lltype
-from pypy.rpython.memory.gctransform2.test.test_transform import \
+from pypy.rpython.memory.gctransform.test.test_transform import \
rtype
-from pypy.rpython.memory.gctransform2.statistics import \
+from pypy.rpython.memory.gctransform.statistics import \
relevant_gcvars_graph, relevant_gcvars, filter_for_nongcptr
from pypy.translator.translator import graphof
Modified: pypy/dist/pypy/rpython/memory/gctransform/test/test_transform.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gctransform2/test/test_transform.py (original)
+++ pypy/dist/pypy/rpython/memory/gctransform/test/test_transform.py Mon Oct 9 16:06:01 2006
@@ -1,6 +1,7 @@
-from pypy.rpython.memory.gctransform2.transform import GCTransformer
+from pypy.rpython.memory.gctransform.transform import GCTransformer
from pypy.objspace.flow.model import c_last_exception, Variable
-from pypy.rpython.memory.gctransform import var_needsgc, var_ispyobj
+from pypy.rpython.memory.gctransform.support import var_ispyobj
+from pypy.translator.backendopt.support import var_needsgc
from pypy.translator.translator import TranslationContext, graphof
from pypy.translator.c.exceptiontransform import ExceptionTransformer
from pypy.rpython.lltypesystem import lltype
Modified: pypy/dist/pypy/rpython/memory/test/test_transformed_gc.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/test/test_transformed_gc.py (original)
+++ pypy/dist/pypy/rpython/memory/test/test_transformed_gc.py Mon Oct 9 16:06:01 2006
@@ -157,7 +157,8 @@
from pypy.translator.c import gc
from pypy.annotation import model as annmodel
from pypy.rpython.lltypesystem import lltype, llmemory
-from pypy.rpython.memory import gctransform
+from pypy.rpython.memory.gctransform import framework
+from pypy.rpython.memory.gctransform import stacklessframework
from pypy.rpython.lltypesystem.lloperation import llop
from pypy.rpython.lltypesystem import lltype
from pypy.rpython.memory.support import INT_SIZE
@@ -228,7 +229,7 @@
class TestMarkSweepGC(GCTest):
class gcpolicy(gc.FrameworkGcPolicy):
- class transformerclass(gctransform.FrameworkGCTransformer):
+ class transformerclass(framework.FrameworkGCTransformer):
GC_PARAMS = {'start_heap_size': 4096 }
def heap_usage(self, statistics):
@@ -636,7 +637,7 @@
class TestStacklessMarkSweepGC(TestMarkSweepGC):
class gcpolicy(gc.StacklessFrameworkGcPolicy):
- class transformerclass(gctransform.StacklessFrameworkGCTransformer):
+ class transformerclass(stacklessframework.StacklessFrameworkGCTransformer):
GC_PARAMS = {'start_heap_size': 4096 }
def test_x_become(self):
@@ -662,6 +663,6 @@
py.test.skip("in-progress")
class gcpolicy(gc.StacklessFrameworkGcPolicy):
- class transformerclass(gctransform.FrameworkGCTransformer):
+ class transformerclass(framework.FrameworkGCTransformer):
from pypy.rpython.memory.gc import SemiSpaceGC as GCClass
GC_PARAMS = {'space_size': 4096 }
Modified: pypy/dist/pypy/translator/backendopt/test/test_propagate.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/test/test_propagate.py (original)
+++ pypy/dist/pypy/translator/backendopt/test/test_propagate.py Mon Oct 9 16:06:01 2006
@@ -4,7 +4,7 @@
from pypy.rpython.rarithmetic import ovfcheck
from pypy.translator.backendopt.all import backend_optimizations
from pypy.rpython.llinterp import LLInterpreter
-from pypy.rpython.memory.test.test_gctransform import getops
+from pypy.rpython.memory.gctransform.test.test_transform import getops
from pypy import conftest
def get_graph(fn, signature, inline_threshold=True, all_opts=True):
Modified: pypy/dist/pypy/translator/c/gc.py
==============================================================================
--- pypy/dist/pypy/translator/c/gc.py (original)
+++ pypy/dist/pypy/translator/c/gc.py Mon Oct 9 16:06:01 2006
@@ -4,7 +4,8 @@
from pypy.rpython.lltypesystem.lltype import \
typeOf, Ptr, ContainerType, RttiStruct, \
RuntimeTypeInfo, getRuntimeTypeInfo, top_container
-from pypy.rpython.memory import gctransform
+from pypy.rpython.memory.gctransform import \
+ refcounting, boehm, framework, stacklessframework
from pypy.rpython.lltypesystem import lltype, llmemory
class BasicGcPolicy(object):
@@ -64,7 +65,7 @@
from pypy.rpython.objectmodel import CDefinedIntSymbolic
class RefcountingGcPolicy(BasicGcPolicy):
- transformerclass = gctransform.RefcountingGCTransformer
+ transformerclass = refcounting.RefcountingGCTransformer
def common_gcheader_definition(self, defnode):
if defnode.db.gctransformer is not None:
@@ -168,7 +169,7 @@
malloc_exact = False
class BoehmGcPolicy(BasicGcPolicy):
- transformerclass = gctransform.BoehmGCTransformer
+ transformerclass = boehm.BoehmGCTransformer
def setup_gcinfo(self, defnode):
transformer = defnode.db.gctransformer
@@ -372,7 +373,7 @@
class FrameworkGcPolicy(BasicGcPolicy):
- transformerclass = gctransform.FrameworkGCTransformer
+ transformerclass = framework.FrameworkGCTransformer
def struct_setup(self, structdefnode, rtti):
if rtti is not None and hasattr(rtti._obj, 'destructor_funcptr'):
@@ -424,5 +425,5 @@
malloc = zero_malloc
class StacklessFrameworkGcPolicy(FrameworkGcPolicy):
- transformerclass = gctransform.StacklessFrameworkGCTransformer
+ transformerclass = stacklessframework.StacklessFrameworkGCTransformer
requires_stackless = True
Modified: pypy/dist/pypy/translator/c/test/test_newgc.py
==============================================================================
--- pypy/dist/pypy/translator/c/test/test_newgc.py (original)
+++ pypy/dist/pypy/translator/c/test/test_newgc.py Mon Oct 9 16:06:01 2006
@@ -9,7 +9,6 @@
from pypy.rpython.lltypesystem import lltype, llmemory
from pypy.rpython.lltypesystem.lloperation import llop
from pypy.rpython.objectmodel import cast_weakgcaddress_to_object, cast_object_to_weakgcaddress
-from pypy.rpython.memory.gctransform import GCTransformer
from pypy import conftest
More information about the Pypy-commit
mailing list