Commit 7028f9d7 authored by Raymond Hettinger's avatar Raymond Hettinger

Use a freelist to speed-up block allocation and deallocation in collections.deque().

parent b4fae82f
...@@ -51,6 +51,10 @@ typedef struct BLOCK { ...@@ -51,6 +51,10 @@ typedef struct BLOCK {
PyObject *data[BLOCKLEN]; PyObject *data[BLOCKLEN];
} block; } block;
#define MAXFREEBLOCKS 10
static int numfreeblocks = 0;
static block *freeblocks[MAXFREEBLOCKS];
static block * static block *
newblock(block *leftlink, block *rightlink, int len) { newblock(block *leftlink, block *rightlink, int len) {
block *b; block *b;
...@@ -66,16 +70,32 @@ newblock(block *leftlink, block *rightlink, int len) { ...@@ -66,16 +70,32 @@ newblock(block *leftlink, block *rightlink, int len) {
"cannot add more blocks to the deque"); "cannot add more blocks to the deque");
return NULL; return NULL;
} }
b = PyMem_Malloc(sizeof(block)); if (numfreeblocks) {
if (b == NULL) { numfreeblocks -= 1;
PyErr_NoMemory(); b = freeblocks[numfreeblocks];
return NULL; } else {
b = PyMem_Malloc(sizeof(block));
if (b == NULL) {
PyErr_NoMemory();
return NULL;
}
} }
b->leftlink = leftlink; b->leftlink = leftlink;
b->rightlink = rightlink; b->rightlink = rightlink;
return b; return b;
} }
void
freeblock(block *b)
{
if (numfreeblocks < MAXFREEBLOCKS) {
freeblocks[numfreeblocks] = b;
numfreeblocks++;
} else {
PyMem_Free(b);
}
}
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
block *leftblock; block *leftblock;
...@@ -161,7 +181,7 @@ deque_pop(dequeobject *deque, PyObject *unused) ...@@ -161,7 +181,7 @@ deque_pop(dequeobject *deque, PyObject *unused)
} else { } else {
prevblock = deque->rightblock->leftlink; prevblock = deque->rightblock->leftlink;
assert(deque->leftblock != deque->rightblock); assert(deque->leftblock != deque->rightblock);
PyMem_Free(deque->rightblock); freeblock(deque->rightblock);
prevblock->rightlink = NULL; prevblock->rightlink = NULL;
deque->rightblock = prevblock; deque->rightblock = prevblock;
deque->rightindex = BLOCKLEN - 1; deque->rightindex = BLOCKLEN - 1;
...@@ -198,7 +218,7 @@ deque_popleft(dequeobject *deque, PyObject *unused) ...@@ -198,7 +218,7 @@ deque_popleft(dequeobject *deque, PyObject *unused)
} else { } else {
assert(deque->leftblock != deque->rightblock); assert(deque->leftblock != deque->rightblock);
prevblock = deque->leftblock->rightlink; prevblock = deque->leftblock->rightlink;
PyMem_Free(deque->leftblock); freeblock(deque->leftblock);
assert(prevblock != NULL); assert(prevblock != NULL);
prevblock->leftlink = NULL; prevblock->leftlink = NULL;
deque->leftblock = prevblock; deque->leftblock = prevblock;
...@@ -559,7 +579,7 @@ deque_dealloc(dequeobject *deque) ...@@ -559,7 +579,7 @@ deque_dealloc(dequeobject *deque)
if (deque->leftblock != NULL) { if (deque->leftblock != NULL) {
deque_clear(deque); deque_clear(deque);
assert(deque->leftblock != NULL); assert(deque->leftblock != NULL);
PyMem_Free(deque->leftblock); freeblock(deque->leftblock);
} }
deque->leftblock = NULL; deque->leftblock = NULL;
deque->rightblock = NULL; deque->rightblock = NULL;
......
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