commit: prepare free_commit_buffer and release_commit_memory for any repo

stefanbeller · gitster · commit 6a7895fd8a3b · 2018-12-28T10:06:33.000-08:00
Pass the object pool to free_commit_buffer and release_commit_memory, such that we can eliminate access to 'the_repository'. Also remove the TODO in release_commit_memory, as commit->util was removed in 9d2c970 (commit.h: delete 'util' field in struct commit, 2018-05-19) Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin/fsck.c b/builtin/fsck.c
@@ -382,7 +382,8 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size)
 	if (obj->type == OBJ_TREE)
 		free_tree_buffer((struct tree *)obj);
 	if (obj->type == OBJ_COMMIT)
-		free_commit_buffer((struct commit *)obj);
+		free_commit_buffer(the_repository->parsed_objects,
+				   (struct commit *)obj);
 	return err;
 }
 
diff --git a/builtin/log.c b/builtin/log.c
@@ -395,7 +395,8 @@ static int cmd_log_walk(struct rev_info *rev)
 			 * We may show a given commit multiple times when
 			 * walking the reflogs.
 			 */
-			free_commit_buffer(commit);
+			free_commit_buffer(the_repository->parsed_objects,
+					   commit);
 			free_commit_list(commit->parents);
 			commit->parents = NULL;
 		}
@@ -1922,7 +1923,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		    open_next_file(rev.numbered_files ? NULL : commit, NULL, &rev, quiet))
 			die(_("Failed to create output files"));
 		shown = log_tree_commit(&rev, commit);
-		free_commit_buffer(commit);
+		free_commit_buffer(the_repository->parsed_objects,
+				   commit);
 
 		/* We put one extra blank line between formatted
 		 * patches and this flag is used by log-tree code
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
@@ -196,7 +196,8 @@ static void finish_commit(struct commit *commit, void *data)
 		free_commit_list(commit->parents);
 		commit->parents = NULL;
 	}
-	free_commit_buffer(commit);
+	free_commit_buffer(the_repository->parsed_objects,
+			   commit);
 }
 
 static inline void finish_object__ma(struct object *obj)
diff --git a/commit.c b/commit.c
@@ -328,10 +328,10 @@ void repo_unuse_commit_buffer(struct repository *r,
 		free((void *)buffer);
 }
 
-void free_commit_buffer(struct commit *commit)
+void free_commit_buffer(struct parsed_object_pool *pool, struct commit *commit)
 {
 	struct commit_buffer *v = buffer_slab_peek(
-		the_repository->parsed_objects->buffer_slab, commit);
+		pool->buffer_slab, commit);
 	if (v) {
 		FREE_AND_NULL(v->buffer);
 		v->size = 0;
@@ -354,13 +354,12 @@ struct object_id *get_commit_tree_oid(const struct commit *commit)
 	return &get_commit_tree(commit)->object.oid;
 }
 
-void release_commit_memory(struct commit *c)
+void release_commit_memory(struct parsed_object_pool *pool, struct commit *c)
 {
 	c->maybe_tree = NULL;
 	c->index = 0;
-	free_commit_buffer(c);
+	free_commit_buffer(pool, c);
 	free_commit_list(c->parents);
-	/* TODO: what about commit->util? */
 
 	c->object.parsed = 0;
 }
