Move "void *util" from "struct object" into "struct commit"

Every single user actually wanted this only for commit objects, and we
have no reason to waste space on it for other object types. So just move
the structure member from the low-level "struct object" into the "struct
commit".

This leaves the commit object the same size, and removes one unnecessary
pointer from all other object allocations.

This shrinks memory usage (still at a fairly hefty half-gig, admittedly)
of "git-rev-list --all --objects" on the mozilla repo by another 5% in my
tests.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/blame.c b/blame.c
index 25d3bcf647f44bbaed1c273d5886df6a7cfe6e03..7c0b62cf3f5ff78f95cf96c2582f693b5d124752 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -110,8 +110,8 @@ static struct patch *get_patch(struct commit *commit, struct commit *other)
        xdemitconf_t xecfg;
        mmfile_t file_c, file_o;
        xdemitcb_t ecb;
        xdemitconf_t xecfg;
        mmfile_t file_c, file_o;
        xdemitcb_t ecb;

-       struct util_info *info_c = (struct util_info *)commit->object.util;
-       struct util_info *info_o = (struct util_info *)other->object.util;
+       struct util_info *info_c = (struct util_info *)commit->util;
+       struct util_info *info_o = (struct util_info *)other->util;

        struct timeval tv_start, tv_end;
 
        get_blob(commit);
        struct timeval tv_start, tv_end;
 
        get_blob(commit);


