Author: Armin Rigo <[email protected]>
Branch: stmgc-c4
Changeset: r66911:0b21653c6034
Date: 2013-09-11 20:26 +0200
http://bitbucket.org/pypy/pypy/changeset/0b21653c6034/
Log: import stmgc/c5636881b4d5
diff --git a/rpython/translator/stm/src_stm/et.c
b/rpython/translator/stm/src_stm/et.c
--- a/rpython/translator/stm/src_stm/et.c
+++ b/rpython/translator/stm/src_stm/et.c
@@ -1534,8 +1534,8 @@
(XXX statically we should know when we're outside
a transaction) */
- fprintf(stderr, "[%lx] inevitable: %s\n",
- (long)d->public_descriptor_index, why);
+ dprintf(("[%lx] inevitable: %s\n",
+ (long)d->public_descriptor_index, why));
cur_time = acquire_inev_mutex_and_mark_global_cur_time(d);
if (d->start_time != cur_time)
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 @@
-983af03354a5
+c5636881b4d5
diff --git a/rpython/translator/stm/src_stm/stmsync.c
b/rpython/translator/stm/src_stm/stmsync.c
--- a/rpython/translator/stm/src_stm/stmsync.c
+++ b/rpython/translator/stm/src_stm/stmsync.c
@@ -219,6 +219,8 @@
struct tx_descriptor *d = thread_descriptor;
if (!d->atomic)
CommitTransaction();
+ else
+ BecomeInevitable("stm_commit_transaction but atomic");
}
void stm_begin_inevitable_transaction(void)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