diff --git a/commit.h b/commit.h
@@ -140,7 +140,7 @@ void repo_unuse_commit_buffer(struct repository *r,
 /*
  * Free any cached object buffer associated with the commit.
  */
-void free_commit_buffer(struct commit *);
+void free_commit_buffer(struct parsed_object_pool *pool, struct commit *);
 
 struct tree *get_commit_tree(const struct commit *);
 struct object_id *get_commit_tree_oid(const struct commit *);
@@ -149,7 +149,7 @@ struct object_id *get_commit_tree_oid(const struct commit *);
  * Release memory related to a commit, including the parent list and
  * any cached object buffer.
  */
-void release_commit_memory(struct commit *c);
+void release_commit_memory(struct parsed_object_pool *pool, struct commit *c);
 
 /*
  * Disassociate any cached object buffer from the commit, but do not free it.
diff --git a/object.c b/object.c
@@ -540,7 +540,7 @@ void parsed_object_pool_clear(struct parsed_object_pool *o)
 		if (obj->type == OBJ_TREE)
 			free_tree_buffer((struct tree*)obj);
 		else if (obj->type == OBJ_COMMIT)
-			release_commit_memory((struct commit*)obj);
+			release_commit_memory(o, (struct commit*)obj);
 		else if (obj->type == OBJ_TAG)
 			release_tag_memory((struct tag*)obj);
 	}

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,8 @@ static int fsck_obj(struct object obj, void buffer, unsigned long size)`
`382`	`382`	`if (obj->type == OBJ_TREE)`
`383`	`383`	`free_tree_buffer((struct tree *)obj);`
`384`	`384`	`if (obj->type == OBJ_COMMIT)`
`385`		`- free_commit_buffer((struct commit *)obj);`
	`385`	`+ free_commit_buffer(the_repository->parsed_objects,`
	`386`	`+ (struct commit *)obj);`
`386`	`387`	`return err;`
`387`	`388`	`}`
`388`	`389`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,8 @@ static void finish_commit(struct commit commit, void data)`
`196`	`196`	`free_commit_list(commit->parents);`
`197`	`197`	`commit->parents = NULL;`
`198`	`198`	`}`
`199`		`- free_commit_buffer(commit);`
	`199`	`+ free_commit_buffer(the_repository->parsed_objects,`
	`200`	`+ commit);`
`200`	`201`	`}`
`201`	`202`
`202`	`203`	`static inline void finish_object__ma(struct object *obj)`
Original file line number	Diff line number	Diff line change
`@@ -328,10 +328,10 @@ void repo_unuse_commit_buffer(struct repository *r,`
`328`	`328`	`free((void *)buffer);`
`329`	`329`	`}`
`330`	`330`
`331`		`-void free_commit_buffer(struct commit *commit)`
	`331`	`+void free_commit_buffer(struct parsed_object_pool pool, struct commit commit)`
`332`	`332`	`{`
`333`	`333`	`struct commit_buffer *v = buffer_slab_peek(`
`334`		`- the_repository->parsed_objects->buffer_slab, commit);`
	`334`	`+ pool->buffer_slab, commit);`
`335`	`335`	`if (v) {`
`336`	`336`	`FREE_AND_NULL(v->buffer);`
`337`	`337`	`v->size = 0;`
`@@ -354,13 +354,12 @@ struct object_id get_commit_tree_oid(const struct commit commit)`
`354`	`354`	`return &get_commit_tree(commit)->object.oid;`
`355`	`355`	`}`
`356`	`356`
`357`		`-void release_commit_memory(struct commit *c)`
	`357`	`+void release_commit_memory(struct parsed_object_pool pool, struct commit c)`
`358`	`358`	`{`
`359`	`359`	`c->maybe_tree = NULL;`
`360`	`360`	`c->index = 0;`
`361`		`- free_commit_buffer(c);`
	`361`	`+ free_commit_buffer(pool, c);`
`362`	`362`	`free_commit_list(c->parents);`
`363`		`- /* TODO: what about commit->util? */`
`364`	`363`
`365`	`364`	`c->object.parsed = 0;`
`366`	`365`	`}`
Original file line number	Diff line number	Diff line change
`@@ -540,7 +540,7 @@ void parsed_object_pool_clear(struct parsed_object_pool *o)`
`540`	`540`	`if (obj->type == OBJ_TREE)`
`541`	`541`	`free_tree_buffer((struct tree*)obj);`
`542`	`542`	`else if (obj->type == OBJ_COMMIT)`
`543`		`- release_commit_memory((struct commit*)obj);`
	`543`	`+ release_commit_memory(o, (struct commit*)obj);`
`544`	`544`	`else if (obj->type == OBJ_TAG)`
`545`	`545`	`release_tag_memory((struct tag*)obj);`
`546`	`546`	`}`