bpo-36142: Add _PyMem_GetDebugAllocatorsName() (GH-12185)

bpo-36142: Add _PyMem_GetDebugAllocatorsName() (GH-12185) · python/cpython@a9df651

5 files changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,8 @@ PyAPI_FUNC(int) _PyMem_SetDefaultAllocator(`
`155`	`155`	`PyMemAllocatorDomain domain,`
`156`	`156`	`PyMemAllocatorEx *old_alloc);`
`157`	`157`
	`158`	`+PyAPI_FUNC(const char*) _PyMem_GetDebugAllocatorsName(void);`
	`159`	`+`
`158`	`160`	`#ifdef __cplusplus`
`159`	`161`	`}`
`160`	`162`	`#endif`

Original file line number	Diff line number	Diff line change
`@@ -336,6 +336,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):`
`336`	`336`	`'legacy_windows_fs_encoding': 0,`
`337`	`337`	`'legacy_windows_stdio': 0,`
`338`	`338`	`})`
	`339`	`+DEBUG_ALLOCATOR = 'pymalloc_debug' if support.with_pymalloc() else 'malloc_debug'`
`339`	`340`
`340`	`341`	`# main config`
`341`	`342`	`COPY_MAIN_CONFIG = (`
`@@ -588,15 +589,15 @@ def test_init_env(self):`
`588`	`589`
`589`	`590`	`def test_init_env_dev_mode(self):`
`590`	`591`	`config = dict(self.INIT_ENV_CONFIG,`
`591`		`-allocator='debug',`
	`592`	`+allocator=self.DEBUG_ALLOCATOR,`
`592`	`593`	`dev_mode=1)`
`593`	`594`	`self.check_config("init_env_dev_mode", config)`
`594`	`595`
`595`	`596`	`def test_init_dev_mode(self):`
`596`	`597`	`config = {`
`597`	`598`	`'dev_mode': 1,`
`598`	`599`	`'faulthandler': 1,`
`599`		`-'allocator': 'debug',`
	`600`	`+'allocator': self.DEBUG_ALLOCATOR,`
`600`	`601`	`}`
`601`	`602`	`self.check_config("init_dev_mode", config)`
`602`	`603`

Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,20 @@ static PyMemAllocatorEx _PyObject = PYOBJ_ALLOC;`
`221`	`221`	`#endif`
`222`	`222`
`223`	`223`
	`224`	`+/* Get the effective name of "debug" memory allocators,`
	`225`	`+ as if _PyMem_GetAllocatorsName() is called after`
	`226`	`+ _PyMem_SetupAllocators("debug"). */`
	`227`	`+const char*`
	`228`	`+_PyMem_GetDebugAllocatorsName(void)`
	`229`	`+{`
	`230`	`+#ifdef WITH_PYMALLOC`
	`231`	`+return "pymalloc_debug";`
	`232`	`+#else`
	`233`	`+return "malloc_debug";`
	`234`	`+#endif`
	`235`	`+}`
	`236`	`+`
	`237`	`+`
`224`	`238`	`static int`
`225`	`239`	`pymem_set_default_allocator(PyMemAllocatorDomain domain, int debug,`
`226`	`240`	`PyMemAllocatorEx *old_alloc)`

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,9 @@ static int test_forced_io_encoding(void)`
`139`	`139`
`140`	`140`	`static int test_pre_initialization_api(void)`
`141`	`141`	`{`
	`142`	`+/* the test doesn't support custom memory allocators */`
	`143`	`+putenv("PYTHONMALLOC=");`
	`144`	`+`
`142`	`145`	`/* Leading "./" ensures getpath.c can still find the standard library */`
`143`	`146`	`_Py_EMBED_PREINIT_CHECK("Checking Py_DecodeLocale\n");`
`144`	`147`	`wchar_t *program = Py_DecodeLocale("./spam", NULL);`
`@@ -235,6 +238,9 @@ static void bpo20891_thread(void *lockp)`
`235`	`238`
`236`	`239`	`static int test_bpo20891(void)`
`237`	`240`	`{`
	`241`	`+/* the test doesn't support custom memory allocators */`
	`242`	`+putenv("PYTHONMALLOC=");`
	`243`	`+`
`238`	`244`	`/* bpo-20891: Calling PyGILState_Ensure in a non-Python thread before`
`239`	`245`	`calling PyEval_InitThreads() must not crash. PyGILState_Ensure() must`
`240`	`246`	`call PyEval_InitThreads() for us in this case. */`

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,8 @@ preconfig_read(_PyPreConfig config, const _PyPreCmdline cmdline)`
`453`	`453`
`454`	`454`	`/* allocator */`
`455`	`455`	`if (config->dev_mode && config->allocator == NULL) {`
`456`		`-config->allocator = _PyMem_RawStrdup("debug");`
	`456`	`+const char *allocator = _PyMem_GetDebugAllocatorsName();`
	`457`	`+config->allocator = _PyMem_RawStrdup(allocator);`
`457`	`458`	`if (config->allocator == NULL) {`
`458`	`459`	`return _Py_INIT_NO_MEMORY();`
`459`	`460`	`}`