[pypy-commit] lang-smalltalk stmgc-c7: stm: basis stm activation (primary transaction breaks)

[mswart]

Author: Malte Swart <malte.sw...@student.hpi.uni-potsdam.de>
Branch: stmgc-c7
Changeset: r812:77ddbd714cfb
Date: 2014-05-08 18:24 +0200
http://bitbucket.org/pypy/lang-smalltalk/changeset/77ddbd714cfb/

Log:    stm: basis stm activation (primary transaction breaks)

diff --git a/spyvm/interpreter.py b/spyvm/interpreter.py
--- a/spyvm/interpreter.py
+++ b/spyvm/interpreter.py
@@ -4,7 +4,7 @@
 from spyvm import model, constants, primitives, conftest, wrapper
 from spyvm.tool.bitmanipulation import splitter
 
-from rpython.rlib import jit
+from rpython.rlib import jit, rstm
 from rpython.rlib import objectmodel, unroll
 
 class MissingBytecode(Exception):
@@ -33,6 +33,7 @@
         greens=['pc', 'self', 'method'],
         reds=['s_context'],
         virtualizables=['s_context'],
+        stm_do_transaction_breaks=True,
         get_printable_location=get_printable_location
     )
 
@@ -111,6 +112,8 @@
                 if jit.we_are_jitted():
                     self.quick_check_for_interrupt(s_context,
                                     dec=self._get_adapted_tick_counter())
+                    if rstm.jit_stm_should_break_transaction(True):
+                        rstm.jit_stm_transaction_break_point()
                 self.jit_driver.can_enter_jit(
                     pc=pc, self=self, method=method,
                     s_context=s_context)
@@ -118,6 +121,8 @@
             self.jit_driver.jit_merge_point(
                 pc=pc, self=self, method=method,
                 s_context=s_context)
+            if rstm.jit_stm_should_break_transaction(False):
+                rstm.jit_stm_transaction_break_point()
             try:
                 self.step(s_context)
             except Return, nlr:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit