Add "named object array" concept

We've had this notion of a "object_list" for a long time, which eventually
grew a "name" member because some users (notably git-rev-list) wanted to
name each object as it is generated.

That object_list is great for some things, but it isn't all that wonderful
for others, and the "name" member is generally not used by everybody.

This patch splits the users of the object_list array up into two: the
traditional list users, who want the list-like format, and who don't
actually use or want the name. And another class of users that really used
the list as an extensible array, and generally wanted to name the objects.

The patch is fairly straightforward, but it's also biggish. Most of it
really just cleans things up: switching the revision parsing and listing
over to the array makes things like the builtin-diff usage much simpler
(we now see exactly how many members the array has, and we don't get the
objects reversed from the order they were on the command line).

One of the main reasons for doing this at all is that the malloc overhead
of the simple object list was actually pretty high, and the array is just
a lot denser. So this patch brings down memory usage by git-rev-list by
just under 3% (on top of all the other memory use optimizations) on the
mozilla archive.

It does add more lines than it removes, and more importantly, it adds a
whole new infrastructure for maintaining lists of objects, but on the
other hand, the new dynamic array code is pretty obvious. The change to
builtin-diff-tree.c shows a fairly good example of why an array interface
is sometimes more natural, and just much simpler for everybody.

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

diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index cebda828eec4e90f3d0af050e07a53071b39d5b7..5afc1d7208f8a13b7363be2127cad3b43baa95dd 100644 (file)
--- a/builtin-diff-files.c
+++ b/builtin-diff-files.c
@@ -41,7 +41,7 @@ int cmd_diff_files(int argc, const char **argv, char **envp)
         * rev.max_count is reasonable (0 <= n <= 3),
         * there is no other revision filtering parameters.
         */
         * rev.max_count is reasonable (0 <= n <= 3),
         * there is no other revision filtering parameters.
         */

-       if (rev.pending_objects ||
+       if (rev.pending.nr ||

            rev.min_age != -1 || rev.max_age != -1)
                usage(diff_files_usage);
        /*
            rev.min_age != -1 || rev.max_age != -1)
                usage(diff_files_usage);
        /*

diff --git a/builtin-diff-index.c b/builtin-diff-index.c
index 1958580d82e54ab5a5b1e054263eab7264c4bcb2..c42ef9a7a76e7d8f6bc25d593865b9343d4e74b5 100644 (file)
--- a/builtin-diff-index.c
+++ b/builtin-diff-index.c
@@ -32,7 +32,7 @@ int cmd_diff_index(int argc, const char **argv, char **envp)
         * Make sure there is one revision (i.e. pending object),
         * and there is no revision filtering parameters.
         */
         * Make sure there is one revision (i.e. pending object),
         * and there is no revision filtering parameters.
         */

-       if (!rev.pending_objects || rev.pending_objects->next ||
+       if (rev.pending.nr != 1 ||

            rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1)
                usage(diff_cache_usage);
        return run_diff_index(&rev, cached);
            rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1)
                usage(diff_cache_usage);
        return run_diff_index(&rev, cached);

diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c
index 58cf65856d1e9e0ab088dab2c051058cf48cb840..3409a39a9f73f9ed67547f5cc79619c1e402f47b 100644 (file)
--- a/builtin-diff-tree.c
+++ b/builtin-diff-tree.c
@@ -65,7 +65,6 @@ int cmd_diff_tree(int argc, const char **argv, char **envp)
        char line[1000];
        struct object *tree1, *tree2;
        static struct rev_info *opt = &log_tree_opt;
        char line[1000];
        struct object *tree1, *tree2;
        static struct rev_info *opt = &log_tree_opt;

-       struct object_list *list;

        int read_stdin = 0;
 
        git_config(git_diff_config);
        int read_stdin = 0;
 
        git_config(git_diff_config);


@@ -86,45 +85,28 @@ int cmd_diff_tree(int argc, const char **argv, char **envp)
        }
 
        /*
        }
 
        /*

-        * NOTE! "setup_revisions()" will have inserted the revisions
-        * it parsed in reverse order. So if you do
-        *
-        *      git-diff-tree a b
-        *
-        * the commit list will be "b" -> "a" -> NULL, so we reverse
-        * the order of the objects if the first one is not marked
-        * UNINTERESTING.
+        * NOTE! We expect "a ^b" to be equal to "a..b", so we
+        * reverse the order of the objects if the second one
+        * is marked UNINTERESTING.

         */
         */

