mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bpo-32422: Reduce lru_cache memory usage (GH-5008)

This commit is contained in:
INADA Naoki 2017-12-26 02:03:24 +09:00 committed by GitHub
parent 0cf16f9ea0
commit 3070b71e5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS.d/next/Library/2017-12-25-20-22-47.bpo-32422.5H3Wq2.rst Normal file
View File

@ -0,0 +1,2 @@
``functools.lru_cache`` uses less memory (3 words for each cached key) and
takes about 1/3 time for cyclic GC.

32
Modules/_functoolsmodule.c
View File

@ -677,26 +677,9 @@ typedef struct lru_list_elem {
static void static void
lru_list_elem_dealloc(lru_list_elem *link) lru_list_elem_dealloc(lru_list_elem *link)
{ {
_PyObject_GC_UNTRACK(link);
Py_XDECREF(link->key); Py_XDECREF(link->key);
Py_XDECREF(link->result); Py_XDECREF(link->result);
PyObject_GC_Del(link); PyObject_Del(link);
}
static int
lru_list_elem_traverse(lru_list_elem *link, visitproc visit, void *arg)
{
Py_VISIT(link->key);
Py_VISIT(link->result);
return 0;
}
static int
lru_list_elem_clear(lru_list_elem *link)
{
Py_CLEAR(link->key);
Py_CLEAR(link->result);
return 0;
} }
static PyTypeObject lru_list_elem_type = { static PyTypeObject lru_list_elem_type = {
@ -720,10 +703,7 @@ static PyTypeObject lru_list_elem_type = {
0, /* tp_getattro */ 0, /* tp_getattro */
0, /* tp_setattro */ 0, /* tp_setattro */
0, /* tp_as_buffer */ 0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */ Py_TPFLAGS_DEFAULT, /* tp_flags */
0, /* tp_doc */
(traverseproc)lru_list_elem_traverse, /* tp_traverse */
(inquiry)lru_list_elem_clear, /* tp_clear */
}; };
@ -959,8 +939,8 @@ bounded_lru_cache_wrapper(lru_cache_object *self, PyObject *args, PyObject *kwds
} }
} else { } else {
/* Put result in a new link at the front of the queue. */ /* Put result in a new link at the front of the queue. */
link = (lru_list_elem *)PyObject_GC_New(lru_list_elem, link = (lru_list_elem *)PyObject_New(lru_list_elem,
&lru_list_elem_type); &lru_list_elem_type);
if (link == NULL) { if (link == NULL) {
Py_DECREF(key); Py_DECREF(key);
Py_DECREF(result); Py_DECREF(result);
@ -970,7 +950,6 @@ bounded_lru_cache_wrapper(lru_cache_object *self, PyObject *args, PyObject *kwds
link->hash = hash; link->hash = hash;
link->key = key; link->key = key;
link->result = result; link->result = result;
_PyObject_GC_TRACK(link);
if (_PyDict_SetItem_KnownHash(self->cache, key, (PyObject *)link, if (_PyDict_SetItem_KnownHash(self->cache, key, (PyObject *)link,
hash) < 0) { hash) < 0) {
Py_DECREF(link); Py_DECREF(link);
@ -1151,7 +1130,8 @@ lru_cache_tp_traverse(lru_cache_object *self, visitproc visit, void *arg)
lru_list_elem *link = self->root.next; lru_list_elem *link = self->root.next;
while (link != &self->root) { while (link != &self->root) {
lru_list_elem *next = link->next; lru_list_elem *next = link->next;
Py_VISIT(link); Py_VISIT(link->key);
Py_VISIT(link->result);
link = next; link = next;
} }
Py_VISIT(self->maxsize_O); Py_VISIT(self->maxsize_O);