Author: Remi Meier
Branch: c7-refactor
Changeset: r769:c50e88e2b09f
Date: 2014-02-18 16:23 +0100
http://bitbucket.org/pypy/stmgc/changeset/c50e88e2b09f/
Log: more info in output
diff --git a/c7/test/test_random.py b/c7/test/test_random.py
--- a/c7/test/test_random.py
+++ b/c7/test/test_random.py
@@ -153,20 +153,26 @@
class GlobalState(object):
- def __init__(self, rnd):
+ def __init__(self, ex, rnd):
+ self.ex = ex
self.rnd = rnd
self.thread_states = []
self.shared_roots = []
self.committed_transaction_state = TransactionState(0)
def push_state_to_other_threads(self, tr_state):
+ assert not tr_state.must_abort
for ts in self.thread_states:
other_trs = ts.transaction_state
if other_trs is None or other_trs is tr_state:
continue
other_trs.update_from_committed(tr_state, only_new=True)
+ if tr_state.must_abort:
+ self.ex.do('# conflict while pushing to other threads')
+
def check_for_write_write_conflicts(self, tr_state):
+ assert not tr_state.must_abort
for ts in self.thread_states:
other_trs = ts.transaction_state
if other_trs is None or other_trs is tr_state:
@@ -174,8 +180,12 @@
if other_trs.write_set & tr_state.write_set:
contention_management(tr_state, other_trs, True)
+
+ if tr_state.must_abort:
+ self.ex.do('# write-write conflict')
def check_for_write_read_conflicts(self, tr_state):
+ assert not tr_state.must_abort
for ts in self.thread_states:
other_trs = ts.transaction_state
if other_trs is None or other_trs is tr_state:
@@ -183,6 +193,9 @@
if other_trs.read_set & tr_state.write_set:
contention_management(tr_state, other_trs)
+
+ if tr_state.must_abort:
+ self.ex.do('# write-read conflict')
# ========== STM OPERATIONS ==========
@@ -271,9 +284,15 @@
N_OBJECTS = 5
N_THREADS = 2
ex = Exec(self)
+ ex.do("""
+################################################################
+################################################################
+################################################################
+################################################################
+ """)
ex.do('# initialization')
- global_state = GlobalState(rnd)
+ global_state = GlobalState(ex, rnd)
for i in range(N_THREADS):
global_state.thread_states.append(
ThreadState(i, global_state))
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
