Skip to content

bpo-36333, bpo-36356: Fix _PyEval_FiniThreads() #12432

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
vstinner merged 2 commits into from
Mar 19, 2019
Merged

bpo-36333, bpo-36356: Fix _PyEval_FiniThreads() #12432

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ce82f5
bpo-36333, bpo-36356: Fix _PyEval_FiniThreads()
vstinner Mar 19, 2019
09f6fa9
fix test
vstinner Mar 19, 2019
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
Next Next commit
bpo-36333, bpo-36356: Fix _PyEval_FiniThreads() 
_PyEval_FiniThreads() now free the pending lock.
  • Loading branch information
@vstinner
vstinner committed Mar 19, 2019
commit 3ce82f55454e97ce6d3d426da40b54f9cfaacaf4
13 changes: 11 additions & 2 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,10 @@ PyEval_ThreadsInitialized(void)
void
PyEval_InitThreads(void)
{
if (gil_created())
if (gil_created()) {
return;
}

PyThread_init_thread();
create_gil();
take_gil(_PyThreadState_GET());
Expand All @@ -184,10 +186,17 @@ PyEval_InitThreads(void)
void
_PyEval_FiniThreads(void)
{
if (!gil_created())
if (!gil_created()) {
return;
}

destroy_gil();
assert(!gil_created());

if (_PyRuntime.ceval.pending.lock == NULL) {
PyThread_free_lock(_PyRuntime.ceval.pending.lock);
_PyRuntime.ceval.pending.lock = NULL;
}
}

void
Expand Down