Author: Hubert Hesse <[email protected]>
Branch: stmgc-c7
Changeset: r834:f0e2abc44f4f
Date: 2014-05-18 00:27 +0200
http://bitbucket.org/pypy/lang-smalltalk/changeset/f0e2abc44f4f/
Log: Do correct forking after STMForkExecption
diff --git a/spyvm/interpreter.py b/spyvm/interpreter.py
--- a/spyvm/interpreter.py
+++ b/spyvm/interpreter.py
@@ -258,7 +258,7 @@
s_context.push(nlr.value)
except STMForkException as fork_exception:
print "Fork requested"
- #self.fork_interpreter_thread(fork_exception.w_frame,
fork_exception.w_stm_process)
+ self.fork_interpreter_thread(fork_exception.w_frame,
fork_exception.w_stm_process)
def _get_adapted_tick_counter(self):
# Normally, the tick counter is decremented by 1 for every message
send.
diff --git a/spyvm/primitives.py b/spyvm/primitives.py
--- a/spyvm/primitives.py
+++ b/spyvm/primitives.py
@@ -1470,8 +1470,8 @@
print "STM_FORK primitive called"
- #wrapper.StmProcessWrapper(interp.space, w_rcvr).fork(s_frame.w_self())
- #rstm.should_break_transaction()
+ wrapper.StmProcessWrapper(interp.space, w_rcvr).fork(s_frame.w_self())
+ rstm.should_break_transaction()
# ___________________________________________________________________________
# BlockClosure Primitives
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