-       nr_sha1 = 0;
-       list = opt->pending_objects;
-       if (list) {
-               nr_sha1++;
-               tree1 = list->item;
-               list = list->next;
-               if (list) {
-                       nr_sha1++;
-                       tree2 = tree1;
-                       tree1 = list->item;
-                       if (list->next)
-                               usage(diff_tree_usage);
-                       /* Switch them around if the second one was uninteresting.. */
-                       if (tree2->flags & UNINTERESTING) {
-                               struct object *tmp = tree2;
-                               tree2 = tree1;
-                               tree1 = tmp;
-                       }
-               }
-       }
-
+       nr_sha1 = opt->pending.nr;

        switch (nr_sha1) {
        case 0:
                if (!read_stdin)
                        usage(diff_tree_usage);
                break;
        case 1:
        switch (nr_sha1) {
        case 0:
                if (!read_stdin)
                        usage(diff_tree_usage);
                break;
        case 1:

+               tree1 = opt->pending.objects[0].item;

                diff_tree_commit_sha1(tree1->sha1);
                break;
        case 2:
                diff_tree_commit_sha1(tree1->sha1);
                break;
        case 2:

+               tree1 = opt->pending.objects[0].item;
+               tree2 = opt->pending.objects[1].item;
+               if (tree2->flags & UNINTERESTING) {
+                       struct object *tmp = tree2;
+                       tree2 = tree1;
+                       tree1 = tmp;
+               }

                diff_tree_sha1(tree1->sha1,
                               tree2->sha1,
                               "", &opt->diffopt);
                diff_tree_sha1(tree1->sha1,
                               tree2->sha1,
                               "", &opt->diffopt);

diff --git a/builtin-diff.c b/builtin-diff.c
index 6ac3d4b8ca23e7c4d724b22fd3222005d8fe3df8..99a2f766055d6c8c3231e38bd369169d3c742782 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -50,7 +50,7 @@ static int builtin_diff_files(struct rev_info *revs,
         * specified rev.max_count is reasonable (0 <= n <= 3), and
         * there is no other revision filtering parameter.
         */
         * specified rev.max_count is reasonable (0 <= n <= 3), and
         * there is no other revision filtering parameter.
         */

-       if (revs->pending_objects ||
+       if (revs->pending.nr ||

            revs->min_age != -1 ||
            revs->max_age != -1 ||
            3 < revs->max_count)
            revs->min_age != -1 ||
            revs->max_age != -1 ||
            3 < revs->max_count)


@@ -172,7 +172,7 @@ static int builtin_diff_index(struct rev_info *revs,
         * Make sure there is one revision (i.e. pending object),
         * and there is no revision filtering parameters.
         */
         * Make sure there is one revision (i.e. pending object),
         * and there is no revision filtering parameters.
         */

-       if (!revs->pending_objects || revs->pending_objects->next ||
+       if (revs->pending.nr != 1 ||

            revs->max_count != -1 || revs->min_age != -1 ||
            revs->max_age != -1)
                usage(builtin_diff_usage);
            revs->max_count != -1 || revs->min_age != -1 ||
            revs->max_age != -1)
                usage(builtin_diff_usage);


@@ -181,10 +181,10 @@ static int builtin_diff_index(struct rev_info *revs,
 
 static int builtin_diff_tree(struct rev_info *revs,
                             int argc, const char **argv,
 
 static int builtin_diff_tree(struct rev_info *revs,
                             int argc, const char **argv,

-                            struct object_list *ent)
+                            struct object_array_entry *ent)

 {
        const unsigned char *(sha1[2]);
 {
        const unsigned char *(sha1[2]);

-       int swap = 1;
+       int swap = 0;

        while (1 < argc) {
                const char *arg = argv[1];
                if (!strcmp(arg, "--raw"))
        while (1 < argc) {
                const char *arg = argv[1];
                if (!strcmp(arg, "--raw"))


@@ -195,10 +195,10 @@ static int builtin_diff_tree(struct rev_info *revs,
        }
 
        /* We saw two trees, ent[0] and ent[1].
        }
 
        /* We saw two trees, ent[0] and ent[1].

-        * unless ent[0] is unintesting, they are swapped
+        * if ent[1] is unintesting, they are swapped

         */
         */

-       if (ent[0].item->flags & UNINTERESTING)
-               swap = 0;
+       if (ent[1].item->flags & UNINTERESTING)
+               swap = 1;

        sha1[swap] = ent[0].item->sha1;
        sha1[1-swap] = ent[1].item->sha1;
        diff_tree_sha1(sha1[0], sha1[1], "", &revs->diffopt);
        sha1[swap] = ent[0].item->sha1;
        sha1[1-swap] = ent[1].item->sha1;
        diff_tree_sha1(sha1[0], sha1[1], "", &revs->diffopt);


@@ -208,7 +208,7 @@ static int builtin_diff_tree(struct rev_info *revs,
 
 static int builtin_diff_combined(struct rev_info *revs,
                                 int argc, const char **argv,
 
 static int builtin_diff_combined(struct rev_info *revs,
                                 int argc, const char **argv,

-                                struct object_list *ent,
+                                struct object_array_entry *ent,

                                 int ents)
 {
        const unsigned char (*parent)[20];
                                 int ents)
 {
        const unsigned char (*parent)[20];


@@ -242,13 +242,14 @@ void add_head(struct rev_info *revs)
        obj = parse_object(sha1);
        if (!obj)
                return;
        obj = parse_object(sha1);
        if (!obj)
                return;

-       add_object(obj, &revs->pending_objects, NULL, "HEAD");
+       add_pending_object(revs, obj, "HEAD");

 }
 
 int cmd_diff(int argc, const char **argv, char **envp)
 {
 }
 
 int cmd_diff(int argc, const char **argv, char **envp)
 {

+       int i;

        struct rev_info rev;
        struct rev_info rev;

-       struct object_list *list, ent[100];
+       struct object_array_entry ent[100];

        int ents = 0, blobs = 0, paths = 0;
        const char *path = NULL;
        struct blobinfo blob[2];
        int ents = 0, blobs = 0, paths = 0;
        const char *path = NULL;
        struct blobinfo blob[2];


@@ -281,7 +282,7 @@ int cmd_diff(int argc, const char **argv, char **envp)
        /* Do we have --cached and not have a pending object, then
         * default to HEAD by hand.  Eek.
         */
        /* Do we have --cached and not have a pending object, then
         * default to HEAD by hand.  Eek.
         */

-       if (!rev.pending_objects) {
+       if (!rev.pending.nr) {

                int i;
                for (i = 1; i < argc; i++) {
                        const char *arg = argv[i];
                int i;
                for (i = 1; i < argc; i++) {
                        const char *arg = argv[i];


@@ -294,7 +295,8 @@ int cmd_diff(int argc, const char **argv, char **envp)
                }
        }
 
                }
        }
 

-       for (list = rev.pending_objects; list; list = list->next) {
+       for (i = 0; i < rev.pending.nr; i++) {
+               struct object_array_entry *list = rev.pending.objects+i;

                struct object *obj = list->item;
                const char *name = list->name;
                int flags = (obj->flags & UNINTERESTING);
                struct object *obj = list->item;
                const char *name = list->name;
                int flags = (obj->flags & UNINTERESTING);

diff --git a/builtin-grep.c b/builtin-grep.c
index 9806499263dcb92c7a6903ead36646baf676b178..6a240fb6e908d95a1981ea2437fcd4bea27a6ba9 100644 (file)
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -657,7 +657,7 @@ int cmd_grep(int argc, const char **argv, char **envp)
        int cached = 0;
        int seen_dashdash = 0;
        struct grep_opt opt;
        int cached = 0;
        int seen_dashdash = 0;
        struct grep_opt opt;

-       struct object_list *list, **tail, *object_list = NULL;
+       struct object_array list = { 0, 0, NULL };

        const char *prefix = setup_git_directory();
        const char **paths = NULL;
        int i;
        const char *prefix = setup_git_directory();
        const char **paths = NULL;
        int i;


@@ -677,7 +677,6 @@ int cmd_grep(int argc, const char **argv, char **envp)
         * that continues up to the -- (if exists), and then paths.
         */
 
         * that continues up to the -- (if exists), and then paths.
         */
 

-       tail = &object_list;

        while (1 < argc) {
                const char *arg = argv[1];
                argc--; argv++;
        while (1 < argc) {
                const char *arg = argv[1];
                argc--; argv++;


@@ -851,12 +850,9 @@ int cmd_grep(int argc, const char **argv, char **envp)
                /* Is it a rev? */
                if (!get_sha1(arg, sha1)) {
                        struct object *object = parse_object(sha1);
                /* Is it a rev? */
                if (!get_sha1(arg, sha1)) {
                        struct object *object = parse_object(sha1);

-                       struct object_list *elem;

                        if (!object)
                                die("bad object %s", arg);
                        if (!object)
                                die("bad object %s", arg);

-                       elem = object_list_insert(object, tail);
-                       elem->name = arg;
-                       tail = &elem->next;
+                       add_object_array(object, arg, &list);

                        continue;
                }
                if (!strcmp(arg, "--")) {
                        continue;
                }
                if (!strcmp(arg, "--")) {


@@ -881,16 +877,16 @@ int cmd_grep(int argc, const char **argv, char **envp)
                paths[1] = NULL;
        }
 
                paths[1] = NULL;
        }
 

-       if (!object_list)
+       if (!list.nr)

                return !grep_cache(&opt, paths, cached);
 
        if (cached)
                die("both --cached and trees are given.");
 
                return !grep_cache(&opt, paths, cached);
 
        if (cached)
                die("both --cached and trees are given.");
 

-       for (list = object_list; list; list = list->next) {
+       for (i = 0; i < list.nr; i++) {

                struct object *real_obj;
                struct object *real_obj;

-               real_obj = deref_tag(list->item, NULL, 0);
-               if (grep_object(&opt, paths, real_obj, list->name))
+               real_obj = deref_tag(list.objects[i].item, NULL, 0);
+               if (grep_object(&opt, paths, real_obj, list.objects[i].name))

                        hit = 1;
        }
        return !hit;
                        hit = 1;
        }
        return !hit;

diff --git a/builtin-log.c b/builtin-log.c
index 9187fd337ba767384abab26224b95610aa531807..5a8a50b81dabea4ccd9b0ba0fcb5d925a00560d0 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -257,8 +257,8 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
                            output_directory);
        }
 
                            output_directory);
        }
 

-       if (rev.pending_objects && rev.pending_objects->next == NULL) {
-               rev.pending_objects->item->flags |= UNINTERESTING;
+       if (rev.pending.nr == 1) {
+               rev.pending.objects[0].item->flags |= UNINTERESTING;

                add_head(&rev);
        }
 
                add_head(&rev);
        }
 

diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 71353eb19db158a60a5ae94f83f53059adc3399b..63bad0e96ade657bef21d9ca0e0de2e0ba8af61c 100644 (file)
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -99,26 +99,26 @@ static void show_commit(struct commit *commit)
        }
 }
 
        }
 }
 

-static struct object_list **process_blob(struct blob *blob,
-                                        struct object_list **p,
-                                        struct name_path *path,
-                                        const char *name)
+static void process_blob(struct blob *blob,
+                        struct object_array *p,
+                        struct name_path *path,
+                        const char *name)

 {
        struct object *obj = &blob->object;
 
        if (!revs.blob_objects)
 {
        struct object *obj = &blob->object;
 
        if (!revs.blob_objects)

-               return p;
+               return;

        if (obj->flags & (UNINTERESTING | SEEN))
        if (obj->flags & (UNINTERESTING | SEEN))

-               return p;
+               return;

        obj->flags |= SEEN;
        name = strdup(name);
        obj->flags |= SEEN;
        name = strdup(name);

-       return add_object(obj, p, path, name);
+       add_object(obj, p, path, name);

 }
 
 }
 

-static struct object_list **process_tree(struct tree *tree,
-                                        struct object_list **p,
-                                        struct name_path *path,
-                                        const char *name)
+static void process_tree(struct tree *tree,
+                        struct object_array *p,
+                        struct name_path *path,
+                        const char *name)

 {
        struct object *obj = &tree->object;
        struct tree_desc desc;
 {
        struct object *obj = &tree->object;
        struct tree_desc desc;


@@ -126,14 +126,14 @@ static struct object_list **process_tree(struct tree *tree,
        struct name_path me;
 
        if (!revs.tree_objects)
        struct name_path me;
 
        if (!revs.tree_objects)

-               return p;
+               return;

        if (obj->flags & (UNINTERESTING | SEEN))
        if (obj->flags & (UNINTERESTING | SEEN))

-               return p;
+               return;

        if (parse_tree(tree) < 0)
                die("bad tree object %s", sha1_to_hex(obj->sha1));
        obj->flags |= SEEN;
        name = strdup(name);
        if (parse_tree(tree) < 0)
                die("bad tree object %s", sha1_to_hex(obj->sha1));
        obj->flags |= SEEN;
        name = strdup(name);

-       p = add_object(obj, p, path, name);
+       add_object(obj, p, path, name);

        me.up = path;
        me.elem = name;
        me.elem_len = strlen(name);
        me.up = path;
        me.elem = name;
        me.elem_len = strlen(name);


@@ -143,57 +143,59 @@ static struct object_list **process_tree(struct tree *tree,
 
        while (tree_entry(&desc, &entry)) {
                if (S_ISDIR(entry.mode))
 
        while (tree_entry(&desc, &entry)) {
                if (S_ISDIR(entry.mode))

-                       p = process_tree(lookup_tree(entry.sha1), p, &me, entry.path);
+                       process_tree(lookup_tree(entry.sha1), p, &me, entry.path);

                else
                else

-                       p = process_blob(lookup_blob(entry.sha1), p, &me, entry.path);
+                       process_blob(lookup_blob(entry.sha1), p, &me, entry.path);

        }
        free(tree->buffer);
        tree->buffer = NULL;
        }
        free(tree->buffer);
        tree->buffer = NULL;

-       return p;

 }
 
 static void show_commit_list(struct rev_info *revs)
 {
 }
 
 static void show_commit_list(struct rev_info *revs)
 {

+       int i;

        struct commit *commit;
        struct commit *commit;

-       struct object_list *objects = NULL, **p = &objects, *pending;
+       struct object_array objects = { 0, 0, NULL };

 
        while ((commit = get_revision(revs)) != NULL) {
 
        while ((commit = get_revision(revs)) != NULL) {

-               p = process_tree(commit->tree, p, NULL, "");
+               process_tree(commit->tree, &objects, NULL, "");

                show_commit(commit);
        }
                show_commit(commit);
        }

-       for (pending = revs->pending_objects; pending; pending = pending->next) {
+       for (i = 0; i < revs->pending.nr; i++) {
+               struct object_array_entry *pending = revs->pending.objects + i;

                struct object *obj = pending->item;
                const char *name = pending->name;
                if (obj->flags & (UNINTERESTING | SEEN))
                        continue;
                if (obj->type == TYPE_TAG) {
                        obj->flags |= SEEN;
                struct object *obj = pending->item;
                const char *name = pending->name;
                if (obj->flags & (UNINTERESTING | SEEN))
                        continue;
                if (obj->type == TYPE_TAG) {
                        obj->flags |= SEEN;

-                       p = add_object(obj, p, NULL, name);
+                       add_object_array(obj, name, &objects);

                        continue;
                }
                if (obj->type == TYPE_TREE) {
                        continue;
                }
                if (obj->type == TYPE_TREE) {

-                       p = process_tree((struct tree *)obj, p, NULL, name);
+                       process_tree((struct tree *)obj, &objects, NULL, name);

                        continue;
                }
                if (obj->type == TYPE_BLOB) {
                        continue;
                }
                if (obj->type == TYPE_BLOB) {

-                       p = process_blob((struct blob *)obj, p, NULL, name);
+                       process_blob((struct blob *)obj, &objects, NULL, name);

                        continue;
                }
                die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name);
        }
                        continue;
                }
                die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name);
        }

-       while (objects) {
+       for (i = 0; i < objects.nr; i++) {
+               struct object_array_entry *p = objects.objects + i;
+

                /* An object with name "foo\n0000000..." can be used to
                 * confuse downstream git-pack-objects very badly.
                 */
                /* An object with name "foo\n0000000..." can be used to
                 * confuse downstream git-pack-objects very badly.
                 */

-               const char *ep = strchr(objects->name, '\n');
+               const char *ep = strchr(p->name, '\n');

                if (ep) {
                if (ep) {

-                       printf("%s %.*s\n", sha1_to_hex(objects->item->sha1),
-                              (int) (ep - objects->name),
-                              objects->name);
+                       printf("%s %.*s\n", sha1_to_hex(p->item->sha1),
+                              (int) (ep - p->name),
+                              p->name);

                }
                else
                }
                else

-                       printf("%s %s\n", sha1_to_hex(objects->item->sha1), objects->name);
-               objects = objects->next;
+                       printf("%s %s\n", sha1_to_hex(p->item->sha1), p->name);

        }
 }
 
        }
 }
 


@@ -348,7 +350,7 @@ int cmd_rev_list(int argc, const char **argv, char **envp)
 
        if ((!list &&
             (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) &&
 
        if ((!list &&
             (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) &&

-             !revs.pending_objects)) ||
+             !revs.pending.nr)) ||

            revs.diff)
                usage(rev_list_usage);
 
            revs.diff)
                usage(rev_list_usage);
 

diff --git a/diff-lib.c b/diff-lib.c
index 2183b41b03d08092ba6d98a642757640b86710d6..d93cd55510d702ae6c5104ae9f896264ddc98f80 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -329,8 +329,8 @@ int run_diff_index(struct rev_info *revs, int cached)
        }
        mark_merge_entries();
 
        }
        mark_merge_entries();
 

-       ent = revs->pending_objects->item;
-       tree_name = revs->pending_objects->name;
+       ent = revs->pending.objects[0].item;
+       tree_name = revs->pending.objects[0].name;

        tree = parse_tree_indirect(ent->sha1);
        if (!tree)
                return error("bad tree object %s", tree_name);
        tree = parse_tree_indirect(ent->sha1);
        if (!tree)
                return error("bad tree object %s", tree_name);

diff --git a/http-push.c b/http-push.c
index ba64f8fff58936ab59074b835b9df06eecf3031e..0f02a55ddf15ad86f9e3e9e2629fe2d9ca1ff78c 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -1171,7 +1171,7 @@ static void one_remote_object(const char *hex)
 
        obj->flags |= REMOTE;
        if (!object_list_contains(objects, obj))
 
        obj->flags |= REMOTE;
        if (!object_list_contains(objects, obj))

-               add_object(obj, &objects, NULL, "");
+               object_list_insert(obj, &objects);

 }
 
 static void handle_lockprop_ctx(struct xml_ctx *ctx, int tag_closed)
 }
 
 static void handle_lockprop_ctx(struct xml_ctx *ctx, int tag_closed)


@@ -1699,6 +1699,15 @@ static int locking_available(void)
        return lock_flags;
 }
 
        return lock_flags;
 }
 

