D4112: index: add pointer from nodetree back to index
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sun Aug 5 07:58:49 UTC 2018
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is always a cycle right now, but it will not be for the nodetree
instances I'm planning to add later (see earlier patch).
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D4112
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
@@ -28,6 +28,7 @@
#define PyInt_AsLong PyLong_AsLong
#endif
+typedef struct indexObjectStruct indexObject;
typedef struct {
int children[16];
@@ -41,6 +42,7 @@
* Zero is empty
*/
typedef struct {
+ indexObject *index;
nodetreenode *nodes;
unsigned length; /* # nodes in use */
unsigned capacity; /* # nodes allocated */
@@ -60,7 +62,7 @@
* With string keys, we lazily perform a reverse mapping from node to
* rev, using a base-16 trie.
*/
-typedef struct {
+struct indexObjectStruct {
PyObject_HEAD
/* Type-specific fields go here. */
PyObject *data; /* raw bytes of index */
@@ -77,7 +79,7 @@
int ntlookups; /* # lookups */
int ntmisses; /* # lookups that miss the cache */
int inlined;
-} indexObject;
+};
static Py_ssize_t index_length(const indexObject *self)
{
@@ -1118,6 +1120,7 @@
self->nt->depth = 0;
self->nt->splits = 0;
self->nt->length = 1;
+ self->nt->index = self;
if (nt_insert(self, nullid, -1) == -1) {
free(self->nt->nodes);
free(self->nt);
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list