Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r46141:5e69647bc0c2
Date: 2011-08-01 14:44 +0200
http://bitbucket.org/pypy/pypy/changeset/5e69647bc0c2/
Log: Backout changesets 1c74e688ab5b, 73cd9edd4a03, ae9804777ad3,
a5246fac14ee.
diff --git a/pypy/module/_rawffi/interp_rawffi.py
b/pypy/module/_rawffi/interp_rawffi.py
--- a/pypy/module/_rawffi/interp_rawffi.py
+++ b/pypy/module/_rawffi/interp_rawffi.py
@@ -268,7 +268,7 @@
self.ll_buffer = rffi.cast(rffi.VOIDP, address)
else:
self.ll_buffer = lltype.malloc(rffi.VOIDP.TO, size, flavor='raw',
- zero=True, track_allocation=False)
+ zero=True)
if tracker.DO_TRACING:
ll_buf = rffi.cast(lltype.Signed, self.ll_buffer)
tracker.trace_allocation(ll_buf, self)
@@ -291,7 +291,7 @@
if tracker.DO_TRACING:
ll_buf = rffi.cast(lltype.Signed, self.ll_buffer)
tracker.trace_free(ll_buf)
- lltype.free(self.ll_buffer, flavor='raw', track_allocation=False)
+ lltype.free(self.ll_buffer, flavor='raw')
self.ll_buffer = lltype.nullptr(rffi.VOIDP.TO)
def descr_buffer(self, space):
diff --git a/pypy/module/array/interp_array.py
b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -226,8 +226,7 @@
some += size >> 3
self.allocated = size + some
new_buffer = lltype.malloc(mytype.arraytype,
- self.allocated, flavor='raw',
- track_allocation=False)
+ self.allocated, flavor='raw')
for i in range(min(size, self.len)):
new_buffer[i] = self.buffer[i]
else:
@@ -239,7 +238,7 @@
new_buffer = lltype.nullptr(mytype.arraytype)
if self.buffer:
- lltype.free(self.buffer, flavor='raw', track_allocation=False)
+ lltype.free(self.buffer, flavor='raw')
self.buffer = new_buffer
self.len = size
diff --git a/pypy/module/micronumpy/interp_numarray.py
b/pypy/module/micronumpy/interp_numarray.py
--- a/pypy/module/micronumpy/interp_numarray.py
+++ b/pypy/module/micronumpy/interp_numarray.py
@@ -506,7 +506,7 @@
self._sliceloop2(start, stop, step, arr, self)
def __del__(self):
- lltype.free(self.storage, flavor='raw', track_allocation=False)
+ lltype.free(self.storage, flavor='raw')
def new_numarray(space, w_size_or_iterable):
l = space.listview(w_size_or_iterable)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