+struct object_list **add_one_object(struct object *obj, struct object_list **p)
+{
+       struct object_list *entry = xmalloc(sizeof(struct object_list));
+       entry->item = obj;
+       entry->next = *p;
+       *p = entry;
+       return &entry->next;
+}
+

 static struct object_list **process_blob(struct blob *blob,
                                         struct object_list **p,
                                         struct name_path *path,
 static struct object_list **process_blob(struct blob *blob,
                                         struct object_list **p,
                                         struct name_path *path,


@@ -1712,8 +1721,7 @@ static struct object_list **process_blob(struct blob *blob,
                return p;
 
        obj->flags |= SEEN;
                return p;
 
        obj->flags |= SEEN;

-       name = strdup(name);
-       return add_object(obj, p, path, name);
+       return add_one_object(obj, p);

 }
 
 static struct object_list **process_tree(struct tree *tree,
 }
 
 static struct object_list **process_tree(struct tree *tree,


@@ -1735,7 +1743,7 @@ static struct object_list **process_tree(struct tree *tree,
 
        obj->flags |= SEEN;
        name = strdup(name);
 
        obj->flags |= SEEN;
        name = strdup(name);

-       p = add_object(obj, p, NULL, name);
+       p = add_one_object(obj, p);

        me.up = path;
        me.elem = name;
        me.elem_len = strlen(name);
        me.up = path;
        me.elem = name;
        me.elem_len = strlen(name);


@@ -1756,8 +1764,9 @@ static struct object_list **process_tree(struct tree *tree,
 
 static int get_delta(struct rev_info *revs, struct remote_lock *lock)
 {
 
 static int get_delta(struct rev_info *revs, struct remote_lock *lock)
 {

+       int i;

        struct commit *commit;
        struct commit *commit;

-       struct object_list **p = &objects, *pending;
+       struct object_list **p = &objects;

        int count = 0;
 
        while ((commit = get_revision(revs)) != NULL) {
        int count = 0;
 
        while ((commit = get_revision(revs)) != NULL) {


@@ -1767,15 +1776,16 @@ static int get_delta(struct rev_info *revs, struct remote_lock *lock)
                        count += add_send_request(&commit->object, lock);
        }
 
                        count += add_send_request(&commit->object, lock);
        }
 

-       for (pending = revs->pending_objects; pending; pending = pending->next) {
-               struct object *obj = pending->item;
-               const char *name = pending->name;
+       for (i = 0; i < revs->pending.nr; i++) {
+               struct object_array_entry *entry = revs->pending.objects + i;
+               struct object *obj = entry->item;
+               const char *name = entry->name;

 
                if (obj->flags & (UNINTERESTING | SEEN))
                        continue;
                if (obj->type == TYPE_TAG) {
                        obj->flags |= SEEN;
 
                if (obj->flags & (UNINTERESTING | SEEN))
                        continue;
                if (obj->type == TYPE_TAG) {
                        obj->flags |= SEEN;

-                       p = add_object(obj, p, NULL, name);
+                       p = add_one_object(obj, p);

                        continue;
                }
                if (obj->type == TYPE_TREE) {
                        continue;
                }
                if (obj->type == TYPE_TREE) {

diff --git a/name-rev.c b/name-rev.c
index c29b93ea7199643885cd74148d03db7d1bbb533b..3a5ac35d163bae5431c9cad8c9e31918c2734241 100644 (file)
--- a/name-rev.c
+++ b/name-rev.c
@@ -125,11 +125,10 @@ static const char* get_rev_name(struct object *o)
 
        return buffer;
 }
 
        return buffer;
 }

-       
+

 int main(int argc, char **argv)
 {
 int main(int argc, char **argv)
 {

-       struct object_list *revs = NULL;
-       struct object_list **walker = &revs;
+       struct object_array revs = { 0, 0, NULL };

        int as_is = 0, all = 0, transform_stdin = 0;
 
        setup_git_directory();
        int as_is = 0, all = 0, transform_stdin = 0;
 
        setup_git_directory();


@@ -184,9 +183,7 @@ int main(int argc, char **argv)
                if (cutoff > commit->date)
                        cutoff = commit->date;
 
                if (cutoff > commit->date)
                        cutoff = commit->date;
 

-               object_list_append((struct object *)commit, walker);
-               (*walker)->name = *argv;
-               walker = &((*walker)->next);
+               add_object_array((struct object *)commit, *argv, &revs);

        }
 
        for_each_ref(name_ref);
        }
 
        for_each_ref(name_ref);


@@ -243,9 +240,13 @@ int main(int argc, char **argv)
                        if (objs[i])
                                printf("%s %s\n", sha1_to_hex(objs[i]->sha1),
                                                get_rev_name(objs[i]));
                        if (objs[i])
                                printf("%s %s\n", sha1_to_hex(objs[i]->sha1),
                                                get_rev_name(objs[i]));

-       } else
-               for ( ; revs; revs = revs->next)
-                       printf("%s %s\n", revs->name, get_rev_name(revs->item));
+       } else {
+               int i;
+               for (i = 0; i < revs.nr; i++)
+                       printf("%s %s\n",
+                               revs.objects[i].name,
+                               get_rev_name(revs.objects[i].item));
+       }

 
        return 0;
 }
 
        return 0;
 }

diff --git a/object.c b/object.c
index e26e319ccd22e5c9e9125e58f9ed32620afd66b1..37784cee9a90a7e5b44dd660d6b7ea9191b59486 100644 (file)
--- a/object.c
+++ b/object.c
@@ -200,3 +200,20 @@ int object_list_contains(struct object_list *list, struct object *obj)
        }
        return 0;
 }
        }
        return 0;
 }

+
+void add_object_array(struct object *obj, const char *name, struct object_array *array)
+{
+       unsigned nr = array->nr;
+       unsigned alloc = array->alloc;
+       struct object_array_entry *objects = array->objects;
+
+       if (nr >= alloc) {
+               alloc = (alloc + 32) * 2;
+               objects = xrealloc(objects, alloc * sizeof(*objects));
+               array->alloc = alloc;
+               array->objects = objects;
+       }
+       objects[nr].item = obj;
+       objects[nr].name = name;
+       array->nr = ++nr;
+}

diff --git a/object.h b/object.h
index c537b4b72acabc8b2425ca9bb50c890e730aa788..6f23a9a18099cbc9fdc827f53843b1157dd10935 100644 (file)
--- a/object.h
+++ b/object.h
@@ -4,7 +4,6 @@
 struct object_list {
        struct object *item;
        struct object_list *next;
 struct object_list {
        struct object *item;
        struct object_list *next;

-       const char *name;

 };
 
 struct object_refs {
 };
 
 struct object_refs {


@@ -13,6 +12,15 @@ struct object_refs {
        struct object *ref[FLEX_ARRAY]; /* more */
 };
 
        struct object *ref[FLEX_ARRAY]; /* more */
 };
 

+struct object_array {
+       unsigned int nr;
+       unsigned int alloc;
+       struct object_array_entry {
+               struct object *item;
+               const char *name;
+       } *objects;
+};
+

 #define TYPE_BITS   3
 #define FLAG_BITS  27
 
 #define TYPE_BITS   3
 #define FLAG_BITS  27
 


@@ -72,4 +80,7 @@ unsigned object_list_length(struct object_list *list);
 
 int object_list_contains(struct object_list *list, struct object *obj);
 
 
 int object_list_contains(struct object_list *list, struct object *obj);
 

+/* Object array handling .. */
+void add_object_array(struct object *obj, const char *name, struct object_array *array);
+

 #endif /* OBJECT_H */
 #endif /* OBJECT_H */

diff --git a/revision.c b/revision.c
index 7bff2a10b1044651a776b42d4ee3d91661830aa2..b963f2adfd92050310f7327e1ee10e21d5996a7c 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -31,17 +31,12 @@ static char *path_name(struct name_path *path, const char *name)
        return n;
 }
 
        return n;
 }
 

