[pypy-commit] pypy stm-gc: Comment, and kill outdated method (see start_transaction() in

arigo noreply at buildbot.pypy.org
Sat Apr 28 11:27:52 CEST 2012


Author: Armin Rigo <arigo at tunes.org>
Branch: stm-gc
Changeset: r54787:7d05feb1fc7c
Date: 2012-04-28 10:58 +0200
http://bitbucket.org/pypy/pypy/changeset/7d05feb1fc7c/

Log:	Comment, and kill outdated method (see start_transaction() in the
	class StmShadowStackRootWalker).

diff --git a/pypy/rlib/rstm.py b/pypy/rlib/rstm.py
--- a/pypy/rlib/rstm.py
+++ b/pypy/rlib/rstm.py
@@ -146,6 +146,9 @@
 def _stm_run_transaction(transactionptr, retry_counter):
     #
     # Tell the GC we are starting a transaction
+    # (at this point, we have no stack root at all; the following
+    # call will clear any remaining garbage from the shadowstack,
+    # in case of an aborted transaction)
     llop.stm_start_transaction(lltype.Void)
     #
     # Now we can use the GC
diff --git a/pypy/rpython/memory/gctransform/stmframework.py b/pypy/rpython/memory/gctransform/stmframework.py
--- a/pypy/rpython/memory/gctransform/stmframework.py
+++ b/pypy/rpython/memory/gctransform/stmframework.py
@@ -198,9 +198,3 @@
         self.rootstackhook(collect_stack_root, arg,
                            stackgcdata.root_stack_base,
                            stackgcdata.root_stack_top)
-
-    def clear_current_stack_roots(self):
-        """Used when we start a transaction: there might be garbage left
-        behind by the previous aborted transaction."""
-        stackgcdata = self.stackgcdata
-        stackgcdata.root_stack_top = stackgcdata.root_stack_base


More information about the pypy-commit mailing list