Skip to content

GH-96071: fix deadlock in PyGILState_Ensure #96124

Merged
miss-islington merged 3 commits into
python:mainfrom
kumaraditya303:pystate-2
Aug 19, 2022
Merged

GH-96071: fix deadlock in PyGILState_Ensure #96124
miss-islington merged 3 commits into
python:mainfrom
kumaraditya303:pystate-2

Conversation

@kumaraditya303

@kumaraditya303 kumaraditya303 commented Aug 19, 2022 •
edited by miss-islington
Loading

Copy link
Copy Markdown
Contributor

Alternative of #96107

Automerge-Triggered-By: GH:ericsnowcurrently

@pablogsal

pablogsal commented Aug 19, 2022

Copy link
Copy Markdown
Member

Nice, now that we have both, which one do you prefer in terms of maintainability? (Is ok if you like the other one more)

I personally like this one a bit more because I can reason easier about re-entrancy and concurrency

@kumaraditya303 kumaraditya303 mentioned this pull request Aug 19, 2022
Closed
@kumaraditya303

kumaraditya303 commented Aug 19, 2022

Copy link
Copy Markdown
Contributor Author

@pablogsal Let's go with this one. I agree this is easier to understand than the other one.

@kumaraditya303 kumaraditya303 added interpreter-core (Objects, Python, Grammar, and Parser dirs) release-blocker needs backport to 3.11 only security fixes labels Aug 19, 2022
ericsnowcurrently
ericsnowcurrently requested changes Aug 19, 2022
View reviewed changes

@ericsnowcurrently ericsnowcurrently left a comment

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.

LGTM (with one minor adjustment to a comment)

Comment thread Python/pystate.c Outdated
@bedevere-bot

bedevere-bot commented Aug 19, 2022

Copy link
Copy Markdown

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@kumaraditya303 @ericsnowcurrently
Update Python/pystate.c
1f75cb4 
Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
@miss-islington miss-islington merged commit e0d54a4 into python:main Aug 19, 2022
@miss-islington

miss-islington commented Aug 19, 2022

Copy link
Copy Markdown
Contributor

Thanks @kumaraditya303 for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Aug 19, 2022
@kumaraditya303 @miss-islington
pythonGH-96071: fix deadlock in PyGILState_Ensure (pythonGH-96124)
1a1e72f 
Alternative of pythonGH-96107
(cherry picked from commit e0d54a4)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Aug 19, 2022
@bedevere-bot

bedevere-bot commented Aug 19, 2022

Copy link
Copy Markdown

GH-96129 is a backport of this pull request to the 3.11 branch.

pablogsal pushed a commit that referenced this pull request Aug 19, 2022
@miss-islington @kumaraditya303
GH-96071: fix deadlock in PyGILState_Ensure (GH-96124) (#96129)
1fa9644 
Alternative of GH-96107
(cherry picked from commit e0d54a4)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
@kumaraditya303 kumaraditya303 deleted the pystate-2 branch August 20, 2022 09:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ericsnowcurrently ericsnowcurrently ericsnowcurrently approved these changes
@pablogsal pablogsal pablogsal approved these changes

Assignees

No one assigned

Labels

interpreter-core (Objects, Python, Grammar, and Parser dirs) release-blocker

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@kumaraditya303 @pablogsal @bedevere-bot @miss-islington @ericsnowcurrently