Author: Remi Meier <[email protected]>
Branch:
Changeset: r1566:fb965316ef58
Date: 2015-01-21 17:24 +0100
http://bitbucket.org/pypy/stmgc/changeset/fb965316ef58/
Log: undo bogus change so we actually do major collections again
diff --git a/c8/stm/nursery.c b/c8/stm/nursery.c
--- a/c8/stm/nursery.c
+++ b/c8/stm/nursery.c
@@ -315,13 +315,19 @@
void stm_collect(long level)
{
- if (level > 0) {
+ if (level > 0)
force_major_collection_request();
- minor_collection(/*commit=*/ false);
+
+ minor_collection(/*commit=*/ false);
+
+#ifdef STM_TESTS
+ /* tests don't want aborts in stm_allocate, thus
+ we only do major collections if explicitly requested */
+ if (level > 0)
major_collection_if_requested();
- } else {
- minor_collection(/*commit=*/ false);
- }
+#else
+ major_collection_if_requested();
+#endif
}
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
