Commit 39aba4f5 authored by Antoine Pitrou's avatar Antoine Pitrou

Use the small object allocator for small bytearrays

parent c3dfc98f
...@@ -139,7 +139,7 @@ PyByteArray_FromStringAndSize(const char *bytes, Py_ssize_t size) ...@@ -139,7 +139,7 @@ PyByteArray_FromStringAndSize(const char *bytes, Py_ssize_t size)
} }
else { else {
alloc = size + 1; alloc = size + 1;
new->ob_bytes = PyMem_Malloc(alloc); new->ob_bytes = PyObject_Malloc(alloc);
if (new->ob_bytes == NULL) { if (new->ob_bytes == NULL) {
Py_DECREF(new); Py_DECREF(new);
return PyErr_NoMemory(); return PyErr_NoMemory();
...@@ -209,7 +209,7 @@ PyByteArray_Resize(PyObject *self, Py_ssize_t size) ...@@ -209,7 +209,7 @@ PyByteArray_Resize(PyObject *self, Py_ssize_t size)
alloc = size + 1; alloc = size + 1;
} }
sval = PyMem_Realloc(((PyByteArrayObject *)self)->ob_bytes, alloc); sval = PyObject_Realloc(((PyByteArrayObject *)self)->ob_bytes, alloc);
if (sval == NULL) { if (sval == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
return -1; return -1;
...@@ -870,7 +870,7 @@ bytearray_repr(PyByteArrayObject *self) ...@@ -870,7 +870,7 @@ bytearray_repr(PyByteArrayObject *self)
} }
newsize = 15 + length * 4; newsize = 15 + length * 4;
buffer = PyMem_Malloc(newsize); buffer = PyObject_Malloc(newsize);
if (buffer == NULL) { if (buffer == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
return NULL; return NULL;
...@@ -924,7 +924,7 @@ bytearray_repr(PyByteArrayObject *self) ...@@ -924,7 +924,7 @@ bytearray_repr(PyByteArrayObject *self)
} }
v = PyUnicode_DecodeASCII(buffer, p - buffer, NULL); v = PyUnicode_DecodeASCII(buffer, p - buffer, NULL);
PyMem_Free(buffer); PyObject_Free(buffer);
return v; return v;
} }
...@@ -1020,7 +1020,7 @@ bytearray_dealloc(PyByteArrayObject *self) ...@@ -1020,7 +1020,7 @@ bytearray_dealloc(PyByteArrayObject *self)
PyErr_Print(); PyErr_Print();
} }
if (self->ob_bytes != 0) { if (self->ob_bytes != 0) {
PyMem_Free(self->ob_bytes); PyObject_Free(self->ob_bytes);
} }
Py_TYPE(self)->tp_free((PyObject *)self); Py_TYPE(self)->tp_free((PyObject *)self);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment