Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-41861: Convert _sqlite3 cache and node static types to heap types (GH-22417)

This commit is contained in:
Erlend Egeberg Aasland 2020-09-27 14:14:50 +02:00 committed by GitHub
parent 00eb063b66
commit a937ab45d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 48 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
Modules/_sqlite/cache.c
View File

@ -29,7 +29,7 @@ pysqlite_Node* pysqlite_new_node(PyObject* key, PyObject* data)
{ {
pysqlite_Node* node; pysqlite_Node* node;
node = (pysqlite_Node*) (pysqlite_NodeType.tp_alloc(&pysqlite_NodeType, 0)); node = (pysqlite_Node*) (pysqlite_NodeType->tp_alloc(pysqlite_NodeType, 0));
if (!node) { if (!node) {
return NULL; return NULL;
} }
@ -48,10 +48,13 @@ pysqlite_Node* pysqlite_new_node(PyObject* key, PyObject* data)
void pysqlite_node_dealloc(pysqlite_Node* self) void pysqlite_node_dealloc(pysqlite_Node* self)
{ {
PyTypeObject *tp = Py_TYPE(self);
Py_DECREF(self->key); Py_DECREF(self->key);
Py_DECREF(self->data); Py_DECREF(self->data);
Py_TYPE(self)->tp_free((PyObject*)self); tp->tp_free(self);
Py_DECREF(tp);
} }
int pysqlite_cache_init(pysqlite_Cache* self, PyObject* args, PyObject* kwargs) int pysqlite_cache_init(pysqlite_Cache* self, PyObject* args, PyObject* kwargs)
@ -88,6 +91,7 @@ int pysqlite_cache_init(pysqlite_Cache* self, PyObject* args, PyObject* kwargs)
void pysqlite_cache_dealloc(pysqlite_Cache* self) void pysqlite_cache_dealloc(pysqlite_Cache* self)
{ {
PyTypeObject *tp = Py_TYPE(self);
pysqlite_Node* node; pysqlite_Node* node;
pysqlite_Node* delete_node; pysqlite_Node* delete_node;
@ -109,7 +113,8 @@ void pysqlite_cache_dealloc(pysqlite_Cache* self)
} }
Py_DECREF(self->mapping); Py_DECREF(self->mapping);
Py_TYPE(self)->tp_free((PyObject*)self); tp->tp_free(self);
Py_DECREF(tp);
} }
PyObject* pysqlite_cache_get(pysqlite_Cache* self, PyObject* key) PyObject* pysqlite_cache_get(pysqlite_Cache* self, PyObject* key)
@ -253,6 +258,20 @@ PyObject* pysqlite_cache_display(pysqlite_Cache* self, PyObject* args)
Py_RETURN_NONE; Py_RETURN_NONE;
} }
static PyType_Slot pysqlite_NodeType_slots[] = {
{Py_tp_dealloc, pysqlite_node_dealloc},
{Py_tp_new, PyType_GenericNew},
{0, NULL},
};
static PyType_Spec pysqlite_NodeType_spec = {
.name = MODULE_NAME ".Node",
.basicsize = sizeof(pysqlite_Node),
.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE,
.slots = pysqlite_NodeType_slots,
};
PyTypeObject *pysqlite_NodeType = NULL;
static PyMethodDef cache_methods[] = { static PyMethodDef cache_methods[] = {
{"get", (PyCFunction)pysqlite_cache_get, METH_O, {"get", (PyCFunction)pysqlite_cache_get, METH_O,
PyDoc_STR("Gets an entry from the cache or calls the factory function to produce one.")}, PyDoc_STR("Gets an entry from the cache or calls the factory function to produce one.")},
@ -261,102 +280,32 @@ static PyMethodDef cache_methods[] = {
{NULL, NULL} {NULL, NULL}
}; };
PyTypeObject pysqlite_NodeType = { static PyType_Slot pysqlite_CacheType_slots[] = {
PyVarObject_HEAD_INIT(NULL, 0) {Py_tp_dealloc, pysqlite_cache_dealloc},
MODULE_NAME "Node", /* tp_name */ {Py_tp_methods, cache_methods},
sizeof(pysqlite_Node), /* tp_basicsize */ {Py_tp_new, PyType_GenericNew},
0, /* tp_itemsize */ {Py_tp_init, pysqlite_cache_init},
(destructor)pysqlite_node_dealloc, /* tp_dealloc */ {0, NULL},
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_as_async */
0, /* tp_repr */
0, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /* tp_flags */
0, /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
0, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
(initproc)0, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
0 /* tp_free */
}; };
PyTypeObject pysqlite_CacheType = { static PyType_Spec pysqlite_CacheType_spec = {
PyVarObject_HEAD_INIT(NULL, 0) .name = MODULE_NAME ".Cache",
MODULE_NAME ".Cache", /* tp_name */ .basicsize = sizeof(pysqlite_Cache),
sizeof(pysqlite_Cache), /* tp_basicsize */ .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE,
0, /* tp_itemsize */ .slots = pysqlite_CacheType_slots,
(destructor)pysqlite_cache_dealloc, /* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_as_async */
0, /* tp_repr */
0, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /* tp_flags */
0, /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
cache_methods, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
(initproc)pysqlite_cache_init, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
0 /* tp_free */
}; };
PyTypeObject *pysqlite_CacheType = NULL;
extern int pysqlite_cache_setup_types(void) extern int pysqlite_cache_setup_types(PyObject *mod)
{ {
int rc; pysqlite_NodeType = (PyTypeObject *)PyType_FromModuleAndSpec(mod, &pysqlite_NodeType_spec, NULL);
if (pysqlite_NodeType == NULL) {
pysqlite_NodeType.tp_new = PyType_GenericNew; return -1;
pysqlite_CacheType.tp_new = PyType_GenericNew;
rc = PyType_Ready(&pysqlite_NodeType);
if (rc < 0) {
return rc;
} }
rc = PyType_Ready(&pysqlite_CacheType); pysqlite_CacheType = (PyTypeObject *)PyType_FromModuleAndSpec(mod, &pysqlite_CacheType_spec, NULL);
return rc; if (pysqlite_CacheType == NULL) {
return -1;
}
return 0;
} }

6
Modules/_sqlite/cache.h
View File

@ -59,8 +59,8 @@ typedef struct
int decref_factory; int decref_factory;
} pysqlite_Cache; } pysqlite_Cache;
extern PyTypeObject pysqlite_NodeType; extern PyTypeObject *pysqlite_NodeType;
extern PyTypeObject pysqlite_CacheType; extern PyTypeObject *pysqlite_CacheType;
int pysqlite_node_init(pysqlite_Node* self, PyObject* args, PyObject* kwargs); int pysqlite_node_init(pysqlite_Node* self, PyObject* args, PyObject* kwargs);
void pysqlite_node_dealloc(pysqlite_Node* self); void pysqlite_node_dealloc(pysqlite_Node* self);
@ -69,6 +69,6 @@ int pysqlite_cache_init(pysqlite_Cache* self, PyObject* args, PyObject* kwargs);
void pysqlite_cache_dealloc(pysqlite_Cache* self); void pysqlite_cache_dealloc(pysqlite_Cache* self);
PyObject* pysqlite_cache_get(pysqlite_Cache* self, PyObject* args); PyObject* pysqlite_cache_get(pysqlite_Cache* self, PyObject* args);
int pysqlite_cache_setup_types(void); int pysqlite_cache_setup_types(PyObject *module);
#endif #endif

2
Modules/_sqlite/connection.c
View File

@ -133,7 +133,7 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject
} }
Py_DECREF(isolation_level); Py_DECREF(isolation_level);
self->statement_cache = (pysqlite_Cache*)PyObject_CallFunction((PyObject*)&pysqlite_CacheType, "Oi", self, cached_statements); self->statement_cache = (pysqlite_Cache*)PyObject_CallFunction((PyObject*)pysqlite_CacheType, "Oi", self, cached_statements);
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
return -1; return -1;
} }

2
Modules/_sqlite/module.c
View File

@ -355,7 +355,7 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
(pysqlite_row_setup_types() < 0) || (pysqlite_row_setup_types() < 0) ||
(pysqlite_cursor_setup_types() < 0) || (pysqlite_cursor_setup_types() < 0) ||
(pysqlite_connection_setup_types() < 0) || (pysqlite_connection_setup_types() < 0) ||
(pysqlite_cache_setup_types() < 0) || (pysqlite_cache_setup_types(module) < 0) ||
(pysqlite_statement_setup_types() < 0) || (pysqlite_statement_setup_types() < 0) ||
(pysqlite_prepare_protocol_setup_types() < 0) (pysqlite_prepare_protocol_setup_types() < 0)
) { ) {