mirror of
https://github.com/python/cpython.git
synced 2026-05-06 12:49:07 -04:00
gh-143057: avoid locking in tracemalloc C-APIs when it is not enabled (#143065)
This commit is contained in:
@@ -21,7 +21,10 @@ struct _PyTraceMalloc_Config {
|
||||
} initialized;
|
||||
|
||||
/* Is tracemalloc tracing memory allocations?
|
||||
Variable protected by the TABLES_LOCK(). */
|
||||
Variable protected by the TABLES_LOCK() and stored atomically.
|
||||
Atomic store is used so that it can read without locking for the
|
||||
general case of checking if tracemalloc is enabled.
|
||||
*/
|
||||
int tracing;
|
||||
|
||||
/* limit of the number of frames in a traceback, 1 by default.
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
Avoid locking in :c:func:`PyTraceMalloc_Track` and :c:func:`PyTraceMalloc_Untrack` when :mod:`tracemalloc` is not enabled.
|
||||
+11
-2
@@ -850,7 +850,7 @@ _PyTraceMalloc_Start(int max_nframe)
|
||||
|
||||
/* everything is ready: start tracing Python memory allocations */
|
||||
TABLES_LOCK();
|
||||
tracemalloc_config.tracing = 1;
|
||||
_Py_atomic_store_int_relaxed(&tracemalloc_config.tracing, 1);
|
||||
TABLES_UNLOCK();
|
||||
|
||||
return 0;
|
||||
@@ -867,7 +867,7 @@ _PyTraceMalloc_Stop(void)
|
||||
}
|
||||
|
||||
/* stop tracing Python memory allocations */
|
||||
tracemalloc_config.tracing = 0;
|
||||
_Py_atomic_store_int_relaxed(&tracemalloc_config.tracing, 0);
|
||||
|
||||
/* unregister the hook on memory allocators */
|
||||
PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &allocators.raw);
|
||||
@@ -1207,6 +1207,10 @@ int
|
||||
PyTraceMalloc_Track(unsigned int domain, uintptr_t ptr,
|
||||
size_t size)
|
||||
{
|
||||
if (_Py_atomic_load_int_relaxed(&tracemalloc_config.tracing) == 0) {
|
||||
/* tracemalloc is not tracing: do nothing */
|
||||
return -2;
|
||||
}
|
||||
PyGILState_STATE gil_state = PyGILState_Ensure();
|
||||
TABLES_LOCK();
|
||||
|
||||
@@ -1228,6 +1232,11 @@ PyTraceMalloc_Track(unsigned int domain, uintptr_t ptr,
|
||||
int
|
||||
PyTraceMalloc_Untrack(unsigned int domain, uintptr_t ptr)
|
||||
{
|
||||
if (_Py_atomic_load_int_relaxed(&tracemalloc_config.tracing) == 0) {
|
||||
/* tracemalloc is not tracing: do nothing */
|
||||
return -2;
|
||||
}
|
||||
|
||||
TABLES_LOCK();
|
||||
|
||||
int result;
|
||||
|
||||
Reference in New Issue
Block a user