gh-129185: Use PyMutex in tracemalloc #129246
Merged
+4
−15
Conversation
This file contains 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
Member
vstinner
commented
Jan 23, 2025
•
vstinner
commented
- Issue: Segmentation fault during interpreter finalization in PyTraceMalloc_Untrack #129185
vstinner
commented
Jan 23, 2025
| @@ -37,8 +38,8 @@ static int _PyTraceMalloc_TraceRef(PyObject *op, PyRefTracerEvent event, | |||
| the GIL held from PyMem_RawFree(). It cannot acquire the lock because it | |||
| would introduce a deadlock in _PyThreadState_DeleteCurrent(). */ | |||
| #define tables_lock _PyRuntime.tracemalloc.tables_lock | |||
| #define TABLES_LOCK() PyThread_acquire_lock(tables_lock, 1) | |||
| #define TABLES_UNLOCK() PyThread_release_lock(tables_lock) | |||
| #define TABLES_LOCK() PyMutex_LockFlags(&tables_lock, _Py_LOCK_DONT_DETACH) | |||
There was a problem hiding this comment.
PyMutex_Lock(&tables_lock) cannot be used "free" allocator hooks which don't acquire the GIL.
Maybe PyMutex_Lock(&tables_lock) should be preferred in functions which hold the GIL?
There was a problem hiding this comment.
I don't think it matters. TABLES_LOCK() didn't detach the thread state before, no need to now. (In fact, some unpredictable things might happen if another thread takes the GIL and then uses tracemalloc.)
ZeroIntensity
approved these changes
Jan 24, 2025
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.