traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

_PyObject_DebugDumpStats: renamed to _PyObject_DebugMallocStats. 

Added code to call this when PYMALLOC_DEBUG is enabled, and envar
PYTHONMALLOCSTATS is set, whenever a new arena is obtained and once
late in the Python shutdown process.
This commit is contained in:
Tim Peters 2002-04-13 08:29:14 +00:00
parent b7ba743312
commit 0e871188e8
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Include/objimpl.h
View File

@ -97,7 +97,7 @@ DL_IMPORT(void *) _PyObject_DebugRealloc(void *p, size_t nbytes);
DL_IMPORT(void) _PyObject_DebugFree(void *p); DL_IMPORT(void) _PyObject_DebugFree(void *p);
DL_IMPORT(void) _PyObject_DebugDumpAddress(const void *p); DL_IMPORT(void) _PyObject_DebugDumpAddress(const void *p);
DL_IMPORT(void) _PyObject_DebugCheckAddress(const void *p); DL_IMPORT(void) _PyObject_DebugCheckAddress(const void *p);
DL_IMPORT(void) _PyObject_DebugDumpStats(void); DL_IMPORT(void) _PyObject_DebugMallocStats(void);
#define PyObject_MALLOC _PyObject_DebugMalloc #define PyObject_MALLOC _PyObject_DebugMalloc
#define PyObject_Malloc _PyObject_DebugMalloc #define PyObject_Malloc _PyObject_DebugMalloc
#define PyObject_REALLOC _PyObject_DebugRealloc #define PyObject_REALLOC _PyObject_DebugRealloc

12
Objects/obmalloc.c
View File

@ -448,6 +448,11 @@ new_arena(void)
if (bp == NULL) if (bp == NULL)
return NULL; return NULL;
#ifdef PYMALLOC_DEBUG
if (Py_GETENV("PYTHONMALLOCSTATS"))
_PyObject_DebugMallocStats();
#endif
/* arenabase <- first pool-aligned address in the arena /* arenabase <- first pool-aligned address in the arena
nfreepools <- number of whole pools that fit after alignment */ nfreepools <- number of whole pools that fit after alignment */
arenabase = bp; arenabase = bp;
@ -1216,7 +1221,7 @@ printone(const char* msg, ulong value)
/* Print summary info to stderr about the state of pymalloc's structures. */ /* Print summary info to stderr about the state of pymalloc's structures. */
void void
_PyObject_DebugDumpStats(void) _PyObject_DebugMallocStats(void)
{ {
uint i; uint i;
const uint numclasses = SMALL_REQUEST_THRESHOLD >> ALIGNMENT_SHIFT; const uint numclasses = SMALL_REQUEST_THRESHOLD >> ALIGNMENT_SHIFT;
@ -1245,8 +1250,6 @@ _PyObject_DebugDumpStats(void)
fprintf(stderr, "Small block threshold = %d, in %u size classes.\n", fprintf(stderr, "Small block threshold = %d, in %u size classes.\n",
SMALL_REQUEST_THRESHOLD, numclasses); SMALL_REQUEST_THRESHOLD, numclasses);
fprintf(stderr, "pymalloc malloc+realloc called %lu times.\n",
serialno);
for (i = 0; i < numclasses; ++i) for (i = 0; i < numclasses; ++i)
numpools[i] = numblocks[i] = numfreeblocks[i] = 0; numpools[i] = numblocks[i] = numfreeblocks[i] = 0;
@ -1312,6 +1315,7 @@ _PyObject_DebugDumpStats(void)
quantization += p * ((POOL_SIZE - POOL_OVERHEAD) % size); quantization += p * ((POOL_SIZE - POOL_OVERHEAD) % size);
} }
fputc('\n', stderr); fputc('\n', stderr);
(void)printone("# times object malloc called", serialno);
PyOS_snprintf(buf, sizeof(buf), PyOS_snprintf(buf, sizeof(buf),
"%u arenas * %d bytes/arena", narenas, ARENA_SIZE); "%u arenas * %d bytes/arena", narenas, ARENA_SIZE);
@ -1320,12 +1324,12 @@ _PyObject_DebugDumpStats(void)
fputc('\n', stderr); fputc('\n', stderr);
total = printone("# bytes in allocated blocks", allocated_bytes); total = printone("# bytes in allocated blocks", allocated_bytes);
total += printone("# bytes in available blocks", available_bytes);
PyOS_snprintf(buf, sizeof(buf), PyOS_snprintf(buf, sizeof(buf),
"%u unused pools * %d bytes", numfreepools, POOL_SIZE); "%u unused pools * %d bytes", numfreepools, POOL_SIZE);
total += printone(buf, (ulong)numfreepools * POOL_SIZE); total += printone(buf, (ulong)numfreepools * POOL_SIZE);
total += printone("# bytes in available blocks", available_bytes);
total += printone("# bytes lost to pool headers", pool_header_bytes); total += printone("# bytes lost to pool headers", pool_header_bytes);
total += printone("# bytes lost to quantization", quantization); total += printone("# bytes lost to quantization", quantization);
total += printone("# bytes lost to arena alignment", arena_alignment); total += printone("# bytes lost to arena alignment", arena_alignment);

5
Python/pythonrun.c
View File

@ -276,6 +276,11 @@ Py_Finalize(void)
PyGrammar_RemoveAccelerators(&_PyParser_Grammar); PyGrammar_RemoveAccelerators(&_PyParser_Grammar);
#ifdef PYMALLOC_DEBUG
if (Py_GETENV("PYTHONMALLOCSTATS"))
_PyObject_DebugMallocStats();
#endif
call_ll_exitfuncs(); call_ll_exitfuncs();
#ifdef Py_TRACE_REFS #ifdef Py_TRACE_REFS