mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #26588:

Browse source 
* Optimize tracemalloc_add_trace(): modify hashtable entry data (trace) if the
  memory block is already tracked, rather than trying to remove the old trace
  and then add a new trace.
* Add _Py_HASHTABLE_ENTRY_WRITE_DATA() macro
This commit is contained in:
Victor Stinner 2016-03-23 09:38:54 +01:00
parent e8c6b2fd1b
commit ca79ccd9e6
3 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Modules/_tracemalloc.c
View file

@ -552,33 +552,49 @@ static int
tracemalloc_add_trace(_PyTraceMalloc_domain_t domain, Py_uintptr_t ptr,
size_t size)
{
pointer_t key = {ptr, domain};
traceback_t *traceback;
trace_t trace;
_Py_hashtable_entry_t* entry;
int res;
assert(tracemalloc_config.tracing);
/* first, remove the previous trace (if any) */
tracemalloc_remove_trace(domain, ptr);
traceback = traceback_new();
if (traceback == NULL) {
return -1;
}
trace.size = size;
trace.traceback = traceback;
if (tracemalloc_config.use_domain) {
pointer_t key = {ptr, domain};
res = _Py_HASHTABLE_SET(tracemalloc_traces, key, trace);
entry = _Py_HASHTABLE_GET_ENTRY(tracemalloc_traces, key);
}
else {
res = _Py_HASHTABLE_SET(tracemalloc_traces, ptr, trace);
entry = _Py_HASHTABLE_GET_ENTRY(tracemalloc_traces, ptr);
}
if (res != 0) {
return res;
if (entry != NULL) {
/* the memory block is already tracked */
_Py_HASHTABLE_ENTRY_READ_DATA(tracemalloc_traces, entry, trace);
assert(tracemalloc_traced_memory >= trace.size);
tracemalloc_traced_memory -= trace.size;
trace.size = size;
trace.traceback = traceback;
_Py_HASHTABLE_ENTRY_WRITE_DATA(tracemalloc_traces, entry, trace);
}
else {
trace.size = size;
trace.traceback = traceback;
if (tracemalloc_config.use_domain) {
res = _Py_HASHTABLE_SET(tracemalloc_traces, key, trace);
}
else {
res = _Py_HASHTABLE_SET(tracemalloc_traces, ptr, trace);
}
if (res != 0) {
return res;
}
}
assert(tracemalloc_traced_memory <= PY_SIZE_MAX - size);