mirror of
https://github.com/pybind/pybind11.git
synced 2025-02-16 21:57:55 +00:00
* Add option to force the use of the PYPY GIL scoped acquire/release logic to support nested gil access, see https://github.com/pybind/pybind11/issues/1276 and https://github.com/pytorch/pytorch/issues/83101 * Apply suggestions from code review * Update CMakeLists.txt * docs: update upgrade guide * Update docs/upgrade.rst * All bells & whistles. * Add Reminder to common.h, so that we will not forget to purge `!WITH_THREAD` branches when dropping Python 3.6 * New sentence instead of semicolon. * Temporarily pull in snapshot of PR #4246 * Add `test_release_acquire` * Add more unit tests for nested gil locking * Add test_report_builtins_internals_keys * Very minor enhancement: sort list only after filtering. * Revert change in docs/upgrade.rst * Add test_multi_acquire_release_cross_module, while also forcing unique PYBIND11_INTERNALS_VERSION for cross_module_gil_utils.cpp * Hopefully fix apparently new ICC error. ``` 2022-10-28T07:57:54.5187728Z -- The CXX compiler identification is Intel 2021.7.0.20220726 ... 2022-10-28T07:58:53.6758994Z icpc: remark #10441: The Intel(R) C++ Compiler Classic (ICC) is deprecated and will be removed from product release in the second half of 2023. The Intel(R) oneAPI DPC++/C++ Compiler (ICX) is the recommended compiler moving forward. Please transition to use this compiler. Use '-diag-disable=10441' to disable this message. 2022-10-28T07:58:54.5801597Z In file included from /home/runner/work/pybind11/pybind11/include/pybind11/detail/../detail/type_caster_base.h(15), 2022-10-28T07:58:54.5803794Z from /home/runner/work/pybind11/pybind11/include/pybind11/detail/../cast.h(15), 2022-10-28T07:58:54.5805740Z from /home/runner/work/pybind11/pybind11/include/pybind11/detail/../attr.h(14), 2022-10-28T07:58:54.5809556Z from /home/runner/work/pybind11/pybind11/include/pybind11/detail/class.h(12), 2022-10-28T07:58:54.5812154Z from /home/runner/work/pybind11/pybind11/include/pybind11/pybind11.h(13), 2022-10-28T07:58:54.5948523Z from /home/runner/work/pybind11/pybind11/tests/cross_module_gil_utils.cpp(13): 2022-10-28T07:58:54.5949009Z /home/runner/work/pybind11/pybind11/include/pybind11/detail/../detail/internals.h(177): error #2282: unrecognized GCC pragma 2022-10-28T07:58:54.5949374Z PYBIND11_TLS_KEY_INIT(tstate) 2022-10-28T07:58:54.5949579Z ^ 2022-10-28T07:58:54.5949695Z ``` * clang-tidy fixes * Workaround for PYPY WIN exitcode None * Revert "Temporarily pull in snapshot of PR #4246" This reverts commit 23ac16e859150f27fda25ca865cabcb4444e0770. * Another workaround for PYPY WIN exitcode None * Clean up how the tests are run "run in process" Part 1: uniformity * Clean up how the tests are run "run in process" Part 2: use `@pytest.mark.parametrize` and clean up the naming. * Skip some tests `#if defined(THREAD_SANITIZER)` (tested with TSAN using the Google-internal toolchain). * Run all tests again but ignore ThreadSanitizer exitcode 66 (this is less likely to mask unrelated ThreadSanitizer issues in the future). * bug fix: missing common.h include before using `PYBIND11_SIMPLE_GIL_MANAGEMENT` For the tests in the github CI this does not matter, because `PYBIND11_SIMPLE_GIL_MANAGEMENT` is always defined from the command line, but when monkey-patching common.h locally, it matters. * if process.exitcode is None: assert t_delta > 9.9 * More sophisiticated `_run_in_process()` implementation, clearly reporting `DEADLOCK`, additionally exercised via added `intentional_deadlock()` * Wrap m.intentional_deadlock in a Python function, for `ForkingPickler` compatibility. ``` > ForkingPickler(file, protocol).dump(obj) E TypeError: cannot pickle 'PyCapsule' object ``` Observed with all Windows builds including mingw but not PyPy, and macos-latest with Python 3.9, 3.10, 3.11 but not 3.6. * Add link to potential solution for WOULD-BE-NICE-TO-HAVE feature. * Add `SKIP_IF_DEADLOCK = True` option, to not pollute the CI results with expected `DEADLOCK` failures while we figure out what to do about them. * Add COPY-PASTE-THIS: gdb ... command (to be used for debugging the detected deadlock) * style: pre-commit fixes * Do better than automatic pre-commit fixes. * Add `PYBIND11_SIMPLE_GIL_MANAGEMENT` to `pytest_report_header()` (so that we can easily know when harvesting deadlock information from the CI logs). Co-authored-by: Arnim Balzer <arnim@seechange.ai> Co-authored-by: Henry Schreiner <HenrySchreinerIII@gmail.com> Co-authored-by: Ralf W. Grosse-Kunstleve <rwgk@google.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
240 lines
8.1 KiB
C++
240 lines
8.1 KiB
C++
/*
|
|
pybind11/gil.h: RAII helpers for managing the GIL
|
|
|
|
Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
|
|
|
|
All rights reserved. Use of this source code is governed by a
|
|
BSD-style license that can be found in the LICENSE file.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "detail/common.h"
|
|
|
|
#if defined(WITH_THREAD) && !defined(PYBIND11_SIMPLE_GIL_MANAGEMENT)
|
|
# include "detail/internals.h"
|
|
#endif
|
|
|
|
PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
|
|
|
|
PYBIND11_NAMESPACE_BEGIN(detail)
|
|
|
|
// forward declarations
|
|
PyThreadState *get_thread_state_unchecked();
|
|
|
|
PYBIND11_NAMESPACE_END(detail)
|
|
|
|
#if defined(WITH_THREAD)
|
|
|
|
# if !defined(PYBIND11_SIMPLE_GIL_MANAGEMENT)
|
|
|
|
/* The functions below essentially reproduce the PyGILState_* API using a RAII
|
|
* pattern, but there are a few important differences:
|
|
*
|
|
* 1. When acquiring the GIL from an non-main thread during the finalization
|
|
* phase, the GILState API blindly terminates the calling thread, which
|
|
* is often not what is wanted. This API does not do this.
|
|
*
|
|
* 2. The gil_scoped_release function can optionally cut the relationship
|
|
* of a PyThreadState and its associated thread, which allows moving it to
|
|
* another thread (this is a fairly rare/advanced use case).
|
|
*
|
|
* 3. The reference count of an acquired thread state can be controlled. This
|
|
* can be handy to prevent cases where callbacks issued from an external
|
|
* thread would otherwise constantly construct and destroy thread state data
|
|
* structures.
|
|
*
|
|
* See the Python bindings of NanoGUI (http://github.com/wjakob/nanogui) for an
|
|
* example which uses features 2 and 3 to migrate the Python thread of
|
|
* execution to another thread (to run the event loop on the original thread,
|
|
* in this case).
|
|
*/
|
|
|
|
class gil_scoped_acquire {
|
|
public:
|
|
PYBIND11_NOINLINE gil_scoped_acquire() {
|
|
auto &internals = detail::get_internals();
|
|
tstate = (PyThreadState *) PYBIND11_TLS_GET_VALUE(internals.tstate);
|
|
|
|
if (!tstate) {
|
|
/* Check if the GIL was acquired using the PyGILState_* API instead (e.g. if
|
|
calling from a Python thread). Since we use a different key, this ensures
|
|
we don't create a new thread state and deadlock in PyEval_AcquireThread
|
|
below. Note we don't save this state with internals.tstate, since we don't
|
|
create it we would fail to clear it (its reference count should be > 0). */
|
|
tstate = PyGILState_GetThisThreadState();
|
|
}
|
|
|
|
if (!tstate) {
|
|
tstate = PyThreadState_New(internals.istate);
|
|
# if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
|
|
if (!tstate) {
|
|
pybind11_fail("scoped_acquire: could not create thread state!");
|
|
}
|
|
# endif
|
|
tstate->gilstate_counter = 0;
|
|
PYBIND11_TLS_REPLACE_VALUE(internals.tstate, tstate);
|
|
} else {
|
|
release = detail::get_thread_state_unchecked() != tstate;
|
|
}
|
|
|
|
if (release) {
|
|
PyEval_AcquireThread(tstate);
|
|
}
|
|
|
|
inc_ref();
|
|
}
|
|
|
|
gil_scoped_acquire(const gil_scoped_acquire &) = delete;
|
|
gil_scoped_acquire &operator=(const gil_scoped_acquire &) = delete;
|
|
|
|
void inc_ref() { ++tstate->gilstate_counter; }
|
|
|
|
PYBIND11_NOINLINE void dec_ref() {
|
|
--tstate->gilstate_counter;
|
|
# if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
|
|
if (detail::get_thread_state_unchecked() != tstate) {
|
|
pybind11_fail("scoped_acquire::dec_ref(): thread state must be current!");
|
|
}
|
|
if (tstate->gilstate_counter < 0) {
|
|
pybind11_fail("scoped_acquire::dec_ref(): reference count underflow!");
|
|
}
|
|
# endif
|
|
if (tstate->gilstate_counter == 0) {
|
|
# if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
|
|
if (!release) {
|
|
pybind11_fail("scoped_acquire::dec_ref(): internal error!");
|
|
}
|
|
# endif
|
|
PyThreadState_Clear(tstate);
|
|
if (active) {
|
|
PyThreadState_DeleteCurrent();
|
|
}
|
|
PYBIND11_TLS_DELETE_VALUE(detail::get_internals().tstate);
|
|
release = false;
|
|
}
|
|
}
|
|
|
|
/// This method will disable the PyThreadState_DeleteCurrent call and the
|
|
/// GIL won't be acquired. This method should be used if the interpreter
|
|
/// could be shutting down when this is called, as thread deletion is not
|
|
/// allowed during shutdown. Check _Py_IsFinalizing() on Python 3.7+, and
|
|
/// protect subsequent code.
|
|
PYBIND11_NOINLINE void disarm() { active = false; }
|
|
|
|
PYBIND11_NOINLINE ~gil_scoped_acquire() {
|
|
dec_ref();
|
|
if (release) {
|
|
PyEval_SaveThread();
|
|
}
|
|
}
|
|
|
|
private:
|
|
PyThreadState *tstate = nullptr;
|
|
bool release = true;
|
|
bool active = true;
|
|
};
|
|
|
|
class gil_scoped_release {
|
|
public:
|
|
explicit gil_scoped_release(bool disassoc = false) : disassoc(disassoc) {
|
|
// `get_internals()` must be called here unconditionally in order to initialize
|
|
// `internals.tstate` for subsequent `gil_scoped_acquire` calls. Otherwise, an
|
|
// initialization race could occur as multiple threads try `gil_scoped_acquire`.
|
|
auto &internals = detail::get_internals();
|
|
// NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
|
|
tstate = PyEval_SaveThread();
|
|
if (disassoc) {
|
|
// Python >= 3.7 can remove this, it's an int before 3.7
|
|
// NOLINTNEXTLINE(readability-qualified-auto)
|
|
auto key = internals.tstate;
|
|
PYBIND11_TLS_DELETE_VALUE(key);
|
|
}
|
|
}
|
|
|
|
gil_scoped_release(const gil_scoped_acquire &) = delete;
|
|
gil_scoped_release &operator=(const gil_scoped_acquire &) = delete;
|
|
|
|
/// This method will disable the PyThreadState_DeleteCurrent call and the
|
|
/// GIL won't be acquired. This method should be used if the interpreter
|
|
/// could be shutting down when this is called, as thread deletion is not
|
|
/// allowed during shutdown. Check _Py_IsFinalizing() on Python 3.7+, and
|
|
/// protect subsequent code.
|
|
PYBIND11_NOINLINE void disarm() { active = false; }
|
|
|
|
~gil_scoped_release() {
|
|
if (!tstate) {
|
|
return;
|
|
}
|
|
// `PyEval_RestoreThread()` should not be called if runtime is finalizing
|
|
if (active) {
|
|
PyEval_RestoreThread(tstate);
|
|
}
|
|
if (disassoc) {
|
|
// Python >= 3.7 can remove this, it's an int before 3.7
|
|
// NOLINTNEXTLINE(readability-qualified-auto)
|
|
auto key = detail::get_internals().tstate;
|
|
PYBIND11_TLS_REPLACE_VALUE(key, tstate);
|
|
}
|
|
}
|
|
|
|
private:
|
|
PyThreadState *tstate;
|
|
bool disassoc;
|
|
bool active = true;
|
|
};
|
|
|
|
# else // PYBIND11_SIMPLE_GIL_MANAGEMENT
|
|
|
|
class gil_scoped_acquire {
|
|
PyGILState_STATE state;
|
|
|
|
public:
|
|
gil_scoped_acquire() : state{PyGILState_Ensure()} {}
|
|
gil_scoped_acquire(const gil_scoped_acquire &) = delete;
|
|
gil_scoped_acquire &operator=(const gil_scoped_acquire &) = delete;
|
|
~gil_scoped_acquire() { PyGILState_Release(state); }
|
|
void disarm() {}
|
|
};
|
|
|
|
class gil_scoped_release {
|
|
PyThreadState *state;
|
|
|
|
public:
|
|
gil_scoped_release() : state{PyEval_SaveThread()} {}
|
|
gil_scoped_release(const gil_scoped_release &) = delete;
|
|
gil_scoped_release &operator=(const gil_scoped_acquire &) = delete;
|
|
~gil_scoped_release() { PyEval_RestoreThread(state); }
|
|
void disarm() {}
|
|
};
|
|
|
|
# endif // PYBIND11_SIMPLE_GIL_MANAGEMENT
|
|
|
|
#else // WITH_THREAD
|
|
|
|
class gil_scoped_acquire {
|
|
public:
|
|
gil_scoped_acquire() {
|
|
// Trick to suppress `unused variable` error messages (at call sites).
|
|
(void) (this != (this + 1));
|
|
}
|
|
gil_scoped_acquire(const gil_scoped_acquire &) = delete;
|
|
gil_scoped_acquire &operator=(const gil_scoped_acquire &) = delete;
|
|
void disarm() {}
|
|
};
|
|
|
|
class gil_scoped_release {
|
|
public:
|
|
gil_scoped_release() {
|
|
// Trick to suppress `unused variable` error messages (at call sites).
|
|
(void) (this != (this + 1));
|
|
}
|
|
gil_scoped_release(const gil_scoped_release &) = delete;
|
|
gil_scoped_release &operator=(const gil_scoped_acquire &) = delete;
|
|
void disarm() {}
|
|
};
|
|
|
|
#endif // WITH_THREAD
|
|
|
|
PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
|