diff options
| -rw-r--r-- | Include/internal/pycore_object.h | 9 | ||||
| -rw-r--r-- | Include/internal/pycore_pymem.h | 8 | ||||
| -rw-r--r-- | Objects/obmalloc.c | 3 | ||||
| -rw-r--r-- | Python/pylifecycle.c | 1 |
4 files changed, 9 insertions, 12 deletions
diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h index c520122aa5..5fe4ddb2ef 100644 --- a/Include/internal/pycore_object.h +++ b/Include/internal/pycore_object.h @@ -232,15 +232,6 @@ extern void _PyObject_FreeInstanceAttributes(PyObject *self); extern int _PyObject_IsInstanceDictEmpty(PyObject *); extern PyObject* _PyType_GetSubclasses(PyTypeObject *); -/* This function returns the number of allocated memory blocks, regardless of size */ -PyAPI_FUNC(Py_ssize_t) _Py_GetAllocatedBlocks(void); - -/* Macros */ -#ifdef WITH_PYMALLOC -// Export the symbol for the 3rd party guppy3 project -PyAPI_FUNC(int) _PyObject_DebugMallocStats(FILE *out); -#endif - #ifdef __cplusplus } #endif diff --git a/Include/internal/pycore_pymem.h b/Include/internal/pycore_pymem.h index d70deee710..b9eea9d4b3 100644 --- a/Include/internal/pycore_pymem.h +++ b/Include/internal/pycore_pymem.h @@ -99,6 +99,14 @@ PyAPI_DATA(struct _PyTraceMalloc_Config) _Py_tracemalloc_config; void *_PyObject_VirtualAlloc(size_t size); void _PyObject_VirtualFree(void *, size_t size); +/* This function returns the number of allocated memory blocks, regardless of size */ +PyAPI_FUNC(Py_ssize_t) _Py_GetAllocatedBlocks(void); + +/* Macros */ +#ifdef WITH_PYMALLOC +// Export the symbol for the 3rd party guppy3 project +PyAPI_FUNC(int) _PyObject_DebugMallocStats(FILE *out); +#endif #ifdef __cplusplus } diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c index ea0faff5bb..e3df7e8cc4 100644 --- a/Objects/obmalloc.c +++ b/Objects/obmalloc.c @@ -8,9 +8,6 @@ /* Defined in tracemalloc.c */ extern void _PyMem_DumpTraceback(int fd, const void *ptr); -// Forward declaration -int _PyObject_DebugMallocStats(FILE *out); - /* Python's malloc wrappers (see pymem.h) */ diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 106e11ea12..ba7bcd2f88 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -19,6 +19,7 @@ #include "pycore_pathconfig.h" // _PyConfig_WritePathConfig() #include "pycore_pyerrors.h" // _PyErr_Occurred() #include "pycore_pylifecycle.h" // _PyErr_Print() +#include "pycore_pymem.h" // _PyObject_DebugMallocStats() #include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_runtime_init.h" // _PyRuntimeState_INIT #include "pycore_sliceobject.h" // _PySlice_Fini() |