[pypy-commit] pypy stm-gc: Ah bah.

arigo noreply at buildbot.pypy.org
Wed Apr 25 12:22:01 CEST 2012


Author: Armin Rigo <arigo at tunes.org>
Branch: stm-gc
Changeset: r54744:4920a633a5b5
Date: 2012-04-25 12:02 +0200
http://bitbucket.org/pypy/pypy/changeset/4920a633a5b5/

Log:	Ah bah.

diff --git a/pypy/module/transaction/interp_transaction.py b/pypy/module/transaction/interp_transaction.py
--- a/pypy/module/transaction/interp_transaction.py
+++ b/pypy/module/transaction/interp_transaction.py
@@ -120,16 +120,11 @@
         ec._transaction_pending.append(self)
 
     def run(self):
+        #if self.retry_counter > 0:
+        #    # retrying: will be done later, try others first
+        #    return [self]     # XXX does not work, will be retried immediately
+        #
         ec = self.space.getexecutioncontext()    # create it if needed
-        #
-        if self.retry_counter > 0:
-            # Note that even in this case we have to ensure the ec is
-            # created first.  Otherwise, if the first transaction of a
-            # thread is retrying, the creation of the ec is cancelled
-            # and we end up in register() with no ec...
-            self.register() # retrying: will be done later, try others first
-            return
-        #
         assert len(ec._transaction_pending) == 0
         #
         self.space.call_args(self.w_callback, self.args)


More information about the pypy-commit mailing list