Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r71266:df6ec66d4ecb
Date: 2014-05-04 21:03 +0200
http://bitbucket.org/pypy/pypy/changeset/df6ec66d4ecb/
Log: import stmgc/84f5fbe03d5d
diff --git a/rpython/translator/stm/src_stm/revision
b/rpython/translator/stm/src_stm/revision
--- a/rpython/translator/stm/src_stm/revision
+++ b/rpython/translator/stm/src_stm/revision
@@ -1,1 +1,1 @@
-822e52f17647
+84f5fbe03d5d
diff --git a/rpython/translator/stm/src_stm/stm/nursery.c
b/rpython/translator/stm/src_stm/stm/nursery.c
--- a/rpython/translator/stm/src_stm/stm/nursery.c
+++ b/rpython/translator/stm/src_stm/stm/nursery.c
@@ -306,6 +306,12 @@
STM_PSEGMENT->minor_collect_will_commit_now = commit;
if (!commit) {
+ /* We should commit soon, probably. This is kind of a
+ workaround for the broken stm_should_break_transaction of
+ pypy that doesn't want to commit any more after a minor
+ collection. It may, however, always be a good idea... */
+ stmcb_commit_soon();
+
/* 'STM_PSEGMENT->overflow_number' is used now by this collection,
in the sense that it's copied to the overflow objects */
STM_PSEGMENT->overflow_number_has_been_used = true;
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