@@ -197,7 +197,7 @@ static int get_blob_sha1_internal(const unsigned char *sha1, const char *base,
 
 static void get_blob(struct commit *commit)
 {
 
 static void get_blob(struct commit *commit)
 {

-       struct util_info *info = commit->object.util;
+       struct util_info *info = commit->util;

        char type[20];
 
        if (info->buf)
        char type[20];
 
        if (info->buf)


@@ -223,8 +223,8 @@ static void print_patch(struct patch *p)
 /* For debugging only */
 static void print_map(struct commit *cmit, struct commit *other)
 {
 /* For debugging only */
 static void print_map(struct commit *cmit, struct commit *other)
 {

-       struct util_info *util = cmit->object.util;
-       struct util_info *util2 = other->object.util;
+       struct util_info *util = cmit->util;
+       struct util_info *util2 = other->util;

 
        int i;
        int max =
 
        int i;
        int max =


@@ -259,8 +259,8 @@ static void print_map(struct commit *cmit, struct commit *other)
 static void fill_line_map(struct commit *commit, struct commit *other,
                          struct patch *p)
 {
 static void fill_line_map(struct commit *commit, struct commit *other,
                          struct patch *p)
 {

-       struct util_info *util = commit->object.util;
-       struct util_info *util2 = other->object.util;
+       struct util_info *util = commit->util;
+       struct util_info *util2 = other->util;

        int *map = util->line_map;
        int *map2 = util2->line_map;
        int cur_chunk = 0;
        int *map = util->line_map;
        int *map2 = util2->line_map;
        int cur_chunk = 0;


@@ -322,14 +322,14 @@ static void fill_line_map(struct commit *commit, struct commit *other,
 
 static int map_line(struct commit *commit, int line)
 {
 
 static int map_line(struct commit *commit, int line)
 {

-       struct util_info *info = commit->object.util;
+       struct util_info *info = commit->util;

        assert(line >= 0 && line < info->num_lines);
        return info->line_map[line];
 }
 
 static struct util_info* get_util(struct commit *commit)
 {
        assert(line >= 0 && line < info->num_lines);
        return info->line_map[line];
 }
 
 static struct util_info* get_util(struct commit *commit)
 {

-       struct util_info *util = commit->object.util;
+       struct util_info *util = commit->util;

 
        if (util)
                return util;
 
        if (util)
                return util;


@@ -340,13 +340,13 @@ static struct util_info* get_util(struct commit *commit)
        util->line_map = NULL;
        util->num_lines = -1;
        util->pathname = NULL;
        util->line_map = NULL;
        util->num_lines = -1;
        util->pathname = NULL;

-       commit->object.util = util;
+       commit->util = util;

        return util;
 }
 
 static int fill_util_info(struct commit *commit)
 {
        return util;
 }
 
 static int fill_util_info(struct commit *commit)
 {

-       struct util_info *util = commit->object.util;
+       struct util_info *util = commit->util;

 
        assert(util);
        assert(util->pathname);
 
        assert(util);
        assert(util->pathname);


@@ -359,7 +359,7 @@ static int fill_util_info(struct commit *commit)
 
 static void alloc_line_map(struct commit *commit)
 {
 
 static void alloc_line_map(struct commit *commit)
 {

-       struct util_info *util = commit->object.util;
+       struct util_info *util = commit->util;

        int i;
 
        if (util->line_map)
        int i;
 
        if (util->line_map)


@@ -383,7 +383,7 @@ static void alloc_line_map(struct commit *commit)
 
 static void init_first_commit(struct commit* commit, const char* filename)
 {
 
 static void init_first_commit(struct commit* commit, const char* filename)
 {

-       struct util_info* util = commit->object.util;
+       struct util_info* util = commit->util;

        int i;
 
        util->pathname = filename;
        int i;
 
        util->pathname = filename;


@@ -392,7 +392,7 @@ static void init_first_commit(struct commit* commit, const char* filename)
 
        alloc_line_map(commit);
 
 
        alloc_line_map(commit);
 

-       util = commit->object.util;
+       util = commit->util;

 
        for (i = 0; i < util->num_lines; i++)
                util->line_map[i] = i;
 
        for (i = 0; i < util->num_lines; i++)
                util->line_map[i] = i;


@@ -413,7 +413,7 @@ static void process_commits(struct rev_info *rev, const char *path,
        assert(commit);
        init_first_commit(commit, path);
 
        assert(commit);
        init_first_commit(commit, path);
 

-       util = commit->object.util;
+       util = commit->util;

        num_blame_lines = util->num_lines;
        blame_lines = xmalloc(sizeof(struct commit *) * num_blame_lines);
        blame_contents = util->buf;
        num_blame_lines = util->num_lines;
        blame_lines = xmalloc(sizeof(struct commit *) * num_blame_lines);
        blame_contents = util->buf;


@@ -452,7 +452,7 @@ static void process_commits(struct rev_info *rev, const char *path,
                        continue;
 
                alloc_line_map(commit);
                        continue;
 
                alloc_line_map(commit);

-               util = commit->object.util;
+               util = commit->util;

 
                for (parents = commit->parents;
                     parents != NULL; parents = parents->next) {
 
                for (parents = commit->parents;
                     parents != NULL; parents = parents->next) {


@@ -512,7 +512,7 @@ static int compare_tree_path(struct rev_info* revs,
 {
        int ret;
        const char* paths[2];
 {
        int ret;
        const char* paths[2];

-       struct util_info* util = c2->object.util;
+       struct util_info* util = c2->util;

        paths[0] = util->pathname;
        paths[1] = NULL;
 
        paths[0] = util->pathname;
        paths[1] = NULL;
 


@@ -541,7 +541,7 @@ static int same_tree_as_empty_path(struct rev_info *revs, struct tree* t1,
 
 static const char* find_rename(struct commit* commit, struct commit* parent)
 {
 
 static const char* find_rename(struct commit* commit, struct commit* parent)
 {

-       struct util_info* cutil = commit->object.util;
+       struct util_info* cutil = commit->util;

        struct diff_options diff_opts;
        const char *paths[1];
        int i;
        struct diff_options diff_opts;
        const char *paths[1];
        int i;


@@ -585,7 +585,7 @@ static void simplify_commit(struct rev_info *revs, struct commit *commit)
                return;
 
        if (!commit->parents) {
                return;
 
        if (!commit->parents) {

-               struct util_info* util = commit->object.util;
+               struct util_info* util = commit->util;

                if (!same_tree_as_empty_path(revs, commit->tree,
                                             util->pathname))
                        commit->object.flags |= TREECHANGE;
                if (!same_tree_as_empty_path(revs, commit->tree,
                                             util->pathname))
                        commit->object.flags |= TREECHANGE;


@@ -612,7 +612,7 @@ static void simplify_commit(struct rev_info *revs, struct commit *commit)
                case REV_TREE_NEW:
                {
 
                case REV_TREE_NEW:
                {
 

-                       struct util_info* util = commit->object.util;
+                       struct util_info* util = commit->util;

                        if (revs->remove_empty_trees &&
                            same_tree_as_empty_path(revs, p->tree,
                                                    util->pathname)) {
                        if (revs->remove_empty_trees &&
                            same_tree_as_empty_path(revs, p->tree,
                                                    util->pathname)) {


@@ -709,13 +709,13 @@ static const char* format_time(unsigned long time, const char* tz_str,
 
 static void topo_setter(struct commit* c, void* data)
 {
 
 static void topo_setter(struct commit* c, void* data)
 {

-       struct util_info* util = c->object.util;
+       struct util_info* util = c->util;

        util->topo_data = data;
 }
 
 static void* topo_getter(struct commit* c)
 {
        util->topo_data = data;
 }
 
 static void* topo_getter(struct commit* c)
 {

-       struct util_info* util = c->object.util;
+       struct util_info* util = c->util;

        return util->topo_data;
 }
 
        return util->topo_data;
 }
 


@@ -863,7 +863,7 @@ int main(int argc, const char **argv)
                struct util_info* u;
                if (!c)
                        c = initial;
                struct util_info* u;
                if (!c)
                        c = initial;

-               u = c->object.util;
+               u = c->util;

 
                if (!found_rename && strcmp(filename, u->pathname))
                        found_rename = 1;
 
                if (!found_rename && strcmp(filename, u->pathname))
                        found_rename = 1;


@@ -881,7 +881,7 @@ int main(int argc, const char **argv)
                if (!c)
                        c = initial;
 
                if (!c)
                        c = initial;
 

-               u = c->object.util;
+               u = c->util;

                get_commit_info(c, &ci);
                fwrite(sha1_to_hex(c->object.sha1), sha1_len, 1, stdout);
                if(compability) {
                get_commit_info(c, &ci);
                fwrite(sha1_to_hex(c->object.sha1), sha1_len, 1, stdout);
                if(compability) {

diff --git a/builtin-show-branch.c b/builtin-show-branch.c
index cf9c071a53c09476acaecb6bcbf95d4ff76dca79..09d82278625584213f710a984652a7efc07339c5 100644 (file)
--- a/builtin-show-branch.c
+++ b/builtin-show-branch.c
@@ -51,9 +51,9 @@ struct commit_name {
 static void name_commit(struct commit *commit, const char *head_name, int nth)
 {
        struct commit_name *name;
 static void name_commit(struct commit *commit, const char *head_name, int nth)
 {
        struct commit_name *name;

-       if (!commit->object.util)
-               commit->object.util = xmalloc(sizeof(struct commit_name));
-       name = commit->object.util;
+       if (!commit->util)
+               commit->util = xmalloc(sizeof(struct commit_name));
+       name = commit->util;

        name->head_name = head_name;
        name->generation = nth;
 }
        name->head_name = head_name;
        name->generation = nth;
 }


@@ -65,8 +65,8 @@ static void name_commit(struct commit *commit, const char *head_name, int nth)
  */
 static void name_parent(struct commit *commit, struct commit *parent)
 {
  */
 static void name_parent(struct commit *commit, struct commit *parent)
 {

-       struct commit_name *commit_name = commit->object.util;
-       struct commit_name *parent_name = parent->object.util;
+       struct commit_name *commit_name = commit->util;
+       struct commit_name *parent_name = parent->util;

        if (!commit_name)
                return;
        if (!parent_name ||
        if (!commit_name)
                return;
        if (!parent_name ||


@@ -80,12 +80,12 @@ static int name_first_parent_chain(struct commit *c)
        int i = 0;
        while (c) {
                struct commit *p;
        int i = 0;
        while (c) {
                struct commit *p;

-               if (!c->object.util)
+               if (!c->util)

                        break;
                if (!c->parents)
                        break;
                p = c->parents->item;
                        break;
                if (!c->parents)
                        break;
                p = c->parents->item;

-               if (!p->object.util) {
+               if (!p->util) {

                        name_parent(c, p);
                        i++;
                }
                        name_parent(c, p);
                        i++;
                }


@@ -106,7 +106,7 @@ static void name_commits(struct commit_list *list,
        /* First give names to the given heads */
        for (cl = list; cl; cl = cl->next) {
                c = cl->item;
        /* First give names to the given heads */
        for (cl = list; cl; cl = cl->next) {
                c = cl->item;

-               if (c->object.util)
+               if (c->util)

                        continue;
                for (i = 0; i < num_rev; i++) {
                        if (rev[i] == c) {
                        continue;
                for (i = 0; i < num_rev; i++) {
                        if (rev[i] == c) {


@@ -132,9 +132,9 @@ static void name_commits(struct commit_list *list,
                        struct commit_name *n;
                        int nth;
                        c = cl->item;
                        struct commit_name *n;
                        int nth;
                        c = cl->item;

-                       if (!c->object.util)
+                       if (!c->util)

                                continue;
                                continue;

-                       n = c->object.util;
+                       n = c->util;

                        parents = c->parents;
                        nth = 0;
                        while (parents) {
                        parents = c->parents;
                        nth = 0;
                        while (parents) {


@@ -142,7 +142,7 @@ static void name_commits(struct commit_list *list,
                                char newname[1000], *en;
                                parents = parents->next;
                                nth++;
                                char newname[1000], *en;
                                parents = parents->next;
                                nth++;

-                               if (p->object.util)
+                               if (p->util)

                                        continue;
                                en = newname;
                                switch (n->generation) {
                                        continue;
                                en = newname;
                                switch (n->generation) {


@@ -257,7 +257,7 @@ static void join_revs(struct commit_list **list_p,
 static void show_one_commit(struct commit *commit, int no_name)
 {
        char pretty[256], *cp;
 static void show_one_commit(struct commit *commit, int no_name)
 {
        char pretty[256], *cp;

-       struct commit_name *name = commit->object.util;
+       struct commit_name *name = commit->util;

        if (commit->object.parsed)
                pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
                                    pretty, sizeof(pretty), 0, NULL, NULL);
        if (commit->object.parsed)
                pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
                                    pretty, sizeof(pretty), 0, NULL, NULL);

diff --git a/commit.c b/commit.c
index 11fca559d8a4bcb6b6dc67f41ec54991acaba11a..5914200a2fba2d618951c3210e2b407c29a62d7b 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -711,12 +711,12 @@ int count_parents(struct commit * commit)
 
 void topo_sort_default_setter(struct commit *c, void *data)
 {
 
 void topo_sort_default_setter(struct commit *c, void *data)
 {

-       c->object.util = data;
+       c->util = data;

 }
 
 void *topo_sort_default_getter(struct commit *c)
 {
 }
 
 void *topo_sort_default_getter(struct commit *c)
 {

-       return c->object.util;
+       return c->util;

 }
 
 /*
 }
 
 /*

diff --git a/commit.h b/commit.h
index c9de1677e903ead414e5133424b722bea907b4d9..7c9ca3fbed728d946e48c787720b3ab5ad575a85 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -11,6 +11,7 @@ struct commit_list {
 
 struct commit {
        struct object object;
 
 struct commit {
        struct object object;

+       void *util;

        unsigned long date;
        struct commit_list *parents;
        struct tree *tree;
        unsigned long date;
        struct commit_list *parents;
        struct tree *tree;

diff --git a/name-rev.c b/name-rev.c
index 1f0135f5ab92a3eaadfb05b62a5ccea62cb43826..c29b93ea7199643885cd74148d03db7d1bbb533b 100644 (file)
--- a/name-rev.c
+++ b/name-rev.c
@@ -19,7 +19,7 @@ static void name_rev(struct commit *commit,
                const char *tip_name, int merge_traversals, int generation,
                int deref)
 {
                const char *tip_name, int merge_traversals, int generation,
                int deref)
 {

-       struct rev_name *name = (struct rev_name *)commit->object.util;
+       struct rev_name *name = (struct rev_name *)commit->util;

        struct commit_list *parents;
        int parent_number = 1;
 
        struct commit_list *parents;
        int parent_number = 1;
 


@@ -41,7 +41,7 @@ static void name_rev(struct commit *commit,
 
        if (name == NULL) {
                name = xmalloc(sizeof(rev_name));
 
        if (name == NULL) {
                name = xmalloc(sizeof(rev_name));

-               commit->object.util = name;
+               commit->util = name;

                goto copy_data;
        } else if (name->merge_traversals > merge_traversals ||
                        (name->merge_traversals == merge_traversals &&
                goto copy_data;
        } else if (name->merge_traversals > merge_traversals ||
                        (name->merge_traversals == merge_traversals &&


@@ -108,7 +108,13 @@ static int name_ref(const char *path, const unsigned char *sha1)
 static const char* get_rev_name(struct object *o)
 {
        static char buffer[1024];
 static const char* get_rev_name(struct object *o)
 {
        static char buffer[1024];

-       struct rev_name *n = (struct rev_name *)o->util;
+       struct rev_name *n;
+       struct commit *c;
+
+       if (o->type != TYPE_COMMIT)
+               return "undefined";
+       c = (struct commit *) o;
+       n = c->util;

        if (!n)
                return "undefined";
 
        if (!n)
                return "undefined";
 

diff --git a/object.h b/object.h
index a0762b66725a1f8af45ea65147178b9130e2e056..f4ee2e55ba7853e3b49cbca7409c89b71d4b848f 100644 (file)
--- a/object.h
+++ b/object.h
@@ -29,7 +29,6 @@ struct object {
        unsigned flags : FLAG_BITS;
        unsigned char sha1[20];
        struct object_refs *refs;
        unsigned flags : FLAG_BITS;
        unsigned char sha1[20];
        struct object_refs *refs;

-       void *util;

 };
 
 extern int track_object_refs;
 };
 
 extern int track_object_refs;