[pypy-commit] pypy stmgc-c7: import stmgc/903f2a6c1ed9

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r73779:baee254ae5d2
Date: 2014-10-05 11:53 +0200
http://bitbucket.org/pypy/pypy/changeset/baee254ae5d2/

Log:	import stmgc/903f2a6c1ed9

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 @@
-57b388129192
+903f2a6c1ed9
diff --git a/rpython/translator/stm/src_stm/stm/contention.c b/rpython/translator/stm/src_stm/stm/contention.c
--- a/rpython/translator/stm/src_stm/stm/contention.c
+++ b/rpython/translator/stm/src_stm/stm/contention.c
@@ -179,12 +179,16 @@
 
         dprintf(("pausing...\n"));
 
+        timing_event(STM_SEGMENT->running_thread, STM_WAIT_CONTENTION);
+
         cond_signal(C_AT_SAFE_POINT);
         STM_PSEGMENT->safe_point = SP_WAIT_FOR_C_TRANSACTION_DONE;
         cond_wait(C_TRANSACTION_DONE);
         STM_PSEGMENT->safe_point = SP_RUNNING;
         dprintf(("pausing done\n"));
 
+        timing_event(STM_SEGMENT->running_thread, STM_WAIT_DONE);
+
         if (must_abort())
             abort_with_mutex();
     }
@@ -202,6 +206,9 @@
            it does. */
         contmgr.other_pseg->pub.nursery_end = NSE_SIGABORT;
 
+        timing_event(STM_SEGMENT->running_thread,
+                     STM_ABORTING_OTHER_CONTENTION);
+
         int sp = contmgr.other_pseg->safe_point;
         switch (sp) {