mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

object: drop parsed_object_pool->commit_count

Browse Source 
14ba97f8 (alloc: allow arbitrary repositories for alloc functions,
2018-05-15) introduced parsed_object_pool->commit_count to keep count of
commits per repository and was used to assign commit->index.

However, commit-slab code requires commit->index values to be unique
and a global count would be correct, rather than a per-repo count.

Let's introduce a static counter variable, `parsed_commits_count` to
keep track of parsed commits so far.

As commit_count has no use anymore, let's also drop it from the struct.

Signed-off-by: Abhishek Kumar <abhishekkumar8222@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Abhishek Kumar
2020-06-17 14:44:08 +05:30
committed by Junio C Hamano
parent eebb51ba8c
commit 6da43d937c
12 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
alloc.c
View File

@ -99,15 +99,21 @@ void *alloc_object_node(struct repository *r)
return obj;
}
static unsigned int alloc_commit_index(struct repository *r)
/*
* The returned count is to be used as an index into commit slabs,
* that are *NOT* maintained per repository, and that is why a single
* global counter is used.
*/
static unsigned int alloc_commit_index(void)
{
return r->parsed_objects->commit_count++;
static unsigned int parsed_commits_count;
return parsed_commits_count++;
}
void init_commit_node(struct repository *r, struct commit *c)
void init_commit_node(struct commit *c)
{
c->object.type = OBJ_COMMIT;
c->index = alloc_commit_index(r);
c->index = alloc_commit_index();
c->graph_pos = COMMIT_NOT_FROM_GRAPH;
c->generation = GENERATION_NUMBER_INFINITY;
}
@ -115,7 +121,7 @@ void init_commit_node(struct repository *r, struct commit *c)
void *alloc_commit_node(struct repository *r)
{
struct commit *c = alloc_node(r->parsed_objects->commit_state, sizeof(struct commit));
init_commit_node(r, c);
init_commit_node(c);
return c;
}