Author: Wim Lavrijsen <[email protected]>
Branch: reflex-support
Changeset: r54018:fd1ecb74a56e
Date: 2012-03-26 19:20 -0700
http://bitbucket.org/pypy/pypy/changeset/fd1ecb74a56e/
Log: do not release the GIL when calling into CINT to allow TPython
callbacks
diff --git a/pypy/module/cppyy/capi/__init__.py
b/pypy/module/cppyy/capi/__init__.py
--- a/pypy/module/cppyy/capi/__init__.py
+++ b/pypy/module/cppyy/capi/__init__.py
@@ -5,6 +5,7 @@
#import cint_capi as backend
identify = backend.identify
+threadsafe = backend.threadsafe
_C_OPAQUE_PTR = rffi.LONG
_C_OPAQUE_NULL = lltype.nullptr(rffi.LONGP.TO)# ALT: _C_OPAQUE_PTR.TO
@@ -36,92 +37,112 @@
_c_resolve_name = rffi.llexternal(
"cppyy_resolve_name",
[rffi.CCHARP], rffi.CCHARP,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
def c_resolve_name(cppitem_name):
return charp2str_free(_c_resolve_name(cppitem_name))
c_get_scope = rffi.llexternal(
"cppyy_get_scope",
[rffi.CCHARP], C_SCOPE,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_get_template = rffi.llexternal(
"cppyy_get_template",
[rffi.CCHARP], C_TYPE,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_get_object_type = rffi.llexternal(
"cppyy_get_object_type",
[C_TYPE, C_OBJECT], C_TYPE,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
# memory management ----------------------------------------------------------
c_allocate = rffi.llexternal(
"cppyy_allocate",
[C_TYPE], C_OBJECT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_deallocate = rffi.llexternal(
"cppyy_deallocate",
[C_TYPE, C_OBJECT], lltype.Void,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_destruct = rffi.llexternal(
"cppyy_destruct",
[C_TYPE, C_OBJECT], lltype.Void,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
# method/function dispatching ------------------------------------------------
c_call_v = rffi.llexternal(
"cppyy_call_v",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], lltype.Void,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_call_b = rffi.llexternal(
"cppyy_call_b",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.INT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_call_c = rffi.llexternal(
"cppyy_call_c",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.CHAR,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_call_h = rffi.llexternal(
"cppyy_call_h",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.SHORT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_call_i = rffi.llexternal(
"cppyy_call_i",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.INT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_call_l = rffi.llexternal(
"cppyy_call_l",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.LONG,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_call_f = rffi.llexternal(
"cppyy_call_f",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.DOUBLE,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_call_d = rffi.llexternal(
"cppyy_call_d",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.DOUBLE,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_call_r = rffi.llexternal(
"cppyy_call_r",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.VOIDP,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_call_s = rffi.llexternal(
"cppyy_call_s",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.CCHARP,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_constructor = rffi.llexternal(
"cppyy_constructor",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], lltype.Void,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_call_o = rffi.llexternal(
"cppyy_call_o",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP, C_TYPE], rffi.LONG,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_get_methptr_getter = rffi.llexternal(
"cppyy_get_methptr_getter",
[C_SCOPE, rffi.INT], C_METHPTRGETTER_PTR,
+ threadsafe=threadsafe,
compilation_info=backend.eci,
elidable_function=True)
@@ -129,19 +150,23 @@
c_allocate_function_args = rffi.llexternal(
"cppyy_allocate_function_args",
[rffi.SIZE_T], rffi.VOIDP,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_deallocate_function_args = rffi.llexternal(
"cppyy_deallocate_function_args",
[rffi.VOIDP], lltype.Void,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_function_arg_sizeof = rffi.llexternal(
"cppyy_function_arg_sizeof",
[], rffi.SIZE_T,
+ threadsafe=threadsafe,
compilation_info=backend.eci,
elidable_function=True)
c_function_arg_typeoffset = rffi.llexternal(
"cppyy_function_arg_typeoffset",
[], rffi.SIZE_T,
+ threadsafe=threadsafe,
compilation_info=backend.eci,
elidable_function=True)
@@ -149,36 +174,43 @@
c_is_namespace = rffi.llexternal(
"cppyy_is_namespace",
[C_SCOPE], rffi.INT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_is_enum = rffi.llexternal(
"cppyy_is_enum",
[rffi.CCHARP], rffi.INT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
# type/class reflection information ------------------------------------------
_c_final_name = rffi.llexternal(
"cppyy_final_name",
[C_TYPE], rffi.CCHARP,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
def c_final_name(cpptype):
return charp2str_free(_c_final_name(cpptype))
_c_scoped_final_name = rffi.llexternal(
"cppyy_scoped_final_name",
[C_TYPE], rffi.CCHARP,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
def c_scoped_final_name(cpptype):
return charp2str_free(_c_scoped_final_name(cpptype))
c_has_complex_hierarchy = rffi.llexternal(
"cppyy_has_complex_hierarchy",
[C_TYPE], rffi.INT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_num_bases = rffi.llexternal(
"cppyy_num_bases",
[C_TYPE], rffi.INT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
_c_base_name = rffi.llexternal(
"cppyy_base_name",
[C_TYPE, rffi.INT], rffi.CCHARP,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
def c_base_name(cpptype, base_index):
return charp2str_free(_c_base_name(cpptype, base_index))
@@ -186,6 +218,7 @@
_c_is_subtype = rffi.llexternal(
"cppyy_is_subtype",
[C_TYPE, C_TYPE], rffi.INT,
+ threadsafe=threadsafe,
compilation_info=backend.eci,
elidable_function=True)
@@ -198,6 +231,7 @@
_c_base_offset = rffi.llexternal(
"cppyy_base_offset",
[C_TYPE, C_TYPE, C_OBJECT], rffi.SIZE_T,
+ threadsafe=threadsafe,
compilation_info=backend.eci,
elidable_function=True)
@@ -211,36 +245,43 @@
c_num_methods = rffi.llexternal(
"cppyy_num_methods",
[C_SCOPE], rffi.INT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
_c_method_name = rffi.llexternal(
"cppyy_method_name",
[C_SCOPE, rffi.INT], rffi.CCHARP,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
def c_method_name(cppscope, method_index):
return charp2str_free(_c_method_name(cppscope, method_index))
_c_method_result_type = rffi.llexternal(
"cppyy_method_result_type",
[C_SCOPE, rffi.INT], rffi.CCHARP,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
def c_method_result_type(cppscope, method_index):
return charp2str_free(_c_method_result_type(cppscope, method_index))
c_method_num_args = rffi.llexternal(
"cppyy_method_num_args",
[C_SCOPE, rffi.INT], rffi.INT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_method_req_args = rffi.llexternal(
"cppyy_method_req_args",
[C_SCOPE, rffi.INT], rffi.INT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
_c_method_arg_type = rffi.llexternal(
"cppyy_method_arg_type",
[C_SCOPE, rffi.INT, rffi.INT], rffi.CCHARP,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
def c_method_arg_type(cppscope, method_index, arg_index):
return charp2str_free(_c_method_arg_type(cppscope, method_index,
arg_index))
_c_method_arg_default = rffi.llexternal(
"cppyy_method_arg_default",
[C_SCOPE, rffi.INT, rffi.INT], rffi.CCHARP,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
def c_method_arg_default(cppscope, method_index, arg_index):
return charp2str_free(_c_method_arg_default(cppscope, method_index,
arg_index))
@@ -248,62 +289,74 @@
c_get_method = rffi.llexternal(
"cppyy_get_method",
[C_SCOPE, rffi.INT], C_METHOD,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
# method properties ----------------------------------------------------------
c_is_constructor = rffi.llexternal(
"cppyy_is_constructor",
[C_TYPE, rffi.INT], rffi.INT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_is_staticmethod = rffi.llexternal(
"cppyy_is_staticmethod",
[C_TYPE, rffi.INT], rffi.INT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
# data member reflection information -----------------------------------------
c_num_data_members = rffi.llexternal(
"cppyy_num_data_members",
[C_SCOPE], rffi.INT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
_c_data_member_name = rffi.llexternal(
"cppyy_data_member_name",
[C_SCOPE, rffi.INT], rffi.CCHARP,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
def c_data_member_name(cppscope, data_member_index):
return charp2str_free(_c_data_member_name(cppscope, data_member_index))
_c_data_member_type = rffi.llexternal(
"cppyy_data_member_type",
[C_SCOPE, rffi.INT], rffi.CCHARP,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
def c_data_member_type(cppscope, data_member_index):
return charp2str_free(_c_data_member_type(cppscope, data_member_index))
c_data_member_offset = rffi.llexternal(
"cppyy_data_member_offset",
[C_SCOPE, rffi.INT], rffi.SIZE_T,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
# data member properties -----------------------------------------------------
c_is_publicdata = rffi.llexternal(
"cppyy_is_publicdata",
[C_SCOPE, rffi.INT], rffi.INT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_is_staticdata = rffi.llexternal(
"cppyy_is_staticdata",
[C_SCOPE, rffi.INT], rffi.INT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
# misc helpers ---------------------------------------------------------------
c_strtoll = rffi.llexternal(
"cppyy_strtoll",
[rffi.CCHARP], rffi.LONGLONG,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_strtoull = rffi.llexternal(
"cppyy_strtoull",
[rffi.CCHARP], rffi.ULONGLONG,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_free = rffi.llexternal(
"cppyy_free",
[rffi.VOIDP], lltype.Void,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
def charp2str_free(charp):
@@ -315,12 +368,15 @@
c_charp2stdstring = rffi.llexternal(
"cppyy_charp2stdstring",
[rffi.CCHARP], C_OBJECT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_stdstring2stdstring = rffi.llexternal(
"cppyy_stdstring2stdstring",
[C_OBJECT], C_OBJECT,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
c_free_stdstring = rffi.llexternal(
"cppyy_free_stdstring",
[C_OBJECT], lltype.Void,
+ threadsafe=threadsafe,
compilation_info=backend.eci)
diff --git a/pypy/module/cppyy/capi/cint_capi.py
b/pypy/module/cppyy/capi/cint_capi.py
--- a/pypy/module/cppyy/capi/cint_capi.py
+++ b/pypy/module/cppyy/capi/cint_capi.py
@@ -20,6 +20,8 @@
def identify():
return 'CINT'
+threadsafe = False
+
# force loading in global mode of core libraries, rather than linking with
# them as PyPy uses various version of dlopen in various places; note that
# this isn't going to fly on Windows (note that locking them in objects and
diff --git a/pypy/module/cppyy/capi/reflex_capi.py
b/pypy/module/cppyy/capi/reflex_capi.py
--- a/pypy/module/cppyy/capi/reflex_capi.py
+++ b/pypy/module/cppyy/capi/reflex_capi.py
@@ -19,6 +19,8 @@
def identify():
return 'Reflex'
+threadsafe='auto'
+
eci = ExternalCompilationInfo(
separate_module_files=[srcpath.join("reflexcwrapper.cxx")],
include_dirs=[incpath] + rootincpath,
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
