mirror of
https://github.com/pybind/pybind11.git
synced 2026-06-28 18:37:02 +00:00
* feat(subinterpreter): add opt-in TLS-cached thread state mode subinterpreter_scoped_activate previously created and destroyed a fresh PyThreadState on every activation when the calling OS thread was not already running the target interpreter. Workloads that repeatedly re-enter the same sub-interpreter from the same thread therefore churn thread states and lose per-thread interpreter state between activations (see pybind/pybind11#6040). Add an opt-in subinterpreter_thread_state::cached policy: on first use a PyThreadState is created and stored in OS-thread-local storage keyed by the target interpreter; subsequent activations on that thread only swap it in/out and never destroy it. The default stays transient, so existing behavior is unchanged. Since pybind11 does not control thread lifetime, cleanup is explicit: subinterpreter::release_cached_thread_state() releases the calling thread's cached state for one interpreter, and the static release_all_cached_thread_states() releases all of the calling thread's cached states as an end-of-thread hook. The TLS map's destructor only frees its own nodes and never touches the Python C API, so an unreleased state leaks rather than crashing at thread exit. Includes test coverage and embedding docs. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * style: pre-commit fixes * refactor(subinterpreter): replace cached enum/TLS with subinterpreter_thread_state RAII Address review feedback on the original "cached" mode by switching to an explicit two-RAII design suggested by @b-pass: "Create a class ... to RAII-manage the PyThreadState but start its lifetime in an already released state. You could create another class (or modify scoped_activate) to scoped/RAII activate the inactive threadstate." Removed - enum subinterpreter_thread_state { transient, cached } and the defaulted ctor parameter on subinterpreter_scoped_activate. - detail::subinterpreter_thread_state_cache thread_local map. - subinterpreter::release_cached_thread_state() and subinterpreter::release_all_cached_thread_states(). This eliminates: the hidden per-thread map, the "release_all" footgun across pybind11 modules (the cache was module-local), and the implicit "must not be active when called" contract on the release functions. Added - Public class subinterpreter_thread_state that owns one PyThreadState for a given subinterpreter on its constructing OS thread, created in a released state (not current, no GIL). Non-copyable, non-movable (PyThreadState is bound to its creating OS thread). - subinterpreter_scoped_activate(subinterpreter_thread_state &) overload: swaps the owned PyThreadState in on entry, swaps it out on exit, does not touch its lifetime. Behavior - The existing subinterpreter_scoped_activate(subinterpreter const &) overload is unchanged (still transient: New on entry, Delete on exit). All previously-working code keeps working. - With subinterpreter_thread_state, one OS thread can alternate between multiple subinterpreters and each PyThreadState is preserved across activations -- the use case that gil_scoped_release/acquire + a long-lived scoped_activate cannot solve alone (the per-thread internals.tstate slot holds only one inactive tstate). - The dtor of subinterpreter_thread_state guards against the "destroyed-while-active" contract violation: if Swap reveals the cached tstate was current, do not Swap back to a now-deleted pointer (the safe-when-active fix b-pass requested for the old release_* functions, applied at the natural location instead). Lifetime contract is enforced by ordinary C++ scope: typical placement is `thread_local`. No new release/cleanup APIs are required. Tests cover (a) tstate identity preserved across activations on a thread, (b) transient and reusing modes do not share state, (c) different OS threads get distinct PyThreadStates, and (d) the multi-subinterpreter alternation case. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(subinterpreter): address review on #6073 (same-thread checks, test scoping) Per @b-pass's review: - ~subinterpreter_thread_state(): add a PYBIND11_DETAILED_ERROR_MESSAGES- guarded check that destruction happens on the OS thread that created the PyThreadState (same PyThread_get_thread_native_id pattern as ~subinterpreter), failing with pybind11_fail otherwise. - subinterpreter_scoped_activate(subinterpreter_thread_state &): add the matching DETAILED_ERROR_MESSAGES check that activation happens on the creating OS thread, enforcing the newly documented rule. - docs: document that activating a subinterpreter_thread_state on another OS thread is illegal. - tests: keep each subinterpreter (and its subinterpreter_thread_state) in an enclosing scope so destruction order is thread-state -> subinterpreter -> unsafe_reset_internals_for_single_interpreter(). The previous top-level declarations ran the reset while the subinterpreters were still alive, which is the likely cause of the CI crashes. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * docs: fix codespell (re-used -> reused) in embedding.rst Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
689 lines
26 KiB
C++
689 lines
26 KiB
C++
#include <pybind11/embed.h>
|
|
#ifdef PYBIND11_HAS_SUBINTERPRETER_SUPPORT
|
|
# include <pybind11/gil_safe_call_once.h>
|
|
# include <pybind11/subinterpreter.h>
|
|
|
|
// Silence MSVC C++17 deprecation warning from Catch regarding std::uncaught_exceptions (up to
|
|
// catch 2.0.1; this should be fixed in the next catch release after 2.0.1).
|
|
PYBIND11_WARNING_DISABLE_MSVC(4996)
|
|
|
|
# include "catch_skip.h"
|
|
|
|
# include <catch.hpp>
|
|
# include <cstdlib>
|
|
# include <fstream>
|
|
# include <functional>
|
|
# include <thread>
|
|
# include <utility>
|
|
|
|
namespace py = pybind11;
|
|
using namespace py::literals;
|
|
|
|
bool has_state_dict_internals_obj();
|
|
uintptr_t get_details_as_uintptr();
|
|
|
|
void unsafe_reset_internals_for_single_interpreter() {
|
|
// NOTE: This code is NOT SAFE unless the caller guarantees no other threads are alive
|
|
// NOTE: This code is tied to the precise implementation of the internals holder
|
|
|
|
// first, unref the thread local internals
|
|
py::detail::get_internals_pp_manager().unref();
|
|
py::detail::get_local_internals_pp_manager().unref();
|
|
|
|
// we know there are no other interpreters, so we can lower this. SUPER DANGEROUS
|
|
py::detail::has_seen_non_main_interpreter() = false;
|
|
|
|
// now we unref the static global singleton internals
|
|
py::detail::get_internals_pp_manager().unref();
|
|
py::detail::get_local_internals_pp_manager().unref();
|
|
|
|
// finally, we reload the static global singleton
|
|
py::detail::get_internals();
|
|
py::detail::get_local_internals();
|
|
}
|
|
|
|
py::object &get_dict_type_object() {
|
|
PYBIND11_CONSTINIT static py::gil_safe_call_once_and_store<py::object> storage;
|
|
return storage
|
|
.call_once_and_store_result(
|
|
[]() -> py::object { return py::module_::import("builtins").attr("dict"); })
|
|
.get_stored();
|
|
}
|
|
|
|
py::object &get_ordered_dict_type_object() {
|
|
PYBIND11_CONSTINIT static py::gil_safe_call_once_and_store<py::object> storage;
|
|
return storage
|
|
.call_once_and_store_result(
|
|
[]() -> py::object { return py::module_::import("collections").attr("OrderedDict"); })
|
|
.get_stored();
|
|
}
|
|
|
|
py::object &get_default_dict_type_object() {
|
|
PYBIND11_CONSTINIT static py::gil_safe_call_once_and_store<py::object> storage;
|
|
return storage
|
|
.call_once_and_store_result(
|
|
[]() -> py::object { return py::module_::import("collections").attr("defaultdict"); })
|
|
.get_stored();
|
|
}
|
|
|
|
TEST_CASE("Single Subinterpreter") {
|
|
unsafe_reset_internals_for_single_interpreter();
|
|
|
|
py::module_::import("external_module"); // in the main interpreter
|
|
|
|
// Add tags to the modules in the main interpreter and test the basics.
|
|
py::module_::import("__main__").attr("main_tag") = "main interpreter";
|
|
{
|
|
auto m = py::module_::import("widget_module");
|
|
m.attr("extension_module_tag") = "added to module in main interpreter";
|
|
|
|
REQUIRE(m.attr("add")(1, 2).cast<int>() == 3);
|
|
}
|
|
REQUIRE(has_state_dict_internals_obj());
|
|
|
|
auto main_int
|
|
= py::module_::import("external_module").attr("internals_at")().cast<uintptr_t>();
|
|
|
|
/// Create and switch to a subinterpreter.
|
|
{
|
|
py::scoped_subinterpreter ssi;
|
|
|
|
// The subinterpreter has internals populated
|
|
REQUIRE(has_state_dict_internals_obj());
|
|
|
|
py::list(py::module_::import("sys").attr("path")).append(py::str("."));
|
|
|
|
auto ext_int
|
|
= py::module_::import("external_module").attr("internals_at")().cast<uintptr_t>();
|
|
py::detail::get_internals();
|
|
REQUIRE(get_details_as_uintptr() == ext_int);
|
|
REQUIRE(ext_int != main_int);
|
|
|
|
// Modules tags should be gone.
|
|
REQUIRE_FALSE(py::hasattr(py::module_::import("__main__"), "tag"));
|
|
{
|
|
auto m = py::module_::import("widget_module");
|
|
REQUIRE_FALSE(py::hasattr(m, "extension_module_tag"));
|
|
|
|
// Function bindings should still work.
|
|
REQUIRE(m.attr("add")(1, 2).cast<int>() == 3);
|
|
}
|
|
}
|
|
|
|
REQUIRE(py::hasattr(py::module_::import("__main__"), "main_tag"));
|
|
REQUIRE(py::hasattr(py::module_::import("widget_module"), "extension_module_tag"));
|
|
REQUIRE(has_state_dict_internals_obj());
|
|
|
|
unsafe_reset_internals_for_single_interpreter();
|
|
}
|
|
|
|
# if PY_VERSION_HEX >= 0x030D0000
|
|
TEST_CASE("Move Subinterpreter") {
|
|
std::unique_ptr<py::subinterpreter> sub(new py::subinterpreter(py::subinterpreter::create()));
|
|
|
|
// on this thread, use the subinterpreter and import some non-trivial junk
|
|
{
|
|
py::subinterpreter_scoped_activate activate(*sub);
|
|
|
|
py::list(py::module_::import("sys").attr("path")).append(py::str("."));
|
|
py::module_::import("datetime");
|
|
py::module_::import("threading");
|
|
py::module_::import("external_module");
|
|
}
|
|
|
|
auto t = std::thread([&]() {
|
|
// Use it again
|
|
{
|
|
py::subinterpreter_scoped_activate activate(*sub);
|
|
py::module_::import("external_module");
|
|
}
|
|
sub.reset();
|
|
});
|
|
|
|
// on 3.14.1+ destructing a sub-interpreter does a stop-the-world. we need to detach our
|
|
// thread state in order for that to be possible.
|
|
{
|
|
py::gil_scoped_release nogil;
|
|
t.join();
|
|
}
|
|
|
|
REQUIRE(!sub);
|
|
|
|
unsafe_reset_internals_for_single_interpreter();
|
|
}
|
|
# endif
|
|
|
|
TEST_CASE("Reused Subinterpreter thread state (single interpreter)") {
|
|
PyThreadState *first = nullptr;
|
|
PyThreadState *second = nullptr;
|
|
PyThreadState *transient_ts = nullptr;
|
|
PyThreadState *worker_ts = nullptr;
|
|
|
|
// The subinterpreter is kept in this enclosing scope so that every
|
|
// subinterpreter_thread_state is destroyed first, then the subinterpreter, and only then
|
|
// unsafe_reset_internals_for_single_interpreter() runs (after the scope closes).
|
|
{
|
|
py::subinterpreter sub = py::subinterpreter::create();
|
|
|
|
{
|
|
py::subinterpreter_thread_state ts(sub);
|
|
|
|
{
|
|
py::subinterpreter_scoped_activate guard(ts);
|
|
first = PyThreadState_Get();
|
|
py::list(py::module_::import("sys").attr("path")).append(py::str("."));
|
|
}
|
|
{
|
|
py::subinterpreter_scoped_activate guard(ts);
|
|
second = PyThreadState_Get();
|
|
}
|
|
|
|
// Same OS thread + same subinterpreter_thread_state => the PyThreadState is reused.
|
|
REQUIRE(first != nullptr);
|
|
REQUIRE(first == second);
|
|
|
|
// The (subinterpreter const&) ctor does not share with the reusable tstate: while
|
|
// `ts` is still alive, a transient activation gets a distinct PyThreadState.
|
|
{
|
|
py::subinterpreter_scoped_activate guard(sub);
|
|
transient_ts = PyThreadState_Get();
|
|
}
|
|
REQUIRE(transient_ts != first);
|
|
|
|
// A different OS thread holds its own subinterpreter_thread_state (both alive
|
|
// concurrently => distinct PyThreadState pointers).
|
|
{
|
|
py::gil_scoped_release nogil;
|
|
std::thread([&]() {
|
|
py::subinterpreter_thread_state worker_ts_owner(sub);
|
|
py::subinterpreter_scoped_activate guard(worker_ts_owner);
|
|
worker_ts = PyThreadState_Get();
|
|
// worker_ts_owner is destroyed at scope exit, on the same OS thread that
|
|
// constructed it.
|
|
}).join();
|
|
}
|
|
REQUIRE(worker_ts != nullptr);
|
|
REQUIRE(worker_ts != first);
|
|
|
|
// ts is destructed at the end of this block on this same OS thread (deleting its
|
|
// PyThreadState), while `sub` is still alive.
|
|
}
|
|
// sub is destructed at the end of this block.
|
|
}
|
|
|
|
unsafe_reset_internals_for_single_interpreter();
|
|
}
|
|
|
|
TEST_CASE("Reused Subinterpreter thread state (multiple interpreters)") {
|
|
// The core multi-subinterpreter use case: one OS thread alternates between two
|
|
// subinterpreters and each PyThreadState is preserved across activations.
|
|
PyThreadState *a1 = nullptr;
|
|
PyThreadState *a2 = nullptr;
|
|
PyThreadState *b1 = nullptr;
|
|
PyThreadState *b2 = nullptr;
|
|
|
|
// Everything is kept in this enclosing scope. Destruction order at the closing brace is
|
|
// ts_b, ts_a, sub_b, sub_a -- i.e. each subinterpreter_thread_state is destroyed before its
|
|
// subinterpreter -- and unsafe_reset_internals_for_single_interpreter() only runs afterwards.
|
|
{
|
|
py::subinterpreter sub_a = py::subinterpreter::create();
|
|
py::subinterpreter sub_b = py::subinterpreter::create();
|
|
|
|
py::subinterpreter_thread_state ts_a(sub_a);
|
|
py::subinterpreter_thread_state ts_b(sub_b);
|
|
|
|
{
|
|
py::subinterpreter_scoped_activate guard(ts_a);
|
|
a1 = PyThreadState_Get();
|
|
}
|
|
{
|
|
py::subinterpreter_scoped_activate guard(ts_b);
|
|
b1 = PyThreadState_Get();
|
|
}
|
|
{
|
|
py::subinterpreter_scoped_activate guard(ts_a);
|
|
a2 = PyThreadState_Get();
|
|
}
|
|
{
|
|
py::subinterpreter_scoped_activate guard(ts_b);
|
|
b2 = PyThreadState_Get();
|
|
}
|
|
|
|
REQUIRE(a1 != nullptr);
|
|
REQUIRE(b1 != nullptr);
|
|
// Identity is preserved across activations for each interpreter independently.
|
|
REQUIRE(a1 == a2);
|
|
REQUIRE(b1 == b2);
|
|
// And the two interpreters have distinct thread states (both alive => reliable
|
|
// comparison).
|
|
REQUIRE(a1 != b1);
|
|
}
|
|
|
|
unsafe_reset_internals_for_single_interpreter();
|
|
}
|
|
|
|
TEST_CASE("GIL Subinterpreter") {
|
|
|
|
PyInterpreterState *main_interp = PyInterpreterState_Get();
|
|
|
|
{
|
|
auto sub = py::subinterpreter::create();
|
|
|
|
REQUIRE(main_interp == PyInterpreterState_Get());
|
|
|
|
PyInterpreterState *sub_interp = nullptr;
|
|
|
|
{
|
|
py::subinterpreter_scoped_activate activate(sub);
|
|
|
|
sub_interp = PyInterpreterState_Get();
|
|
REQUIRE(sub_interp != main_interp);
|
|
|
|
py::list(py::module_::import("sys").attr("path")).append(py::str("."));
|
|
py::module_::import("datetime");
|
|
py::module_::import("threading");
|
|
py::module_::import("external_module");
|
|
|
|
{
|
|
py::subinterpreter_scoped_activate main(py::subinterpreter::main());
|
|
REQUIRE(PyInterpreterState_Get() == main_interp);
|
|
|
|
{
|
|
py::gil_scoped_release nogil{};
|
|
{
|
|
py::gil_scoped_acquire yesgil{};
|
|
REQUIRE(PyInterpreterState_Get() == main_interp);
|
|
}
|
|
}
|
|
|
|
REQUIRE(PyInterpreterState_Get() == main_interp);
|
|
}
|
|
|
|
REQUIRE(PyInterpreterState_Get() == sub_interp);
|
|
|
|
{
|
|
py::gil_scoped_release nogil{};
|
|
{
|
|
py::gil_scoped_acquire yesgil{};
|
|
REQUIRE(PyInterpreterState_Get() == sub_interp);
|
|
}
|
|
}
|
|
|
|
REQUIRE(PyInterpreterState_Get() == sub_interp);
|
|
}
|
|
|
|
REQUIRE(PyInterpreterState_Get() == main_interp);
|
|
|
|
{
|
|
py::gil_scoped_release nogil{};
|
|
{
|
|
py::gil_scoped_acquire yesgil{};
|
|
REQUIRE(PyInterpreterState_Get() == main_interp);
|
|
}
|
|
}
|
|
|
|
REQUIRE(PyInterpreterState_Get() == main_interp);
|
|
|
|
bool thread_result;
|
|
|
|
{
|
|
thread_result = false;
|
|
py::gil_scoped_release nogil{};
|
|
std::thread([&]() {
|
|
{
|
|
py::subinterpreter_scoped_activate ssa{sub};
|
|
}
|
|
{
|
|
py::gil_scoped_acquire gil{};
|
|
thread_result = (PyInterpreterState_Get() == main_interp);
|
|
}
|
|
}).join();
|
|
}
|
|
REQUIRE(thread_result);
|
|
|
|
{
|
|
thread_result = false;
|
|
py::gil_scoped_release nogil{};
|
|
std::thread([&]() {
|
|
py::gil_scoped_acquire gil{};
|
|
thread_result = (PyInterpreterState_Get() == main_interp);
|
|
}).join();
|
|
}
|
|
REQUIRE(thread_result);
|
|
}
|
|
|
|
REQUIRE(PyInterpreterState_Get() == main_interp);
|
|
unsafe_reset_internals_for_single_interpreter();
|
|
}
|
|
|
|
TEST_CASE("Multiple Subinterpreters") {
|
|
unsafe_reset_internals_for_single_interpreter();
|
|
|
|
// Make sure the module is in the main interpreter and save its pointer
|
|
auto *main_ext = py::module_::import("external_module").ptr();
|
|
auto main_int
|
|
= py::module_::import("external_module").attr("internals_at")().cast<uintptr_t>();
|
|
py::module_::import("external_module").attr("multi_interp") = "1";
|
|
|
|
{
|
|
py::subinterpreter si1 = py::subinterpreter::create();
|
|
std::unique_ptr<py::subinterpreter> psi2;
|
|
|
|
PyObject *sub1_ext = nullptr;
|
|
PyObject *sub2_ext = nullptr;
|
|
uintptr_t sub1_int = 0;
|
|
uintptr_t sub2_int = 0;
|
|
|
|
{
|
|
py::subinterpreter_scoped_activate scoped(si1);
|
|
py::list(py::module_::import("sys").attr("path")).append(py::str("."));
|
|
|
|
// The subinterpreter has its own copy of this module which is completely separate from
|
|
// main
|
|
sub1_ext = py::module_::import("external_module").ptr();
|
|
REQUIRE(sub1_ext != main_ext);
|
|
REQUIRE_FALSE(py::hasattr(py::module_::import("external_module"), "multi_interp"));
|
|
py::module_::import("external_module").attr("multi_interp") = "2";
|
|
// The subinterpreter also has its own internals
|
|
sub1_int
|
|
= py::module_::import("external_module").attr("internals_at")().cast<uintptr_t>();
|
|
REQUIRE(sub1_int != main_int);
|
|
|
|
// while the old one is active, create a new one
|
|
psi2.reset(new py::subinterpreter(py::subinterpreter::create()));
|
|
}
|
|
|
|
{
|
|
py::subinterpreter_scoped_activate scoped(*psi2);
|
|
py::list(py::module_::import("sys").attr("path")).append(py::str("."));
|
|
|
|
// The second subinterpreter is separate from both main and the other subinterpreter
|
|
sub2_ext = py::module_::import("external_module").ptr();
|
|
REQUIRE(sub2_ext != main_ext);
|
|
REQUIRE(sub2_ext != sub1_ext);
|
|
REQUIRE_FALSE(py::hasattr(py::module_::import("external_module"), "multi_interp"));
|
|
py::module_::import("external_module").attr("multi_interp") = "3";
|
|
// The subinterpreter also has its own internals
|
|
sub2_int
|
|
= py::module_::import("external_module").attr("internals_at")().cast<uintptr_t>();
|
|
REQUIRE(sub2_int != main_int);
|
|
REQUIRE(sub2_int != sub1_int);
|
|
}
|
|
|
|
{
|
|
py::subinterpreter_scoped_activate scoped(si1);
|
|
REQUIRE(
|
|
py::cast<std::string>(py::module_::import("external_module").attr("multi_interp"))
|
|
== "2");
|
|
}
|
|
|
|
// out here we should be in the main interpreter, with the GIL, with the other 2 still
|
|
// alive
|
|
|
|
auto post_int
|
|
= py::module_::import("external_module").attr("internals_at")().cast<uintptr_t>();
|
|
// Make sure internals went back the way it was before
|
|
REQUIRE(main_int == post_int);
|
|
|
|
REQUIRE(py::cast<std::string>(py::module_::import("external_module").attr("multi_interp"))
|
|
== "1");
|
|
}
|
|
|
|
// now back to just main
|
|
|
|
auto post_int
|
|
= py::module_::import("external_module").attr("internals_at")().cast<uintptr_t>();
|
|
// Make sure internals went back the way it was before
|
|
REQUIRE(main_int == post_int);
|
|
|
|
REQUIRE(py::cast<std::string>(py::module_::import("external_module").attr("multi_interp"))
|
|
== "1");
|
|
|
|
unsafe_reset_internals_for_single_interpreter();
|
|
}
|
|
|
|
// Test that gil_safe_call_once_and_store provides per-interpreter storage.
|
|
// Without the per-interpreter storage fix, the subinterpreter would see the value
|
|
// cached by the main interpreter, which is invalid (different interpreter's object).
|
|
TEST_CASE("gil_safe_call_once_and_store per-interpreter isolation") {
|
|
unsafe_reset_internals_for_single_interpreter();
|
|
|
|
// This static simulates a typical usage pattern where a module caches
|
|
// an imported object using gil_safe_call_once_and_store.
|
|
PYBIND11_CONSTINIT static py::gil_safe_call_once_and_store<py::object> storage;
|
|
|
|
// Get the interpreter ID in the main interpreter
|
|
auto main_interp_id = PyInterpreterState_GetID(PyInterpreterState_Get());
|
|
|
|
// Store a value in the main interpreter - we'll store the interpreter ID as a Python int
|
|
auto &main_value = storage
|
|
.call_once_and_store_result([]() {
|
|
return py::int_(PyInterpreterState_GetID(PyInterpreterState_Get()));
|
|
})
|
|
.get_stored();
|
|
REQUIRE(main_value.cast<int64_t>() == main_interp_id);
|
|
|
|
py::object dict_type = get_dict_type_object();
|
|
py::object ordered_dict_type = get_ordered_dict_type_object();
|
|
py::object default_dict_type = get_default_dict_type_object();
|
|
|
|
int64_t sub_interp_id = -1;
|
|
int64_t sub_cached_value = -1;
|
|
|
|
bool sub_default_dict_type_destroyed = false;
|
|
|
|
// Create a subinterpreter and check that it gets its own storage
|
|
{
|
|
py::scoped_subinterpreter ssi;
|
|
|
|
sub_interp_id = PyInterpreterState_GetID(PyInterpreterState_Get());
|
|
REQUIRE(sub_interp_id != main_interp_id);
|
|
|
|
// Access the same static storage from the subinterpreter.
|
|
// With per-interpreter storage, this should call the lambda again
|
|
// and cache a NEW value for this interpreter.
|
|
// Without per-interpreter storage, this would return main's cached value.
|
|
auto &sub_value
|
|
= storage
|
|
.call_once_and_store_result([]() {
|
|
return py::int_(PyInterpreterState_GetID(PyInterpreterState_Get()));
|
|
})
|
|
.get_stored();
|
|
|
|
sub_cached_value = sub_value.cast<int64_t>();
|
|
|
|
// The cached value should be the SUBINTERPRETER's ID, not the main interpreter's.
|
|
// This would fail without per-interpreter storage.
|
|
REQUIRE(sub_cached_value == sub_interp_id);
|
|
REQUIRE(sub_cached_value != main_interp_id);
|
|
|
|
py::object sub_dict_type = get_dict_type_object();
|
|
py::object sub_ordered_dict_type = get_ordered_dict_type_object();
|
|
py::object sub_default_dict_type = get_default_dict_type_object();
|
|
|
|
// Verify that the subinterpreter has its own cached type objects.
|
|
// For static types, they should be the same object across interpreters.
|
|
// See also: https://docs.python.org/3/c-api/typeobj.html#static-types
|
|
REQUIRE(sub_dict_type.is(dict_type)); // dict is a static type
|
|
REQUIRE(sub_ordered_dict_type.is(ordered_dict_type)); // OrderedDict is a static type
|
|
// For heap types, they are dynamically created per-interpreter.
|
|
// See also: https://docs.python.org/3/c-api/typeobj.html#heap-types
|
|
REQUIRE_FALSE(sub_default_dict_type.is(default_dict_type)); // defaultdict is a heap type
|
|
|
|
// Set up a weakref callback to detect when the subinterpreter's cached default_dict_type
|
|
// is destroyed so the gil_safe_call_once_and_store storage is not leaked when the
|
|
// subinterpreter is shutdown.
|
|
(void) py::weakref(sub_default_dict_type,
|
|
py::cpp_function([&](py::handle weakref) -> void {
|
|
sub_default_dict_type_destroyed = true;
|
|
weakref.dec_ref();
|
|
}))
|
|
.release();
|
|
}
|
|
|
|
// Back in main interpreter, verify main's value is unchanged
|
|
auto &main_value_after = storage.get_stored();
|
|
REQUIRE(main_value_after.cast<int64_t>() == main_interp_id);
|
|
|
|
// Verify that the types cached in main are unchanged
|
|
py::object dict_type_after = get_dict_type_object();
|
|
py::object ordered_dict_type_after = get_ordered_dict_type_object();
|
|
py::object default_dict_type_after = get_default_dict_type_object();
|
|
REQUIRE(dict_type_after.is(dict_type));
|
|
REQUIRE(ordered_dict_type_after.is(ordered_dict_type));
|
|
REQUIRE(default_dict_type_after.is(default_dict_type));
|
|
|
|
// Verify that the subinterpreter's cached default_dict_type was destroyed
|
|
REQUIRE(sub_default_dict_type_destroyed);
|
|
|
|
unsafe_reset_internals_for_single_interpreter();
|
|
}
|
|
|
|
# ifdef Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
|
|
TEST_CASE("Per-Subinterpreter GIL") {
|
|
auto main_int
|
|
= py::module_::import("external_module").attr("internals_at")().cast<uintptr_t>();
|
|
|
|
std::atomic<int> started, sync, failure;
|
|
started = 0;
|
|
sync = 0;
|
|
failure = 0;
|
|
|
|
// REQUIRE throws on failure, so we can't use it within the thread
|
|
# define T_REQUIRE(status) \
|
|
do { \
|
|
assert(status); \
|
|
if (!(status)) \
|
|
++failure; \
|
|
} while (0)
|
|
|
|
auto &&thread_main = [&](int num) {
|
|
while (started == 0)
|
|
std::this_thread::sleep_for(std::chrono::microseconds(1));
|
|
++started;
|
|
|
|
py::gil_scoped_acquire gil;
|
|
|
|
// we have the GIL, we can access the main interpreter
|
|
auto t_int
|
|
= py::module_::import("external_module").attr("internals_at")().cast<uintptr_t>();
|
|
T_REQUIRE(t_int == main_int);
|
|
py::module_::import("external_module").attr("multi_interp") = "1";
|
|
|
|
auto sub = py::subinterpreter::create();
|
|
|
|
{
|
|
py::subinterpreter_scoped_activate sguard{sub};
|
|
|
|
py::list(py::module_::import("sys").attr("path")).append(py::str("."));
|
|
|
|
// we have switched to the new interpreter and released the main gil
|
|
|
|
// trampoline_module did not provide the per_interpreter_gil tag, so it cannot be
|
|
// imported
|
|
bool caught = false;
|
|
try {
|
|
py::module_::import("trampoline_module");
|
|
} catch (pybind11::error_already_set &pe) {
|
|
T_REQUIRE(pe.matches(PyExc_ImportError));
|
|
std::string msg(pe.what());
|
|
T_REQUIRE(msg.find("does not support loading in subinterpreters")
|
|
!= std::string::npos);
|
|
caught = true;
|
|
}
|
|
T_REQUIRE(caught);
|
|
|
|
// widget_module did provide the per_interpreter_gil tag, so it this does not throw
|
|
try {
|
|
py::module_::import("widget_module");
|
|
caught = false;
|
|
} catch (pybind11::error_already_set &) {
|
|
caught = true;
|
|
}
|
|
T_REQUIRE(!caught);
|
|
|
|
// widget_module did provide the per_interpreter_gil tag, so it this does not throw
|
|
py::module_::import("widget_module");
|
|
|
|
T_REQUIRE(!py::hasattr(py::module_::import("external_module"), "multi_interp"));
|
|
py::module_::import("external_module").attr("multi_interp") = std::to_string(num);
|
|
|
|
// wait for something to set sync to our thread number
|
|
// we are holding our subinterpreter's GIL
|
|
{
|
|
py::gil_scoped_release nogil;
|
|
while (sync != num)
|
|
std::this_thread::sleep_for(std::chrono::microseconds(1));
|
|
}
|
|
|
|
// now change it so the next thread can move on
|
|
++sync;
|
|
|
|
// but keep holding the GIL until after the next thread moves on as well
|
|
{
|
|
py::gil_scoped_release nogil;
|
|
while (sync == num + 1)
|
|
std::this_thread::sleep_for(std::chrono::microseconds(1));
|
|
}
|
|
|
|
// one last check before quitting the thread, the internals should be different
|
|
auto sub_int
|
|
= py::module_::import("external_module").attr("internals_at")().cast<uintptr_t>();
|
|
T_REQUIRE(sub_int != main_int);
|
|
}
|
|
};
|
|
# undef T_REQUIRE
|
|
|
|
std::thread t1(thread_main, 1);
|
|
std::thread t2(thread_main, 2);
|
|
|
|
// we spawned two threads, at this point they are both waiting for started to increase
|
|
++started;
|
|
|
|
// ok now wait for the threads to start
|
|
while (started != 3)
|
|
std::this_thread::sleep_for(std::chrono::microseconds(1));
|
|
|
|
// we still hold the main GIL, at this point both threads are waiting on the main GIL
|
|
// IN THE CASE of free threading, the threads are waiting on sync (because there is no GIL)
|
|
|
|
// IF the below code hangs in one of the wait loops, then the child thread GIL behavior did not
|
|
// function as expected.
|
|
{
|
|
// release the GIL and allow the threads to run
|
|
py::gil_scoped_release nogil;
|
|
|
|
// the threads are now waiting on the sync
|
|
REQUIRE(sync == 0);
|
|
|
|
// this will trigger thread 1 and then advance and trigger 2 and then advance
|
|
sync = 1;
|
|
|
|
// wait for thread 2 to advance
|
|
while (sync != 3)
|
|
std::this_thread::sleep_for(std::chrono::microseconds(1));
|
|
|
|
// we know now that thread 1 has run and may be finishing
|
|
// and thread 2 is waiting for permission to advance
|
|
|
|
// so we move sync so that thread 2 can finish executing
|
|
++sync;
|
|
|
|
// now wait for both threads to complete
|
|
t1.join();
|
|
t2.join();
|
|
}
|
|
|
|
// now we have the gil again, sanity check
|
|
REQUIRE(py::cast<std::string>(py::module_::import("external_module").attr("multi_interp"))
|
|
== "1");
|
|
|
|
unsafe_reset_internals_for_single_interpreter();
|
|
|
|
// make sure nothing unexpected happened inside the threads, now that they are completed
|
|
REQUIRE(failure == 0);
|
|
}
|
|
# endif // Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
|
|
|
|
#endif // PYBIND11_HAS_SUBINTERPRETER_SUPPORT
|