Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use PyEval_InitThreads() as intended #4350

Merged
merged 3 commits into from
Nov 22, 2022
Merged

Use PyEval_InitThreads() as intended #4350

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8838f38
Use `PyEval_InitThreads()` as intended (actually matters only for Pyt…
Nov 21, 2022
a272c17
Add `if defined(WITH_THREAD)` condition.
Nov 21, 2022
96a6bfa
Fix oversight pointed out by @EricCousineau-TRI: Remove condition tha…
Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions include/pybind11/detail/internals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,9 +468,6 @@ PYBIND11_NOINLINE internals &get_internals() {
internals_ptr = new internals();
#if defined(WITH_THREAD)

# if PY_VERSION_HEX < 0x03090000
PyEval_InitThreads();
# endif
PyThreadState *tstate = PyThreadState_Get();
if (!PYBIND11_TLS_KEY_CREATE(internals_ptr->tstate)) {
pybind11_fail("get_internals: could not successfully initialize the tstate TSS key!");
Expand Down
6 changes: 6 additions & 0 deletions include/pybind11/embed.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ inline void initialize_interpreter(bool init_signal_handlers = true,
#if PY_VERSION_HEX < 0x030B0000

Py_InitializeEx(init_signal_handlers ? 1 : 0);
# if defined(WITH_THREAD) && PY_VERSION_HEX < 0x03070000
PyEval_InitThreads();
# endif

// Before it was special-cased in python 3.8, passing an empty or null argv
// caused a segfault, so we have to reimplement the special case ourselves.
Expand Down Expand Up @@ -168,6 +171,9 @@ inline void initialize_interpreter(bool init_signal_handlers = true,
throw std::runtime_error(PyStatus_IsError(status) ? status.err_msg
: "Failed to init CPython");
}
# if defined(WITH_THREAD) && PY_VERSION_HEX < 0x03070000
EricCousineau-TRI marked this conversation as resolved.
Show resolved Hide resolved
PyEval_InitThreads();
# endif
if (add_program_dir_to_path) {
PyRun_SimpleString("import sys, os.path; "
"sys.path.insert(0, "
Expand Down