commit: convert commit->buffer to a slab

This will make it easier to manage the buffer cache
independently of the "struct commit" objects. It also
shrinks "struct commit" by one pointer, which may be
helpful.

Unfortunately it does not reduce the max memory size of
something like "rev-list", because rev-list uses
get_cached_commit_buffer() to decide not to show each
commit's output (and due to the design of slab_at, accessing
the slab requires us to extend it, allocating exactly the
same number of buffer pointers we dropped from the commit
structs).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/commit.c b/commit.c
index 1903dde2850ea2a55a88895f5d69553fcb06f459..e289c783270f57bb213ef60cd24d7b950c6d52da 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -245,14 +245,17 @@ int unregister_shallow(const unsigned char *sha1)
        return 0;
 }
 
+define_commit_slab(buffer_slab, void *);
+static struct buffer_slab buffer_slab = COMMIT_SLAB_INIT(1, buffer_slab);
+
 void set_commit_buffer(struct commit *commit, void *buffer)
 {
-       commit->buffer = buffer;
+       *buffer_slab_at(&buffer_slab, commit) = buffer;
 }
 
 const void *get_cached_commit_buffer(const struct commit *commit)
 {
-       return commit->buffer;
+       return *buffer_slab_at(&buffer_slab, commit);
 }
 
 const void *get_commit_buffer(const struct commit *commit)
@@ -274,20 +277,23 @@ const void *get_commit_buffer(const struct commit *commit)
 
 void unuse_commit_buffer(const struct commit *commit, const void *buffer)
 {
-       if (commit->buffer != buffer)
+       void *cached = *buffer_slab_at(&buffer_slab, commit);
+       if (cached != buffer)
                free((void *)buffer);
 }
 
 void free_commit_buffer(struct commit *commit)
 {
-       free(commit->buffer);
-       commit->buffer = NULL;
+       void **b = buffer_slab_at(&buffer_slab, commit);
+       free(*b);
+       *b = NULL;
 }
 
 const void *detach_commit_buffer(struct commit *commit)
 {
-       void *ret = commit->buffer;
-       commit->buffer = NULL;
+       void **b = buffer_slab_at(&buffer_slab, commit);
+       void *ret = *b;
+       *b = NULL;
        return ret;
 }
 

diff --git a/commit.h b/commit.h
index 5ce5ce72c3fcbc3ca6578b8365d163642f971f07..e1c25692f10ecc520c40f73f4b4eb5180e366d1e 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -20,7 +20,6 @@ struct commit {
        unsigned long date;
        struct commit_list *parents;
        struct tree *tree;
-       char *buffer;
 };
 
 extern int save_commit_buffer;