D4118: index: make node tree a Python object
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sun Aug 5 04:03:38 EDT 2018
martinvonz updated this revision to Diff 9924.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D4118?vs=9921&id=9924
REVISION DETAIL
https://phab.mercurial-scm.org/D4118
AFFECTED FILES
mercurial/cext/revlog.c
CHANGE DETAILS
diff --git a/mercurial/cext/revlog.c b/mercurial/cext/revlog.c
--- a/mercurial/cext/revlog.c
+++ b/mercurial/cext/revlog.c
@@ -42,6 +42,7 @@
* Zero is empty
*/
typedef struct {
+ PyObject_HEAD
indexObject *index;
nodetreenode *nodes;
unsigned length; /* # nodes in use */
@@ -1081,6 +1082,15 @@
return 0;
}
+static int nt_init_py(nodetree *self, PyObject *args)
+{
+ PyObject *index;
+ unsigned capacity;
+ if (!PyArg_ParseTuple(args, "OI", &index, &capacity))
+ return -1;
+ return nt_init(self, (indexObject*)index, capacity);
+}
+
static int nt_partialmatch(nodetree *self, const char *node,
Py_ssize_t nodelen)
{
@@ -1133,21 +1143,67 @@
return -3;
}
+static void nt_dealloc(nodetree *self)
+{
+ free(self->nodes);
+ self->nodes = NULL;
+ PyObject_Del(self);
+}
+
+static PyTypeObject nodetreeType = {
+ PyVarObject_HEAD_INIT(NULL, 0) /* header */
+ "parsers.nodetree", /* tp_name */
+ sizeof(nodetree) , /* tp_basicsize */
+ 0, /* tp_itemsize */
+ (destructor)nt_dealloc, /* tp_dealloc */
+ 0, /* tp_print */
+ 0, /* tp_getattr */
+ 0, /* tp_setattr */
+ 0, /* tp_compare */
+ 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, /* tp_flags */
+ "nodetree", /* 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)nt_init_py, /* tp_init */
+ 0, /* tp_alloc */
+};
+
static int index_init_nt(indexObject *self)
{
if (self->nt == NULL) {
- self->nt = PyMem_Malloc(sizeof(nodetree));
+ self->nt = PyObject_New(nodetree, &nodetreeType);
if (self->nt == NULL) {
- PyErr_NoMemory();
return -1;
}
if ((size_t)self->raw_length > INT_MAX / sizeof(nodetreenode)) {
PyErr_SetString(PyExc_ValueError, "overflow in index_init_nt");
return -1;
}
unsigned capacity = (self->raw_length < 4 ? 4 : (int)self->raw_length / 2);
if (nt_init(self->nt, self, capacity) == -1) {
- free(self->nt);
+ nt_dealloc(self->nt);
self->nt = NULL;
return -1;
}
@@ -2007,8 +2063,7 @@
self->offsets = NULL;
}
if (self->nt != NULL) {
- free(self->nt->nodes);
- free(self->nt);
+ nt_dealloc(self->nt);
}
self->nt = NULL;
Py_CLEAR(self->headrevs);
@@ -2032,6 +2087,7 @@
}
Py_XDECREF(self->data);
Py_XDECREF(self->added);
+ Py_XDECREF(self->nt);
PyObject_Del(self);
}
@@ -2181,6 +2237,12 @@
Py_INCREF(&indexType);
PyModule_AddObject(mod, "index", (PyObject *)&indexType);
+ nodetreeType.tp_new = PyType_GenericNew;
+ if (PyType_Ready(&nodetreeType) < 0)
+ return;
+ Py_INCREF(&nodetreeType);
+ PyModule_AddObject(mod, "nodetree", (PyObject *)&nodetreeType);
+
nullentry = Py_BuildValue(PY23("iiiiiiis#", "iiiiiiiy#"), 0, 0, 0,
-1, -1, -1, -1, nullid, 20);
if (nullentry)
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list