[pypy-svn] r47626 - in pypy/dist/pypy/module: bz2 thread
fijal at codespeak.net
fijal at codespeak.net
Sat Oct 20 12:14:56 CEST 2007
Author: fijal
Date: Sat Oct 20 12:14:55 2007
New Revision: 47626
Modified:
pypy/dist/pypy/module/bz2/interp_bz2.py
pypy/dist/pypy/module/thread/ll_thread.py
Log:
Make this modules as well to use rffi_platform.COpaque
Modified: pypy/dist/pypy/module/bz2/interp_bz2.py
==============================================================================
--- pypy/dist/pypy/module/bz2/interp_bz2.py (original)
+++ pypy/dist/pypy/module/bz2/interp_bz2.py Sat Oct 20 12:14:55 2007
@@ -34,6 +34,9 @@
('bzfree', lltype.Ptr(_free_type)),
('opaque', rffi.VOIDP),
])
+ FILE = platform.COpaquePtr('FILE')
+ BZFILE = platform.COpaquePtr('BZFILE')
+
constants = {}
constant_names = ['BZ_RUN', 'BZ_FLUSH', 'BZ_FINISH', 'BZ_OK',
@@ -69,6 +72,8 @@
BZ_MEM_ERROR = cConfig.BZ_MEM_ERROR
BZ_UNEXPECTED_EOF = cConfig.BZ_UNEXPECTED_EOF
BZ_SEQUENCE_ERROR = cConfig.BZ_SEQUENCE_ERROR
+BZFILE = cConfig.BZFILE
+FILE = cConfig.FILE
if BUFSIZ < 8192:
SMALLCHUNK = 8192
@@ -100,9 +105,6 @@
return rffi.llexternal(name, args, result, includes=CConfig._includes_,
libraries=['bz2'])
-FILE = rffi.COpaquePtr('FILE')
-BZFILE = rffi.COpaquePtr('BZFILE')
-
# the least but one parameter should be rffi.VOIDP but it's not used
# so I trick the compiler to not complain about constanst pointer passed
# to void* arg
Modified: pypy/dist/pypy/module/thread/ll_thread.py
==============================================================================
--- pypy/dist/pypy/module/thread/ll_thread.py (original)
+++ pypy/dist/pypy/module/thread/ll_thread.py Sat Oct 20 12:14:55 2007
@@ -1,7 +1,7 @@
from pypy.rpython.lltypesystem import rffi
from pypy.rpython.lltypesystem import lltype
-from pypy.rpython.lltypesystem.rffi import platform
+from pypy.rpython.tool import rffi_platform as platform
from pypy.rpython.extfunc import genericcallable
from pypy.rpython.annlowlevel import cast_instance_to_base_ptr
from pypy.translator.tool.cbuild import cache_c_module
@@ -18,6 +18,7 @@
pypydir = py.path.local(pypydir)
c_dir = pypydir.join('translator', 'c')
includes = ['unistd.h', 'src/thread.h']
+include_dirs = [str(c_dir)]
def setup_thread_so():
# XXX this is quiiiiiiiite a hack!
@@ -36,7 +37,9 @@
c_thread_start = llexternal('RPyThreadStart', [CALLBACK, rffi.VOIDP], rffi.INT)
c_thread_get_ident = llexternal('RPyThreadGetIdent', [], rffi.INT)
-TLOCKP = rffi.COpaquePtr('struct RPyOpaque_ThreadLock', includes=includes)
+TLOCKP = platform.copaque('struct RPyOpaque_ThreadLock', '',
+ _includes_=includes,
+ _include_dirs_=include_dirs)
c_thread_lock_init = llexternal('RPyThreadLockInit', [TLOCKP], lltype.Void)
c_thread_acquirelock = llexternal('RPyThreadAcquireLock', [TLOCKP, rffi.INT],
More information about the Pypy-commit
mailing list