-struct object_list **add_object(struct object *obj,
-                                      struct object_list **p,
-                                      struct name_path *path,
-                                      const char *name)
+void add_object(struct object *obj,
+               struct object_array *p,
+               struct name_path *path,
+               const char *name)

 {
 {

-       struct object_list *entry = xmalloc(sizeof(*entry));
-       entry->item = obj;
-       entry->next = *p;
-       entry->name = path_name(path, name);
-       *p = entry;
-       return &entry->next;
+       add_object_array(obj, path_name(path, name), p);

 }
 
 static void mark_blob_uninteresting(struct blob *blob)
 }
 
 static void mark_blob_uninteresting(struct blob *blob)


@@ -117,9 +112,9 @@ void mark_parents_uninteresting(struct commit *commit)
        }
 }
 
        }
 }
 

-static void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
+void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)

 {
 {

-       add_object(obj, &revs->pending_objects, NULL, name);
+       add_object_array(obj, name, &revs->pending);

 }
 
 static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
 }
 
 static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)


@@ -836,7 +831,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                object = get_reference(revs, arg, sha1, flags ^ local_flags);
                add_pending_object(revs, object, arg);
        }
                object = get_reference(revs, arg, sha1, flags ^ local_flags);
                add_pending_object(revs, object, arg);
        }

