Author: Armin Rigo <ar...@tunes.org>
Branch: rgc-mem-pressure
Changeset: r48114:0ec2ab675a61
Date: 2011-10-17 10:38 +0200
http://bitbucket.org/pypy/pypy/changeset/0ec2ab675a61/
Log: Fixes (untested).
diff --git a/pypy/rpython/memory/gctransform/transform.py
b/pypy/rpython/memory/gctransform/transform.py
--- a/pypy/rpython/memory/gctransform/transform.py
+++ b/pypy/rpython/memory/gctransform/transform.py
@@ -559,8 +559,8 @@
def gct_malloc_nonmovable_varsize(self, *args, **kwds):
return self.gct_malloc_varsize(*args, **kwds)
- def gct_add_memory_pressure(self, hop):
- if hasattr(self, 'add_memory_pressure_ptr'):
+ def gct_gc_add_memory_pressure(self, hop):
+ if hasattr(self, 'raw_malloc_memory_pressure_ptr'):
op = hop.spaceop
size = op.args[0]
hop.genop("direct_call",
diff --git a/pypy/rpython/memory/gcwrapper.py b/pypy/rpython/memory/gcwrapper.py
--- a/pypy/rpython/memory/gcwrapper.py
+++ b/pypy/rpython/memory/gcwrapper.py
@@ -66,7 +66,8 @@
return result
def add_memory_pressure(self, size):
- self.gc.add_memory_pressure(self)
+ if hasattr(self.gc, 'raw_malloc_memory_pressure'):
+ self.gc.raw_malloc_memory_pressure(self)
def shrink_array(self, p, smallersize):
if hasattr(self.gc, 'shrink_array'):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
