Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r46138:650824ea845a
Date: 2011-08-01 13:32 +0200
http://bitbucket.org/pypy/pypy/changeset/650824ea845a/
Log: merge
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
@@ -239,7 +239,7 @@
new_buffer = lltype.nullptr(mytype.arraytype)
if self.buffer:
- lltype.free(self.buffer, flavor='raw')
+ lltype.free(self.buffer, flavor='raw', track_allocation=False)
self.buffer = new_buffer
self.len = size
diff --git a/pypy/rpython/memory/gc/test/test_minimark.py
b/pypy/rpython/memory/gc/test/test_minimark.py
--- a/pypy/rpython/memory/gc/test/test_minimark.py
+++ b/pypy/rpython/memory/gc/test/test_minimark.py
@@ -34,6 +34,7 @@
growth_rate_max=1.5)
gc.min_heap_size = 100.0
gc.max_heap_size = 300.0
+ gc.next_major_collection_initial = 0.0
gc.next_major_collection_threshold = 0.0
# first, we don't grow past min_heap_size
for i in range(5):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
