mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-26 19:55:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

gh-129185: Use PyMutex in tracemalloc (#129246)

Browse source
This commit is contained in:
Victor Stinner 2025-01-24 11:25:24 +01:00 • committed by GitHub
parent 36bb229933
commit c005ea4951
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Include/internal/pycore_tracemalloc.h
View file

@ -70,7 +70,7 @@ struct _tracemalloc_runtime_state {
PyMemAllocatorEx obj; PyMemAllocatorEx obj;
} allocators; } allocators;
PyThread_type_lock tables_lock; PyMutex tables_lock;
/* Size in bytes of currently traced memory. /* Size in bytes of currently traced memory.
Protected by TABLES_LOCK(). */ Protected by TABLES_LOCK(). */
size_t traced_memory; size_t traced_memory;

17
Python/tracemalloc.c
View file

@ -3,6 +3,7 @@
#include "pycore_gc.h" // PyGC_Head #include "pycore_gc.h" // PyGC_Head
#include "pycore_hashtable.h" // _Py_hashtable_t #include "pycore_hashtable.h" // _Py_hashtable_t
#include "pycore_initconfig.h" // _PyStatus_NO_MEMORY() #include "pycore_initconfig.h" // _PyStatus_NO_MEMORY()
#include "pycore_lock.h" // PyMutex_LockFlags()
#include "pycore_object.h" // _PyType_PreHeaderSize() #include "pycore_object.h" // _PyType_PreHeaderSize()
#include "pycore_pymem.h" // _Py_tracemalloc_config #include "pycore_pymem.h" // _Py_tracemalloc_config
#include "pycore_runtime.h" // _Py_ID() #include "pycore_runtime.h" // _Py_ID()
@ -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 the GIL held from PyMem_RawFree(). It cannot acquire the lock because it
would introduce a deadlock in _PyThreadState_DeleteCurrent(). */ would introduce a deadlock in _PyThreadState_DeleteCurrent(). */
#define tables_lock _PyRuntime.tracemalloc.tables_lock #define tables_lock _PyRuntime.tracemalloc.tables_lock
#define TABLES_LOCK() PyThread_acquire_lock(tables_lock, 1) #define TABLES_LOCK() PyMutex_LockFlags(&tables_lock, _Py_LOCK_DONT_DETACH)
#define TABLES_UNLOCK() PyThread_release_lock(tables_lock) #define TABLES_UNLOCK() PyMutex_Unlock(&tables_lock)
#define DEFAULT_DOMAIN 0 #define DEFAULT_DOMAIN 0
@ -741,13 +742,6 @@ _PyTraceMalloc_Init(void)
return _PyStatus_NO_MEMORY(); return _PyStatus_NO_MEMORY();
} }
if (tables_lock == NULL) {
tables_lock = PyThread_allocate_lock();
if (tables_lock == NULL) {
return _PyStatus_NO_MEMORY();
}
}
tracemalloc_filenames = hashtable_new(hashtable_hash_pyobject, tracemalloc_filenames = hashtable_new(hashtable_hash_pyobject,
hashtable_compare_unicode, hashtable_compare_unicode,
tracemalloc_clear_filename, NULL); tracemalloc_clear_filename, NULL);
@ -792,11 +786,6 @@ tracemalloc_deinit(void)
_Py_hashtable_destroy(tracemalloc_tracebacks); _Py_hashtable_destroy(tracemalloc_tracebacks);
_Py_hashtable_destroy(tracemalloc_filenames); _Py_hashtable_destroy(tracemalloc_filenames);
if (tables_lock != NULL) {
PyThread_free_lock(tables_lock);
tables_lock = NULL;
}
PyThread_tss_delete(&tracemalloc_reentrant_key); PyThread_tss_delete(&tracemalloc_reentrant_key);
} }