From 5d39e0429029324cae90bba2f19fb689b007c7d6 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 29 Nov 2017 17:20:38 +0100 Subject: bpo-32030: Rework memory allocators (#4625) * Fix _PyMem_SetupAllocators("debug"): always restore allocators to the defaults, rather than only caling _PyMem_SetupDebugHooks(). * Add _PyMem_SetDefaultAllocator() helper to set the "default" allocator. * Add _PyMem_GetAllocatorsName(): get the name of the allocators * main() now uses debug hooks on memory allocators if Py_DEBUG is defined, rather than calling directly malloc() * Document default memory allocators in C API documentation * _Py_InitializeCore() now fails with a fatal user error if PYTHONMALLOC value is an unknown memory allocator, instead of failing with a fatal internal error. * Add new tests on the PYTHONMALLOC environment variable * Add support.with_pymalloc() * Add the _testcapi.WITH_PYMALLOC constant and expose it as support.with_pymalloc(). * sysconfig.get_config_var('WITH_PYMALLOC') doesn't work on Windows, so replace it with support.with_pymalloc(). * pythoninfo: add _testcapi collector for pymem --- Python/pylifecycle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Python/pylifecycle.c') diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index b89cbc88d4..01f314e4bd 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -630,7 +630,7 @@ _Py_InitializeCore(const _PyCoreConfig *config) } if (_PyMem_SetupAllocators(core_config.allocator) < 0) { - return _Py_INIT_ERR("Unknown PYTHONMALLOC allocator"); + return _Py_INIT_USER_ERR("Unknown PYTHONMALLOC allocator"); } if (_PyRuntime.initialized) { -- cgit v1.2.1