Author: Armin Rigo <[email protected]>
Branch: stm-thread-2
Changeset: r61236:5b24155f6506
Date: 2013-02-14 14:04 +0000
http://bitbucket.org/pypy/pypy/changeset/5b24155f6506/
Log: Fix imports
diff --git a/rpython/rtyper/memory/gc/stmgc.py
b/rpython/rtyper/memory/gc/stmgc.py
--- a/rpython/rtyper/memory/gc/stmgc.py
+++ b/rpython/rtyper/memory/gc/stmgc.py
@@ -7,7 +7,6 @@
from rpython.rlib.rarithmetic import LONG_BIT, r_uint
from rpython.rlib.debug import ll_assert, debug_start, debug_stop, fatalerror
from rpython.rlib.debug import debug_print
-from pypy.module.thread import ll_thread
WORD = LONG_BIT // 8
diff --git a/rpython/translator/stm/test/targetjit1.py
b/rpython/translator/stm/test/targetjit1.py
--- a/rpython/translator/stm/test/targetjit1.py
+++ b/rpython/translator/stm/test/targetjit1.py
@@ -1,5 +1,4 @@
-from pypy.module.thread import ll_thread
-from rpython.rlib import jit, rstm
+from rpython.rlib import jit, rstm, rthread
from rpython.rlib.objectmodel import invoke_around_extcall
@@ -48,7 +47,7 @@
def __init__(self, i):
self.index = i
self.value = 0
- self.finished_lock = ll_thread.allocate_lock()
+ self.finished_lock = rthread.allocate_lock()
self.finished_lock.acquire(True)
def run(self):
@@ -78,7 +77,7 @@
@staticmethod
def setup():
if bootstrapper.lock is None:
- bootstrapper.lock = ll_thread.allocate_lock()
+ bootstrapper.lock = rthread.allocate_lock()
@staticmethod
def reinit():
@@ -94,14 +93,14 @@
# Note that when this runs, we already hold the GIL. This is ensured
# by rffi's callback mecanism: we are a callback for the
# c_thread_start() external function.
- ll_thread.gc_thread_start()
+ rthread.gc_thread_start()
args = bootstrapper.args
bootstrapper.release()
# run!
try:
args.run()
finally:
- ll_thread.gc_thread_die()
+ rthread.gc_thread_die()
@staticmethod
def acquire(args):
@@ -130,8 +129,8 @@
def start_thread(args):
bootstrapper.acquire(args)
try:
- ll_thread.gc_thread_prepare() # (this has no effect any more)
- ident = ll_thread.start_new_thread(bootstrapper.bootstrap, ())
+ rthread.gc_thread_prepare() # (this has no effect any more)
+ ident = rthread.start_new_thread(bootstrapper.bootstrap, ())
except Exception, e:
bootstrapper.release() # normally called by the new thread
raise
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
