Author: Amaury Forgeot d'Arc <[email protected]>
Branch: kill-faking
Changeset: r59295:ef8ae87e18b3
Date: 2012-12-03 22:39 +0100
http://bitbucket.org/pypy/pypy/changeset/ef8ae87e18b3/
Log: Fix when bin/py.py calls posix.fork() and the cpyext module is
loaded.
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/api.py
@@ -639,7 +639,7 @@
TP, compilation_info=eci)
globals()['va_get_%s' % name_no_star] = func
-def setup_init_functions(eci):
+def setup_init_functions(eci, translating):
init_buffer = rffi.llexternal('init_bufferobject', [], lltype.Void,
compilation_info=eci, _nowrapper=True)
init_pycobject = rffi.llexternal('init_pycobject', [], lltype.Void,
@@ -652,8 +652,12 @@
lambda space: init_capsule(),
])
from pypy.module.posix.interp_posix import add_fork_hook
- reinit_tls = rffi.llexternal('PyThread_ReInitTLS', [], lltype.Void,
- compilation_info=eci)
+ if translating:
+ reinit_tls = rffi.llexternal('PyThread_ReInitTLS', [], lltype.Void,
+ compilation_info=eci)
+ else:
+ reinit_tls = rffi.llexternal('PyPyThread_ReInitTLS', [], lltype.Void,
+ compilation_info=eci)
add_fork_hook('child', reinit_tls)
def init_function(func):
@@ -805,7 +809,7 @@
setup_va_functions(eci)
- setup_init_functions(eci)
+ setup_init_functions(eci, translating=False)
return modulename.new(ext='')
def generate_macros(export_symbols, rename=True, do_deref=True):
@@ -1021,7 +1025,7 @@
deco = entrypoint("cpyext", func.argtypes, name, relax=True)
deco(func.get_wrapper(space))
- setup_init_functions(eci)
+ setup_init_functions(eci, translating=True)
trunk_include = pypydir.dirpath() / 'include'
copy_header_files(trunk_include)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
