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

Issue #26249: Try test_capi on Windows

This commit is contained in:
Victor Stinner 2016-04-22 18:52:22 +02:00
parent f5c4b99034
commit 15932593ba
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Objects/obmalloc.c
View File

@ -166,7 +166,7 @@ _PyObject_ArenaFree(void *ctx, void *ptr, size_t size)
#else #else
# define PYOBJ_FUNCS PYRAW_FUNCS # define PYOBJ_FUNCS PYRAW_FUNCS
#endif #endif
#define PYMEM_FUNCS PYRAW_FUNCS #define PYMEM_FUNCS PYOBJ_FUNCS
typedef struct { typedef struct {
/* We tag each block with an API ID in order to tag API violations */ /* We tag each block with an API ID in order to tag API violations */
@ -198,9 +198,9 @@ static PyMemAllocatorEx _PyMem_Raw = {
static PyMemAllocatorEx _PyMem = { static PyMemAllocatorEx _PyMem = {
#ifdef Py_DEBUG #ifdef Py_DEBUG
&_PyMem_Debug.obj, PYDBG_FUNCS &_PyMem_Debug.mem, PYDBG_FUNCS
#else #else
NULL, PYOBJ_FUNCS NULL, PYMEM_FUNCS
#endif #endif
}; };
@ -252,11 +252,12 @@ _PyMem_SetupAllocators(const char *opt)
else if (strcmp(opt, "pymalloc") == 0 else if (strcmp(opt, "pymalloc") == 0
|| strcmp(opt, "pymalloc_debug") == 0) || strcmp(opt, "pymalloc_debug") == 0)
{ {
PyMemAllocatorEx mem_alloc = {NULL, PYRAW_FUNCS}; PyMemAllocatorEx raw_alloc = {NULL, PYRAW_FUNCS};
PyMemAllocatorEx mem_alloc = {NULL, PYMEM_FUNCS};
PyMemAllocatorEx obj_alloc = {NULL, PYOBJ_FUNCS}; PyMemAllocatorEx obj_alloc = {NULL, PYOBJ_FUNCS};
PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &mem_alloc); PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &raw_alloc);
PyMem_SetAllocator(PYMEM_DOMAIN_MEM, &obj_alloc); PyMem_SetAllocator(PYMEM_DOMAIN_MEM, &mem_alloc);
PyMem_SetAllocator(PYMEM_DOMAIN_OBJ, &obj_alloc); PyMem_SetAllocator(PYMEM_DOMAIN_OBJ, &obj_alloc);
if (strcmp(opt, "pymalloc_debug") == 0) if (strcmp(opt, "pymalloc_debug") == 0)