Author: Christian Tismer <tis...@stackless.com> Branch: win64-stage1 Changeset: r53665:31e640687ce4 Date: 2012-03-14 20:41 -0700 http://bitbucket.org/pypy/pypy/changeset/31e640687ce4/
Log: merge default diff --git a/pypy/rlib/rzlib.py b/pypy/rlib/rzlib.py --- a/pypy/rlib/rzlib.py +++ b/pypy/rlib/rzlib.py @@ -1,6 +1,7 @@ from __future__ import with_statement import sys +from pypy.rlib import rgc from pypy.rlib.rstring import StringBuilder from pypy.rpython.lltypesystem import rffi, lltype from pypy.rpython.tool import rffi_platform @@ -236,6 +237,7 @@ compress data. """ stream = lltype.malloc(z_stream, flavor='raw', zero=True) + rgc.add_memory_pressure(rffi.sizeof(z_stream)) err = _deflateInit2(stream, level, method, wbits, memLevel, strategy) if err == Z_OK: return stream @@ -264,6 +266,7 @@ decompress data. """ stream = lltype.malloc(z_stream, flavor='raw', zero=True) + rgc.add_memory_pressure(rffi.sizeof(z_stream)) err = _inflateInit2(stream, wbits) if err == Z_OK: return stream _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit