Author: Armin Rigo <[email protected]>
Branch: stm-thread-2
Changeset: r58983:8dd73a83f074
Date: 2012-11-18 14:58 +0100
http://bitbucket.org/pypy/pypy/changeset/8dd73a83f074/
Log: Bah, fix.
diff --git a/pypy/rpython/memory/gc/stmtls.py b/pypy/rpython/memory/gc/stmtls.py
--- a/pypy/rpython/memory/gc/stmtls.py
+++ b/pypy/rpython/memory/gc/stmtls.py
@@ -113,13 +113,12 @@
# set_extra_threshold support
def set_extra_threshold(self, reserved_size):
- ll_assert(self.nursery_free != NULL,
- "set_extra_threshold: not in a transaction")
diff = reserved_size - self.extra_threshold
- if diff > 0 and self.nursery_free + diff > self.nursery_top:
- self.local_collection()
+ if self.nursery_top != NULL:
+ if diff > 0 and self.nursery_free + diff > self.nursery_top:
+ self.local_collection()
+ self.nursery_top -= diff
self.nursery_size -= diff
- self.nursery_top -= diff
self.extra_threshold += diff
# ------------------------------------------------------------
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
