Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r70174:12e6d39bdeea
Date: 2014-03-22 20:43 +0100
http://bitbucket.org/pypy/pypy/changeset/12e6d39bdeea/
Log: import stmgc/a33130d9f35c
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 @@
-a5f0a9669efe
+a33130d9f35c
diff --git a/rpython/translator/stm/src_stm/stm/contention.c
b/rpython/translator/stm/src_stm/stm/contention.c
--- a/rpython/translator/stm/src_stm/stm/contention.c
+++ b/rpython/translator/stm/src_stm/stm/contention.c
@@ -131,6 +131,7 @@
else if (STM_PSEGMENT->transaction_state == TS_INEVITABLE) {
assert(contmgr.other_pseg->transaction_state != TS_INEVITABLE);
contmgr.abort_other = true;
+ contmgr.try_sleep = false;
}
else if (contmgr.other_pseg->transaction_state == TS_INEVITABLE) {
contmgr.abort_other = false;
diff --git a/rpython/translator/stm/src_stm/stm/core.c
b/rpython/translator/stm/src_stm/stm/core.c
--- a/rpython/translator/stm/src_stm/stm/core.c
+++ b/rpython/translator/stm/src_stm/stm/core.c
@@ -192,9 +192,9 @@
STM_PSEGMENT->shadowstack_at_start_of_transaction = tl->shadowstack;
STM_PSEGMENT->threadlocal_at_start_of_transaction = tl->thread_local_obj;
+ enter_safe_point_if_requested();
dprintf(("start_transaction\n"));
- enter_safe_point_if_requested();
s_mutex_unlock();
/* Now running the SP_RUNNING start. We can set our
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
