gh-137514: Add a free-threading wrapper for mutexes #137515
Merged
+44
−88
Conversation
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
| @@ -15993,13 +15985,13 @@ intern_common(PyInterpreterState *interp, PyObject *s /* stolen */, | |||
| PyObject *interned = get_interned_dict(interp); | |||
| assert(interned != NULL); | |||
|
|
|||
| LOCK_INTERNED(interp); | |||
There was a problem hiding this comment.
I believe it is worth to keep the old interface here. And implement LOCK_INTERNED via FT_MUTEX_LOCK.
There was a problem hiding this comment.
It is shorter, easier to read and less error-prone on my sight.
There was a problem hiding this comment.
Hm, instead of adding another locking macro, how about an INTERN_MUTEX macro that acts as a shorthand for &_Py_INTERP_CACHED_OBJECT(interp, interned_mutex).
There was a problem hiding this comment.
Looks like a good idea!
| @@ -509,9 +502,9 @@ _PyEval_SetProfile(PyThreadState *tstate, Py_tracefunc func, PyObject *arg) | |||
|
|
|||
| // needs to be decref'd outside of the lock | |||
| PyObject *old_profileobj; | |||
| LOCK_SETUP(); | |||
There was a problem hiding this comment.
Same here. I think it is better to keep the old one.
There was a problem hiding this comment.
I think this one is fine. We already used sys_trace_profile_mutex inline in pystate.c.
colesbury
approved these changes
Aug 7, 2025
kumaraditya303
approved these changes
Aug 7, 2025
|
Do we want this in 3.14? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add
FT_MUTEX_LOCK/FT_MUTEX_UNLOCK, which callPyMutex_LockandPyMutex_Unlockon the free-threaded build, and no-op otherwise.