Skip to content

gh-99113: Make Sure the GIL is Acquired at the Right Places #104208

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

Merged
merged 7 commits into from
May 6, 2023
Merged

gh-99113: Make Sure the GIL is Acquired at the Right Places #104208

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ca1f78e
Add _PyEval_AcquireLock().
ericsnowcurrently Apr 10, 2023
c5d3b2c
Add _PyThreadState_SwapNoGIL().
ericsnowcurrently Apr 10, 2023
2404310
Acquire the GIL when not owned.
ericsnowcurrently Apr 10, 2023
85702ae
Fix a typo.
ericsnowcurrently May 6, 2023
3cc9dc3
Do not release the GIL when not necessary.
ericsnowcurrently May 6, 2023
3104796
Make sure the GIL is held by the current thread in _PyEval_InitGIL().
ericsnowcurrently May 6, 2023
56064c7
Release the GIL after swapping thread states.
ericsnowcurrently May 6, 2023
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
Prev Previous commit
Next Next commit
Do not release the GIL when not necessary.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 6, 2023
commit 3cc9dc3d8382aa4d84017b6f2adfa9e23e9cdf01
8 changes: 7 additions & 1 deletion Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2031,10 +2031,14 @@ new_interpreter(PyThreadState **tstate_p, const PyInterpreterConfig *config)
PyThreadState *save_tstate = _PyThreadState_SwapNoGIL(tstate);
int has_gil = 0;

/* From this point until the init_interp_create_gil() call,
we must not do anything that requires that the GIL be held
(or otherwise exist). That applies whether or not the new
interpreter has its own GIL (e.g. the main interpreter). */

/* Copy the current interpreter config into the new interpreter */
const PyConfig *src_config;
if (save_tstate != NULL) {
_PyEval_ReleaseLock(save_tstate);
src_config = _PyInterpreterState_GetConfig(save_tstate->interp);
}
else
Expand All @@ -2044,11 +2048,13 @@ new_interpreter(PyThreadState **tstate_p, const PyInterpreterConfig *config)
src_config = _PyInterpreterState_GetConfig(main_interp);
}

/* This does not require that the GIL be held. */
status = _PyConfig_Copy(&interp->config, src_config);
if (_PyStatus_EXCEPTION(status)) {
goto error;
}

/* This does not require that the GIL be held. */
status = init_interp_settings(interp, config);
if (_PyStatus_EXCEPTION(status)) {
goto error;
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy