commit: prepare free_commit_buffer and release_commit_memory for any repo

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 9d2c97016f (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
index 06eb42172099a39e6f181d0dd7eab581595d9756..c476ac69838650ccdb1b376f71bfd189433e2bd1 100644 (file)
--- 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)
        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;
 }
 
        return err;
 }
 

diff --git a/builtin/log.c b/builtin/log.c
index 061d4fd864f3fb479e2877e3bbf25928ad1fb9d3..64c2649c7cff2b18379882eb4c4337e4615e7eee 100644 (file)
--- 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.
                         */
                         * 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;
                }
                        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);
                    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
 
                /* 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
index cc1b70522f7bcdb77fd33ccd9d9948926b8333ad..2b301fa3152dd490ff0d230a41805c79b3266803 100644 (file)
--- 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_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)
 }
 
 static inline void finish_object__ma(struct object *obj)

diff --git a/commit.c b/commit.c
index 7d2f3a9a934ed3fe092811265b468999a459e32c..4fe74aa4bcdd772f4018e470d95189e8612567d8 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -328,10 +328,10 @@ void repo_unuse_commit_buffer(struct repository *r,
                free((void *)buffer);
 }
 
                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(
 {
        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;
        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;
 }
 
        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;
 {
        c->maybe_tree = NULL;
        c->index = 0;

-       free_commit_buffer(c);
+       free_commit_buffer(pool, c);

        free_commit_list(c->parents);
        free_commit_list(c->parents);

-       /* TODO: what about commit->util? */

 
        c->object.parsed = 0;
 }
 
        c->object.parsed = 0;
 }

diff --git a/commit.h b/commit.h
index 2e6b799b269f25930e4b9d66942062a9ba7986c8..d2779a23f6b8613223251f938e8347d922883198 100644 (file)
--- 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.
  */
 /*
  * 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 *);
 
 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.
  */
  * 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.
 
 /*
  * Disassociate any cached object buffer from the commit, but do not free it.

diff --git a/object.c b/object.c
index 003f8704844c5a6c70b719d87494e535719de044..c4170d2d0cb038d79f1e9bba5336ad47360cb4d2 100644 (file)
--- 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)
                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);
        }
                else if (obj->type == OBJ_TAG)
                        release_tag_memory((struct tag*)obj);
        }