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

Issue #18203: Replace malloc() with PyMem_Malloc() to allocate arena objects

This commit is contained in:
Victor Stinner 2013-07-07 17:18:53 +02:00
parent 80aa565fb4
commit c6632e7eb4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Python/pyarena.c
View File

@ -77,7 +77,7 @@ block_new(size_t size)
{ {
/* Allocate header and block as one unit. /* Allocate header and block as one unit.
ab_mem points just past header. */ ab_mem points just past header. */
block *b = (block *)malloc(sizeof(block) + size); block *b = (block *)PyMem_Malloc(sizeof(block) + size);
if (!b) if (!b)
return NULL; return NULL;
b->ab_size = size; b->ab_size = size;
@ -92,7 +92,7 @@ static void
block_free(block *b) { block_free(block *b) {
while (b) { while (b) {
block *next = b->ab_next; block *next = b->ab_next;
free(b); PyMem_Free(b);
b = next; b = next;
} }
} }
@ -127,20 +127,20 @@ block_alloc(block *b, size_t size)
PyArena * PyArena *
PyArena_New() PyArena_New()
{ {
PyArena* arena = (PyArena *)malloc(sizeof(PyArena)); PyArena* arena = (PyArena *)PyMem_Malloc(sizeof(PyArena));
if (!arena) if (!arena)
return (PyArena*)PyErr_NoMemory(); return (PyArena*)PyErr_NoMemory();
arena->a_head = block_new(DEFAULT_BLOCK_SIZE); arena->a_head = block_new(DEFAULT_BLOCK_SIZE);
arena->a_cur = arena->a_head; arena->a_cur = arena->a_head;
if (!arena->a_head) { if (!arena->a_head) {
free((void *)arena); PyMem_Free((void *)arena);
return (PyArena*)PyErr_NoMemory(); return (PyArena*)PyErr_NoMemory();
} }
arena->a_objects = PyList_New(0); arena->a_objects = PyList_New(0);
if (!arena->a_objects) { if (!arena->a_objects) {
block_free(arena->a_head); block_free(arena->a_head);
free((void *)arena); PyMem_Free((void *)arena);
return (PyArena*)PyErr_NoMemory(); return (PyArena*)PyErr_NoMemory();
} }
#if defined(Py_DEBUG) #if defined(Py_DEBUG)
@ -173,7 +173,7 @@ PyArena_Free(PyArena *arena)
*/ */
Py_DECREF(arena->a_objects); Py_DECREF(arena->a_objects);
free(arena); PyMem_Free(arena);
} }
void * void *