Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r70393:eec6a7eac1a7
Date: 2014-04-02 13:04 +0200
http://bitbucket.org/pypy/pypy/changeset/eec6a7eac1a7/
Log: import stmgc/ba29f5ab1dcd
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 @@
-a8d0ff724dea
+ba29f5ab1dcd
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
@@ -684,6 +684,10 @@
STM_SEGMENT->jmpbuf_ptr = NULL;
clear_callbacks_on_abort();
}
+ else {
+ assert(STM_PSEGMENT->transaction_state == TS_INEVITABLE);
+ assert(STM_SEGMENT->jmpbuf_ptr == NULL);
+ }
s_mutex_unlock();
}
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
