Author: Armin Rigo <[email protected]>
Branch: stmgc-c4
Changeset: r66840:4cb6216967ca
Date: 2013-09-07 18:49 +0200
http://bitbucket.org/pypy/pypy/changeset/4cb6216967ca/
Log: import stmgc/782ebd6afc03
diff --git a/rpython/translator/stm/src_stm/extra.c
b/rpython/translator/stm/src_stm/extra.c
--- a/rpython/translator/stm/src_stm/extra.c
+++ b/rpython/translator/stm/src_stm/extra.c
@@ -26,6 +26,9 @@
void stm_call_on_abort(void *key, void callback(void *))
{
struct tx_descriptor *d = thread_descriptor;
+ if (d == NULL || d->active != 1)
+ return; /* ignore callbacks if we're outside a transaction or
+ in an inevitable transaction (which cannot abort) */
if (callback == NULL) {
/* ignore the return value: unregistered keys can be
"deleted" again */
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 @@
-4c80cba2b8ce
+782ebd6afc03
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
