This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4166

index: make capacity argument to nt_init be measured in revisions
ClosedPublic

Authored by martinvonz on Aug 9 2018, 3:27 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG34eb999e29bf: index: make capacity argument to nt_init be measured in revisions
Summary

The nodetree's internal capacity field is measures in nodetree nodes,
which is not something the caller should have to know about.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Aug 9 2018, 3:27 AM
Closed by commit rHG34eb999e29bf: index: make capacity argument to nt_init be measured in revisions (authored by martinvonz). · Explain WhyAug 12 2018, 12:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/revlog.c (7 lines)

Diff 10339

mercurial/cext/revlog.c

{ {
/* rev==-2 happens to get encoded as 0, which is interpreted as not set */ /* rev==-2 happens to get encoded as 0, which is interpreted as not set */
return nt_insert(self, node, -2); return nt_insert(self, node, -2);
} }
static int nt_init(nodetree *self, indexObject *index, unsigned capacity) static int nt_init(nodetree *self, indexObject *index, unsigned capacity)
{ {
self->index = index; self->index = index;
self->capacity = capacity; /* The input capacity is in terms of revisions, while the field is in
* terms of nodetree nodes. */
self->capacity = (capacity < 4 ? 4 : capacity / 2);
self->depth = 0; self->depth = 0;
self->splits = 0; self->splits = 0;
if ((size_t)self->capacity > INT_MAX / sizeof(nodetreenode)) { if ((size_t)self->capacity > INT_MAX / sizeof(nodetreenode)) {
PyErr_SetString(PyExc_ValueError, "overflow in init_nt"); PyErr_SetString(PyExc_ValueError, "overflow in init_nt");
return -1; return -1;
} }
self->nodes = calloc(self->capacity, sizeof(nodetreenode)); self->nodes = calloc(self->capacity, sizeof(nodetreenode));
if (self->nodes == NULL) { if (self->nodes == NULL) {
static int index_init_nt(indexObject *self) static int index_init_nt(indexObject *self)
{ {
if (self->nt == NULL) { if (self->nt == NULL) {
self->nt = PyMem_Malloc(sizeof(nodetree)); self->nt = PyMem_Malloc(sizeof(nodetree));
if (self->nt == NULL) { if (self->nt == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
return -1; return -1;
} }
unsigned capacity = (self->raw_length < 4 ? 4 : (int)self->raw_length / 2); if (nt_init(self->nt, self, self->raw_length) == -1) {
if (nt_init(self->nt, self, capacity) == -1) {
PyMem_Free(self->nt); PyMem_Free(self->nt);
self->nt = NULL; self->nt = NULL;
return -1; return -1;
} }
if (nt_insert(self->nt, nullid, -1) == -1) { if (nt_insert(self->nt, nullid, -1) == -1) {
PyMem_Free(self->nt); PyMem_Free(self->nt);
self->nt = NULL; self->nt = NULL;
return -1; return -1;