[pypy-commit] pypy stmgc-static-barrier: import stmgc/c83f63e68ab7

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-static-barrier
Changeset: r66298:fa5432ef32cf
Date: 2013-08-22 22:21 +0200
http://bitbucket.org/pypy/pypy/changeset/fa5432ef32cf/

Log:	import stmgc/c83f63e68ab7

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
@@ -1006,6 +1006,7 @@
 
 static void init_transaction(struct tx_descriptor *d)
 {
+  assert(d->atomic == 0);
   assert(d->active == 0);
   stm_start_sharedlock();
   assert(d->active == 0);
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 @@
-e14cbe1e040b
+c83f63e68ab7
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
@@ -164,6 +164,7 @@
     stm_shadowstack = v_saved_value + 2;   /*skip the two values pushed above*/
 
     do {
+        v_atomic = d->atomic;
         v_counter = counter + 1;
         /* If counter==0, initialize 'reads_size_limit_nonatomic' from the
            configured length limit.  If counter>0, we did an abort, which
@@ -193,7 +194,6 @@
         result = callback(arg, counter);
         assert(stm_shadowstack == v_saved_value + 2);
 
-        v_atomic = d->atomic;
         if (!d->atomic)
             CommitTransaction();