Author: Armin Rigo <[email protected]>
Branch: stm-thread-2
Changeset: r60775:7036ba94afef
Date: 2013-01-31 15:18 +0100
http://bitbucket.org/pypy/pypy/changeset/7036ba94afef/
Log: More import fixes
diff --git a/rpython/translator/stm/jitdriver.py
b/rpython/translator/stm/jitdriver.py
--- a/rpython/translator/stm/jitdriver.py
+++ b/rpython/translator/stm/jitdriver.py
@@ -7,7 +7,7 @@
from rpython.rtyper.annlowlevel import (MixLevelHelperAnnotator,
cast_base_ptr_to_instance)
from rpython.rlib import rstm
-from pypy.tool.sourcetools import compile2
+from rpython.tool.sourcetools import compile2
def find_jit_merge_point(graph):
diff --git a/rpython/translator/stm/stmgcintf.py
b/rpython/translator/stm/stmgcintf.py
--- a/rpython/translator/stm/stmgcintf.py
+++ b/rpython/translator/stm/stmgcintf.py
@@ -1,12 +1,11 @@
-import py
-from pypy.tool.autopath import pypydir
+import py, os
from rpython.rtyper.lltypesystem import lltype, llmemory, rffi
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rpython.rlib.rarithmetic import LONG_BIT
+from rpython.conftest import cdir as cdir2
-cdir = py.path.local(pypydir) / 'translator' / 'stm'
-cdir2 = py.path.local(pypydir) / 'translator' / 'c'
+cdir = os.path.abspath(os.path.join(cdir2, '..', 'stm'))
eci = ExternalCompilationInfo(
include_dirs = [cdir, cdir2],
diff --git a/rpython/translator/stm/test/targetdemo2.py
b/rpython/translator/stm/test/targetdemo2.py
--- a/rpython/translator/stm/test/targetdemo2.py
+++ b/rpython/translator/stm/test/targetdemo2.py
@@ -1,5 +1,5 @@
import time
-from pypy.module.thread import ll_thread
+from rpython.rlib import rthread
from rpython.rlib import rstm, jit
from rpython.rlib.objectmodel import invoke_around_extcall, we_are_translated
from rpython.rlib.objectmodel import compute_identity_hash
@@ -76,7 +76,7 @@
def __init__(self, i):
self.index = i
- self.finished_lock = ll_thread.allocate_lock()
+ self.finished_lock = rthread.allocate_lock()
self.finished_lock.acquire(True)
def run(self):
@@ -198,7 +198,7 @@
@staticmethod
def setup():
if bootstrapper.lock is None:
- bootstrapper.lock = ll_thread.allocate_lock()
+ bootstrapper.lock = rthread.allocate_lock()
@staticmethod
def reinit():
@@ -213,14 +213,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):
@@ -249,8 +249,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
diff --git a/rpython/translator/stm/test/test_inevitable.py
b/rpython/translator/stm/test/test_inevitable.py
--- a/rpython/translator/stm/test/test_inevitable.py
+++ b/rpython/translator/stm/test/test_inevitable.py
@@ -3,7 +3,7 @@
from rpython.rtyper.test import test_llinterp
from rpython.rtyper.test.test_llinterp import get_interpreter, clear_tcache
from rpython.translator.stm.inevitable import insert_turn_inevitable
-from pypy.conftest import option
+from rpython.conftest import option
class LLSTMInevFrame(LLFrame):
diff --git a/rpython/translator/stm/test/test_stmgcintf.py
b/rpython/translator/stm/test/test_stmgcintf.py
--- a/rpython/translator/stm/test/test_stmgcintf.py
+++ b/rpython/translator/stm/test/test_stmgcintf.py
@@ -1,12 +1,11 @@
import os
-from pypy.tool import autopath
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
def test_all():
executable = str(udir.join('test_stmgcintf'))
prevdir = os.getcwd()
- thisdir = os.path.join(autopath.pypydir, 'translator', 'stm', 'test')
+ thisdir = os.path.dirname(__file__)
try:
os.chdir(thisdir)
exitcode = os.system(
diff --git a/rpython/translator/stm/test/transform2_support.py
b/rpython/translator/stm/test/transform2_support.py
--- a/rpython/translator/stm/test/transform2_support.py
+++ b/rpython/translator/stm/test/transform2_support.py
@@ -3,7 +3,7 @@
from rpython.rtyper.test.test_llinterp import get_interpreter, clear_tcache
from rpython.translator.stm.transform2 import STMTransformer
from rpython.translator.stm.writebarrier import MORE_PRECISE_CATEGORIES
-from pypy.conftest import option
+from rpython.conftest import option
class _stmptr(lltype._ptr):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
