[pypy-commit] pypy stmgc-c8: import stmgc/0ef378d2da3d

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c8
Changeset: r78197:8f3dbb28a3a3
Date: 2015-06-19 00:29 +0200
http://bitbucket.org/pypy/pypy/changeset/8f3dbb28a3a3/

Log:	import stmgc/0ef378d2da3d

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 @@
-277dd2ad5226
+0ef378d2da3d
diff --git a/rpython/translator/stm/src_stm/stm/queue.c b/rpython/translator/stm/src_stm/stm/queue.c
--- a/rpython/translator/stm/src_stm/stm/queue.c
+++ b/rpython/translator/stm/src_stm/stm/queue.c
@@ -387,6 +387,7 @@
 static void collect_active_queues(void)
 {
     wlog_t *item;
+    queue_lock_acquire();
     TREE_LOOP_FORWARD(STM_PSEGMENT->active_queues, item) {
         /* it is enough to trace the objects added in the current
            transaction.  All other objects reachable from the queue
@@ -406,4 +407,5 @@
             seg->added_young_limit = seg->added_in_this_transaction;
         }
     } TREE_LOOP_END;
+    queue_lock_release();
 }