[pypy-commit] stmgc c8-marker: hg merge default

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: c8-marker
Changeset: r1701:4b7e576c7437
Date: 2015-03-09 08:51 +0100
http://bitbucket.org/pypy/stmgc/changeset/4b7e576c7437/

Log:	hg merge default

diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -508,6 +508,10 @@
                 break;   /* success! */
         } else if (old->next == INEV_RUNNING) {
             /* we failed because there is an INEV transaction running */
+            /* XXXXXX for now just sleep (XXX with the lock acquired?
+               isn't it a bad idea?).  We should really ask to inev
+               transaction to do the commit for us, and then we can
+               continue running. */
             usleep(10);
         }