mirror of
https://github.com/boostorg/python.git
synced 2026-01-30 08:02:38 +00:00
Add "nogil" option for BOOST_PYTHON_MODULE_INIT.
Implement optional arguments for BOOST_PYTHON_MODULE_INIT and allow the
boost::python::mod_gil_not_used() option. This sets the
Py_MOD_GIL_NOT_USED flag for the extension module.
To define a module that supports free-threaded Python, define it
like this:
BOOST_PYTHON_MODULE(my_module, boost::python::mod_gil_not_used())
{
...
}
This commit is contained in:
committed by
Stefan Seefeld
parent
fc68878e02
commit
5013564316
@@ -11,11 +11,41 @@
|
||||
|
||||
# ifndef BOOST_PYTHON_MODULE_INIT
|
||||
|
||||
namespace boost { namespace python { namespace detail {
|
||||
namespace boost { namespace python {
|
||||
|
||||
#ifdef HAS_CXX11
|
||||
// Use to activate the Py_MOD_GIL_NOT_USED flag.
|
||||
class mod_gil_not_used {
|
||||
public:
|
||||
explicit mod_gil_not_used(bool flag = true) : flag_(flag) {}
|
||||
bool flag() const { return flag_; }
|
||||
|
||||
private:
|
||||
bool flag_;
|
||||
};
|
||||
|
||||
namespace detail {
|
||||
|
||||
inline bool gil_not_used_option() { return false; }
|
||||
template <typename F, typename... O>
|
||||
bool gil_not_used_option(F &&, O &&...o);
|
||||
template <typename... O>
|
||||
inline bool gil_not_used_option(mod_gil_not_used f, O &&...o) {
|
||||
return f.flag() || gil_not_used_option(o...);
|
||||
}
|
||||
template <typename F, typename... O>
|
||||
inline bool gil_not_used_option(F &&, O &&...o) {
|
||||
return gil_not_used_option(o...);
|
||||
}
|
||||
|
||||
}
|
||||
#endif // HAS_CXX11
|
||||
|
||||
namespace detail {
|
||||
|
||||
# if PY_VERSION_HEX >= 0x03000000
|
||||
|
||||
BOOST_PYTHON_DECL PyObject* init_module(PyModuleDef&, void(*)());
|
||||
BOOST_PYTHON_DECL PyObject* init_module(PyModuleDef&, void(*)(), bool gil_not_used = false);
|
||||
|
||||
#else
|
||||
|
||||
@@ -27,7 +57,37 @@ BOOST_PYTHON_DECL PyObject* init_module(char const* name, void(*)());
|
||||
|
||||
# if PY_VERSION_HEX >= 0x03000000
|
||||
|
||||
# define _BOOST_PYTHON_MODULE_INIT(name) \
|
||||
# ifdef HAS_CXX11
|
||||
# define _BOOST_PYTHON_MODULE_INIT(name, ...) \
|
||||
PyObject* BOOST_PP_CAT(PyInit_, name)() \
|
||||
{ \
|
||||
static PyModuleDef_Base initial_m_base = { \
|
||||
PyObject_HEAD_INIT(NULL) \
|
||||
0, /* m_init */ \
|
||||
0, /* m_index */ \
|
||||
0 /* m_copy */ }; \
|
||||
static PyMethodDef initial_methods[] = { { 0, 0, 0, 0 } }; \
|
||||
\
|
||||
static struct PyModuleDef moduledef = { \
|
||||
initial_m_base, \
|
||||
BOOST_PP_STRINGIZE(name), \
|
||||
0, /* m_doc */ \
|
||||
-1, /* m_size */ \
|
||||
initial_methods, \
|
||||
0, /* m_reload */ \
|
||||
0, /* m_traverse */ \
|
||||
0, /* m_clear */ \
|
||||
0, /* m_free */ \
|
||||
}; \
|
||||
\
|
||||
return boost::python::detail::init_module( \
|
||||
moduledef, BOOST_PP_CAT(init_module_, name), \
|
||||
boost::python::detail::gil_not_used_option(__VA_ARGS__) ); \
|
||||
} \
|
||||
void BOOST_PP_CAT(init_module_, name)()
|
||||
|
||||
# else // !HAS_CXX11
|
||||
# define _BOOST_PYTHON_MODULE_INIT(name) \
|
||||
PyObject* BOOST_PP_CAT(PyInit_, name)() \
|
||||
{ \
|
||||
static PyModuleDef_Base initial_m_base = { \
|
||||
@@ -53,6 +113,7 @@ BOOST_PYTHON_DECL PyObject* init_module(char const* name, void(*)());
|
||||
moduledef, BOOST_PP_CAT(init_module_, name) ); \
|
||||
} \
|
||||
void BOOST_PP_CAT(init_module_, name)()
|
||||
# endif // HAS_CXX11
|
||||
|
||||
# else
|
||||
|
||||
@@ -66,9 +127,15 @@ BOOST_PYTHON_DECL PyObject* init_module(char const* name, void(*)());
|
||||
|
||||
# endif
|
||||
|
||||
# define BOOST_PYTHON_MODULE_INIT(name) \
|
||||
# if defined(HAS_CXX11) && (PY_VERSION_HEX >= 0x03000000)
|
||||
# define BOOST_PYTHON_MODULE_INIT(name, ...) \
|
||||
void BOOST_PP_CAT(init_module_,name)(); \
|
||||
extern "C" BOOST_SYMBOL_EXPORT _BOOST_PYTHON_MODULE_INIT(name, __VA_ARGS__)
|
||||
# else
|
||||
# define BOOST_PYTHON_MODULE_INIT(name) \
|
||||
void BOOST_PP_CAT(init_module_,name)(); \
|
||||
extern "C" BOOST_SYMBOL_EXPORT _BOOST_PYTHON_MODULE_INIT(name)
|
||||
# endif // HAS_CXX11 && Python 3
|
||||
|
||||
# endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user