Author: Armin Rigo <ar...@tunes.org>
Branch: stmgc-c7
Changeset: r69888:69a3715048f7
Date: 2014-03-12 09:36 +0100
http://bitbucket.org/pypy/pypy/changeset/69a3715048f7/
Log: Fixes for test_start_thread
diff --git a/rpython/rtyper/lltypesystem/lloperation.py
b/rpython/rtyper/lltypesystem/lloperation.py
--- a/rpython/rtyper/lltypesystem/lloperation.py
+++ b/rpython/rtyper/lltypesystem/lloperation.py
@@ -427,18 +427,19 @@
'stm_become_inevitable': LLOp(canmallocgc=True),
'stm_push_root': LLOp(),
'stm_pop_root_into': LLOp(),
- 'stm_commit_transaction': LLOp(canmallocgc=True),
- 'stm_start_inevitable_transaction': LLOp(canmallocgc=True),
- 'stm_enter_callback_call':LLOp(canmallocgc=True),
- 'stm_leave_callback_call':LLOp(),
- 'stm_should_break_transaction': LLOp(sideeffects=False),
- 'stm_set_transaction_length': LLOp(),
+ 'stm_commit_if_not_atomic': LLOp(canmallocgc=True),
+ 'stm_start_inevitable_if_not_atomic': LLOp(canmallocgc=True),
+ 'stm_enter_callback_call': LLOp(canmallocgc=True),
+ 'stm_leave_callback_call': LLOp(),
+ 'stm_perform_transaction': LLOp(canmallocgc=True),
+ 'stm_should_break_transaction': LLOp(sideeffects=False),
+ 'stm_set_transaction_length': LLOp(),
+
'stm_threadlocalref_get': LLOp(sideeffects=False),
'stm_threadlocalref_set': LLOp(canmallocgc=True), # may allocate new array,
# see threadlocalref.py
'stm_threadlocal_get': LLOp(sideeffects=False),
'stm_threadlocal_set': LLOp(),
- 'stm_perform_transaction':LLOp(canmallocgc=True),
## 'stm_allocate_nonmovable_int_adr': LLOp(sideeffects=False,
canmallocgc=True),
## 'stm_become_inevitable': LLOp(canmallocgc=True),
diff --git a/rpython/translator/stm/test/test_ztranslated.py
b/rpython/translator/stm/test/test_ztranslated.py
--- a/rpython/translator/stm/test/test_ztranslated.py
+++ b/rpython/translator/stm/test/test_ztranslated.py
@@ -71,8 +71,8 @@
glob.seen = None
rthread.start_new_thread(threadfn, ())
while glob.seen is None:
- llop.stm_commit_transaction(lltype.Void)
- llop.stm_start_inevitable_transaction(lltype.Void)
+ llop.stm_commit_if_not_atomic(lltype.Void)
+ llop.stm_start_inevitable_if_not_atomic(lltype.Void)
return glob.seen.value
#
t, cbuilder = self.compile(entry_point)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
