path: root/alloc.c
diff options
authorJeff King <>2014-06-10 21:39:04 (GMT)
committerJunio C Hamano <>2014-06-12 17:29:42 (GMT)
commit969eba6341a5af8ac52c67e26462548ed05e23e3 (patch)
tree5ad116ce4e50cd2396c16d6de4f17cdb4cd30e80 /alloc.c
parentc335d74d349d201cb7627aa7233638d2953a4b02 (diff)
commit: push commit_index update into alloc_commit_node
Whenever we create a commit object via lookup_commit, we give it a unique index to be used with the commit-slab API. The theory is that any "struct commit" we create would follow this code path, so any such struct would get an index. However, callers could use alloc_commit_node() directly (and get multiple commits with index 0). Let's push the indexing into alloc_commit_node so that it's hard for callers to get it wrong. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'alloc.c')
1 files changed, 10 insertions, 2 deletions
diff --git a/alloc.c b/alloc.c
index 38ff7e7..eb22a45 100644
--- a/alloc.c
+++ b/alloc.c
@@ -47,10 +47,18 @@ union any_object {
DEFINE_ALLOCATOR(blob, struct blob)
DEFINE_ALLOCATOR(tree, struct tree)
-DEFINE_ALLOCATOR(commit, struct commit)
+DEFINE_ALLOCATOR(raw_commit, struct commit)
DEFINE_ALLOCATOR(tag, struct tag)
DEFINE_ALLOCATOR(object, union any_object)
+void *alloc_commit_node(void)
+ static int commit_count;
+ struct commit *c = alloc_raw_commit_node();
+ c->index = commit_count++;
+ return c;
static void report(const char *name, unsigned int count, size_t size)
fprintf(stderr, "%10s: %8u (%"PRIuMAX" kB)\n",
@@ -64,7 +72,7 @@ void alloc_report(void)
REPORT(blob, struct blob);
REPORT(tree, struct tree);
- REPORT(commit, struct commit);
+ REPORT(raw_commit, struct commit);
REPORT(tag, struct tag);
REPORT(object, union any_object);