Use the small object allocator for small bytearrays

pitrou · pitrou · commit 39aba4f5636f · 2011-11-12T21:15:28.000+01:00
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
@@ -139,7 +139,7 @@ PyByteArray_FromStringAndSize(const char *bytes, Py_ssize_t size)
     }
     else {
         alloc = size + 1;
-        new->ob_bytes = PyMem_Malloc(alloc);
+        new->ob_bytes = PyObject_Malloc(alloc);
         if (new->ob_bytes == NULL) {
             Py_DECREF(new);
             return PyErr_NoMemory();
@@ -209,7 +209,7 @@ PyByteArray_Resize(PyObject *self, Py_ssize_t size)
         alloc = size + 1;
     }
 
-    sval = PyMem_Realloc(((PyByteArrayObject *)self)->ob_bytes, alloc);
+    sval = PyObject_Realloc(((PyByteArrayObject *)self)->ob_bytes, alloc);
     if (sval == NULL) {
         PyErr_NoMemory();
         return -1;
@@ -870,7 +870,7 @@ bytearray_repr(PyByteArrayObject *self)
     }
 
     newsize = 15 + length * 4;
-    buffer = PyMem_Malloc(newsize);
+    buffer = PyObject_Malloc(newsize);
     if (buffer == NULL) {
         PyErr_NoMemory();
         return NULL;
@@ -924,7 +924,7 @@ bytearray_repr(PyByteArrayObject *self)
     }
 
     v = PyUnicode_DecodeASCII(buffer, p - buffer, NULL);
-    PyMem_Free(buffer);
+    PyObject_Free(buffer);
     return v;
 }
 
@@ -1020,7 +1020,7 @@ bytearray_dealloc(PyByteArrayObject *self)
         PyErr_Print();
     }
     if (self->ob_bytes != 0) {
-        PyMem_Free(self->ob_bytes);
+        PyObject_Free(self->ob_bytes);
     }
     Py_TYPE(self)->tp_free((PyObject *)self);
 }

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ PyByteArray_FromStringAndSize(const char *bytes, Py_ssize_t size)`
`139`	`139`	`}`
`140`	`140`	`else {`
`141`	`141`	`alloc = size + 1;`
`142`		`- new->ob_bytes = PyMem_Malloc(alloc);`
	`142`	`+ new->ob_bytes = PyObject_Malloc(alloc);`
`143`	`143`	`if (new->ob_bytes == NULL) {`
`144`	`144`	`Py_DECREF(new);`
`145`	`145`	`return PyErr_NoMemory();`
`@@ -209,7 +209,7 @@ PyByteArray_Resize(PyObject *self, Py_ssize_t size)`
`209`	`209`	`alloc = size + 1;`
`210`	`210`	`}`
`211`	`211`
`212`		`- sval = PyMem_Realloc(((PyByteArrayObject *)self)->ob_bytes, alloc);`
	`212`	`+ sval = PyObject_Realloc(((PyByteArrayObject *)self)->ob_bytes, alloc);`
`213`	`213`	`if (sval == NULL) {`
`214`	`214`	`PyErr_NoMemory();`
`215`	`215`	`return -1;`
`@@ -870,7 +870,7 @@ bytearray_repr(PyByteArrayObject *self)`
`870`	`870`	`}`
`871`	`871`
`872`	`872`	`newsize = 15 + length * 4;`
`873`		`- buffer = PyMem_Malloc(newsize);`
	`873`	`+ buffer = PyObject_Malloc(newsize);`
`874`	`874`	`if (buffer == NULL) {`
`875`	`875`	`PyErr_NoMemory();`
`876`	`876`	`return NULL;`
`@@ -924,7 +924,7 @@ bytearray_repr(PyByteArrayObject *self)`
`924`	`924`	`}`
`925`	`925`
`926`	`926`	`v = PyUnicode_DecodeASCII(buffer, p - buffer, NULL);`
`927`		`- PyMem_Free(buffer);`
	`927`	`+ PyObject_Free(buffer);`
`928`	`928`	`return v;`
`929`	`929`	`}`
`930`	`930`
`@@ -1020,7 +1020,7 @@ bytearray_dealloc(PyByteArrayObject *self)`
`1020`	`1020`	`PyErr_Print();`
`1021`	`1021`	`}`
`1022`	`1022`	`if (self->ob_bytes != 0) {`
`1023`		`- PyMem_Free(self->ob_bytes);`
	`1023`	`+ PyObject_Free(self->ob_bytes);`
`1024`	`1024`	`}`
`1025`	`1025`	`Py_TYPE(self)->tp_free((PyObject *)self);`
`1026`	`1026`	`}`