-
-
Notifications
You must be signed in to change notification settings - Fork 34.4k
gh-146536: docs: Clarify that PyMutex is not re-entrant #146543
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.
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
Open
dagangtj
wants to merge
1
commit into
python:main
Choose a base branch
from
dagangtj:fix/issue-146536
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -24,6 +24,13 @@ The C-API provides a basic mutual exclusion lock. | |||||||||
| considered unstable. The size may change in future Python releases | ||||||||||
| without a deprecation period. | ||||||||||
|
|
||||||||||
| .. note:: | ||||||||||
|
|
||||||||||
| A :c:type:`!PyMutex` is **not** re-entrant (recursive). If a thread | ||||||||||
| that already holds the lock attempts to acquire it again, the thread | ||||||||||
| will deadlock. Use :c:func:`Py_BEGIN_CRITICAL_SECTION` instead if | ||||||||||
| re-entrancy is required. | ||||||||||
|
|
||||||||||
| .. versionadded:: 3.13 | ||||||||||
|
|
||||||||||
| .. c:function:: void PyMutex_Lock(PyMutex *m) | ||||||||||
|
|
@@ -32,12 +39,20 @@ The C-API provides a basic mutual exclusion lock. | |||||||||
| thread will block until the mutex is unlocked. While blocked, the thread | ||||||||||
| will temporarily detach the :term:`thread state <attached thread state>` if one exists. | ||||||||||
|
|
||||||||||
| .. warning:: | ||||||||||
|
|
||||||||||
| This function will deadlock if the calling thread already holds the lock. | ||||||||||
| :c:type:`!PyMutex` is not re-entrant. For re-entrant locking, use | ||||||||||
| :c:func:`Py_BEGIN_CRITICAL_SECTION` instead. | ||||||||||
|
Comment on lines
+45
to
+46
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is redundant.
Suggested change
|
||||||||||
|
|
||||||||||
| .. versionadded:: 3.13 | ||||||||||
|
|
||||||||||
| .. c:function:: void PyMutex_Unlock(PyMutex *m) | ||||||||||
|
|
||||||||||
| Unlock mutex *m*. The mutex must be locked --- otherwise, the function will | ||||||||||
| issue a fatal error. | ||||||||||
| Unlock mutex *m*. The mutex must be locked by the calling thread --- | ||||||||||
| otherwise, the function will issue a fatal error. Unlocking a mutex from | ||||||||||
| a different thread than the one that locked it results in undefined | ||||||||||
| behavior. | ||||||||||
|
Comment on lines
+53
to
+55
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is it a guaranteed fatal error, or undefined behaviour? It can't be both at once. |
||||||||||
|
|
||||||||||
| .. versionadded:: 3.13 | ||||||||||
|
|
||||||||||
|
|
||||||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we need the note both here and on
PyMutex_Lock.