-       if (def && !revs->pending_objects) {
+       if (def && !revs->pending.nr) {

                unsigned char sha1[20];
                struct object *object;
                if (get_sha1(def, sha1))
                unsigned char sha1[20];
                struct object *object;
                if (get_sha1(def, sha1))


@@ -868,11 +863,13 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 
 void prepare_revision_walk(struct rev_info *revs)
 {
 
 void prepare_revision_walk(struct rev_info *revs)
 {

-       struct object_list *list;
+       int nr = revs->pending.nr;
+       struct object_array_entry *list = revs->pending.objects;

 
 

-       list = revs->pending_objects;
-       revs->pending_objects = NULL;
-       while (list) {
+       revs->pending.nr = 0;
+       revs->pending.alloc = 0;
+       revs->pending.objects = NULL;
+       while (--nr >= 0) {

                struct commit *commit = handle_commit(revs, list->item, list->name);
                if (commit) {
                        if (!(commit->object.flags & SEEN)) {
                struct commit *commit = handle_commit(revs, list->item, list->name);
                if (commit) {
                        if (!(commit->object.flags & SEEN)) {


@@ -880,7 +877,7 @@ void prepare_revision_walk(struct rev_info *revs)
                                insert_by_date(commit, &revs->commits);
                        }
                }
                                insert_by_date(commit, &revs->commits);
                        }
                }

-               list = list->next;
+               list++;

        }
 
        if (revs->no_walk)
        }
 
        if (revs->no_walk)

diff --git a/revision.h b/revision.h
index 4020e25c336356868057ee88e84b395f55b87b38..c010a0811604e55f4e46d08d986ae62edfb192ee 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -18,7 +18,7 @@ typedef void (prune_fn_t)(struct rev_info *revs, struct commit *commit);
 struct rev_info {
        /* Starting list */
        struct commit_list *commits;
 struct rev_info {
        /* Starting list */
        struct commit_list *commits;

-       struct object_list *pending_objects;
+       struct object_array pending;

 
        /* Basic information */
        const char *prefix;
 
        /* Basic information */
        const char *prefix;


@@ -99,9 +99,11 @@ struct name_path {
        const char *elem;
 };
 
        const char *elem;
 };
 

-extern struct object_list **add_object(struct object *obj,
-                                      struct object_list **p,
-                                      struct name_path *path,
-                                      const char *name);
+extern void add_object(struct object *obj,
+                      struct object_array *p,
+                      struct name_path *path,
+                      const char *name);
+
+extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);

 
 #endif
 
 #endif