Skip to content

gh-134323: Fix the new threading.RLock.locked method - #134368

Merged
vstinner merged 10 commits into
python:mainfrom
YvesDup:rlock-threading-locked-failed
May 22, 2025
Merged

gh-134323: Fix the new threading.RLock.locked method#134368
vstinner merged 10 commits into
python:mainfrom
YvesDup:rlock-threading-locked-failed

Conversation

@YvesDup

@YvesDupYvesDup commented May 20, 2025•
edited
Loading

Copy link
Copy Markdown
Contributor

This method should call the private locked method of _block attribute instead the private _count attribute which is reserved for counting recursive call of acquire/release.

The fix also concerns the _thread module in the rlock_locked function.

@bedevere-appbedevere-appBot mentioned this pull request May 20, 2025
Closed
@colesbury
colesbury requested a review from mpageMay 20, 2025 20:43
colesbury
colesbury reviewed May 20, 2025
View reviewed changes
Comment threadModules/_threadmodule.c Outdated
vstinner
vstinner reviewed May 20, 2025
View reviewed changes

@vstinnervstinner 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.

cc @sobolevn who added this locked() method.

Comment threadMisc/NEWS.d/next/Library/2025-05-20-19-16-30.gh-issue-134323.ZQZGvw.rst Outdated
Comment threadModules/_threadmodule.c Outdated
Comment threadLib/test/lock_tests.py
Comment threadLib/test/lock_tests.py
Comment threadLib/test/lock_tests.py Outdated
kumaraditya303
kumaraditya303 reviewed May 21, 2025
View reviewed changes
Comment threadMisc/NEWS.d/next/Library/2025-05-20-19-16-30.gh-issue-134323.ZQZGvw.rst Outdated
kumaraditya303
kumaraditya303 reviewed May 21, 2025
View reviewed changes
Comment threadLib/test/lock_tests.py Outdated
kumaraditya303
kumaraditya303 reviewed May 21, 2025
View reviewed changes
Comment threadModules/_threadmodule.c Outdated
YvesDupand others added 2 commits May 21, 2025 18:15
@YvesDup
Merge branch 'main' into rlock-threading-locked-failed
2603d50
@YvesDup@kumaraditya303
Fix nit
a0082a3
Co-authored-by: Kumar Aditya <kumaraditya@python.org>
colesbury
colesbury reviewed May 21, 2025
View reviewed changes
Comment threadModules/_threadmodule.c Outdated
vstinner
vstinner reviewed May 21, 2025
View reviewed changes
Comment threadLib/test/lock_tests.py Outdated
Comment threadLib/test/lock_tests.py Outdated
Comment threadModules/_threadmodule.c Outdated
vstinner
vstinner reviewed May 22, 2025
View reviewed changes
Comment threadModules/_threadmodule.c Outdated
Comment threadLib/threading.py
Comment threadModules/_threadmodule.c Outdated
vstinner
vstinner approved these changes May 22, 2025
View reviewed changes

@vstinnervstinner 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. Thanks for the multiple updates :-)

@vstinnervstinner added the needs backport to 3.14 bugs and security fixes label May 22, 2025
@vstinner
vstinner enabled auto-merge (squash) May 22, 2025 13:45
@vstinner
vstinner merged commit 3effede into python:mainMay 22, 2025
@miss-islington-app

miss-islington-appBot commented May 22, 2025

Copy link
Copy Markdown

Thanks @YvesDup for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 22, 2025
@YvesDup@kumaraditya303@miss-islington
pythongh-134323: Fix the newthreading.RLock.lockedmethod (pythonG…
3e871a1
…H-134368)
(cherry picked from commit 3effede)
Co-authored-by: Duprat <yduprat@gmail.com>
Co-authored-by: Kumar Aditya <kumaraditya@python.org>
@bedevere-app

bedevere-appBot commented May 22, 2025

Copy link
Copy Markdown

GH-134510 is a backport of this pull request to the 3.14 branch.

@bedevere-appbedevere-appBot removed the needs backport to 3.14 bugs and security fixes label May 22, 2025
@vstinner

vstinner commented May 22, 2025

Copy link
Copy Markdown
Member

Merged, thanks for the fix.

vstinner pushed a commit that referenced this pull request May 22, 2025
@miss-islington@YvesDup@kumaraditya303
[3.14]gh-134323: Fix the newthreading.RLock.lockedmethod (GH-134368
ced49a1
) (#134510)
gh-134323: Fix the new `threading.RLock.locked` method (GH-134368)
(cherry picked from commit 3effede)
Co-authored-by: Duprat <yduprat@gmail.com>
Co-authored-by: Kumar Aditya <kumaraditya@python.org>
@YvesDup

YvesDup commented May 22, 2025

Copy link
Copy Markdown
ContributorAuthor

LGTM. Thanks for the multiple updates :-)

Thank's all for your comments

@YvesDup
YvesDup deleted the rlock-threading-locked-failed branch May 22, 2025 16:15
lkollar pushed a commit to lkollar/cpython that referenced this pull request May 26, 2025
@YvesDup@kumaraditya303@lkollar
pythongh-134323: Fix the newthreading.RLock.lockedmethod (python#…
3d98861
…134368)
Co-authored-by: Kumar Aditya <kumaraditya@python.org>
Pranjal095 pushed a commit to Pranjal095/cpython that referenced this pull request Jul 12, 2025
@YvesDup@kumaraditya303@Pranjal095
pythongh-134323: Fix the newthreading.RLock.lockedmethod (python#…
36fa14c
…134368)
Co-authored-by: Kumar Aditya <kumaraditya@python.org>
taegyunkim pushed a commit to taegyunkim/cpython that referenced this pull request Aug 4, 2025
@YvesDup@kumaraditya303@taegyunkim
pythongh-134323: Fix the newthreading.RLock.lockedmethod (python#…
5f4404b
…134368)
Co-authored-by: Kumar Aditya <kumaraditya@python.org>
gostak-dd pushed a commit to gostak-dd/cpython that referenced this pull request Jun 2, 2026
@YvesDup@kumaraditya303@gostak-dd
pythongh-134323: Fix the newthreading.RLock.lockedmethod (python#…
87cc5b9
…134368)
Co-authored-by: Kumar Aditya <kumaraditya@python.org>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@colesburycolesburycolesbury left review comments
@kumaraditya303kumaraditya303kumaraditya303 left review comments
@vstinnervstinnervstinner approved these changes
@mpagempageAwaiting requested review from mpage

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@YvesDup@vstinner@colesbury@kumaraditya303