Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-03-03 04:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use gil_scoped_acquire_local in error_already_set destructor. See long comment.

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2022-05-12 13:02:36 -07:00
parent d28c155c1d
commit 7578de9c48
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/pybind11/pybind11.h
View File

@ -2611,13 +2611,22 @@ void print(Args &&...args) {
}
error_already_set::~error_already_set() {
gil_scoped_acquire gil;
{
error_scope scope;
m_type.release().dec_ref();
m_value.release().dec_ref();
m_trace.release().dec_ref();
}
// Not using py::gil_scoped_acquire here since that calls get_internals,
// which triggers tensorflow failures (a full explanation is currently unknown).
// gil_scoped_acquire_local here is a straight copy from get_internals code.
// I.e. py::gil_scoped_acquire acquires the GIL in detail/internals.h exactly
// like we do here now, releases it, then acquires it again in gil.h.
// Using gil_scoped_acquire_local cuts out the get_internals overhead and
// fixes the tensorflow failures.
struct gil_scoped_acquire_local {
gil_scoped_acquire_local() : state(PyGILState_Ensure()) {}
~gil_scoped_acquire_local() { PyGILState_Release(state); }
const PyGILState_STATE state;
} gil;
error_scope scope;
m_type.release().dec_ref();
m_value.release().dec_ref();
m_trace.release().dec_ref();
}
PYBIND11_NAMESPACE_BEGIN(detail)