[pypy-commit] pypy stmgc-c4: import stmgc/111c09337109

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c4
Changeset: r66927:131f1071ef10
Date: 2013-09-12 21:06 +0200
http://bitbucket.org/pypy/pypy/changeset/131f1071ef10/

Log:	import stmgc/111c09337109

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
@@ -1002,6 +1002,7 @@
   stm_invoke_callbacks_on_abort(d);
   stm_clear_callbacks_on_abort(d);
 
+  /* XXX */
   fprintf(stderr, "[%lx] abort %s\n",
           (long)d->public_descriptor_index, abort_names[num]);
   dprintf(("\n"
@@ -1537,6 +1538,9 @@
                 (XXX statically we should know when we're outside
                 a transaction) */
 
+  /* XXX */
+  fprintf(stderr, "[%lx] inevitable: %s\n",
+           (long)d->public_descriptor_index, why);
   dprintf(("[%lx] inevitable: %s\n",
            (long)d->public_descriptor_index, why));
 
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 @@
-4ed9ba1552f8
+111c09337109