Skip to content

gh-133171: Make the executor_list thread-safe #140038

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

Closed
aisk wants to merge 7 commits into from
Closed

gh-133171: Make the executor_list thread-safe #140038

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e178e42
Add lock with operations on _PyExecutorObject list
aisk Oct 13, 2025
f3a9c74
Using FT_MUTEX_LOCK macro
aisk Oct 13, 2025
283f453
Merge remote-tracking branch 'upstream/main' into executor-list-lock
aisk Nov 9, 2025
6858161
Free the executors outside the lock in _Py_ClearExecutorDeletionList
aisk Nov 9, 2025
fa0dd0b
Fix a potential dead lock in add_to_pending_deletion_list
aisk Nov 9, 2025
bf48bb4
Using a _PyRecursiveMutex for executors lock
aisk Nov 9, 2025
6a5a1a9
Fix refcount
aisk Nov 9, 2025
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
Fix a potential dead lock in add_to_pending_deletion_list
  • Loading branch information
@aisk
aisk committed Nov 9, 2025
commit fa0dd0be5d4b45660258c2fa8e5ebb5cb04dd694
8 changes: 7 additions & 1 deletion Python/optimizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,11 +296,17 @@ add_to_pending_deletion_list(_PyExecutorObject *self)
interp->executor_deletion_list_head = self;
if (interp->executor_deletion_list_remaining_capacity > 0) {
interp->executor_deletion_list_remaining_capacity--;
EXECUTOR_LIST_UNLOCK(interp);
}
else {
/* Release the lock before calling _Py_ClearExecutorDeletionList
* to avoid deadlock, since it also tries to acquire the same lock */
EXECUTOR_LIST_UNLOCK(interp);
_Py_ClearExecutorDeletionList(interp);
EXECUTOR_LIST_LOCK(interp);
Comment on lines +303 to +307

@Fidget-Spinner Fidget-Spinner Nov 9, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need this?

interp->executor_deletion_list_head = self;
EXECUTOR_LIST_UNLOCK(interp);
}
EXECUTOR_LIST_UNLOCK(interp);
}

static void
Expand Down
Loading