diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2006-06-14 16:45:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-17 18:49:18 -0700 |
| commit | 885a86abe2e9f7b96a4e2012183c6751635840aa (patch) | |
| tree | b3fc0545d874cf62bee7e02ae1673722e434f8ad /revision.c | |
| parent | 210a0be504829bad5a2821488d3c25cc406fed4a (diff) | |
| download | git-885a86abe2e9f7b96a4e2012183c6751635840aa.tar.gz git-885a86abe2e9f7b96a4e2012183c6751635840aa.tar.xz | |
Shrink "struct object" a bit
This shrinks "struct object" by a small amount, by getting rid of the
"struct type *" pointer and replacing it with a 3-bit bitfield instead.
In addition, we merge the bitfields and the "flags" field, which
incidentally should also remove a useless 4-byte padding from the object
when in 64-bit mode.
Now, our "struct object" is still too damn large, but it's now less
obviously bloated, and of the remaining fields, only the "util" (which is
not used by most things) is clearly something that should be eventually
discarded.
This shrinks the "git-rev-list --all" memory use by about 2.5% on the
kernel archive (and, perhaps more importantly, on the larger mozilla
archive). That may not sound like much, but I suspect it's more on a
64-bit platform.
There are other remaining inefficiencies (the parent lists, for example,
probably have horrible malloc overhead), but this was pretty obvious.
Most of the patch is just changing the comparison of the "type" pointer
from one of the constant string pointers to the appropriate new TYPE_xxx
small integer constant.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/revision.c b/revision.c index 75c648c13..82214eb71 100644 --- a/revision.c +++ b/revision.c @@ -140,7 +140,7 @@ static struct commit *handle_commit(struct rev_info *revs, struct object *object /* * Tag object? Look what it points to.. */ - while (object->type == tag_type) { + while (object->type == TYPE_TAG) { struct tag *tag = (struct tag *) object; if (revs->tag_objects && !(flags & UNINTERESTING)) add_pending_object(revs, object, tag->tag); @@ -153,7 +153,7 @@ static struct commit *handle_commit(struct rev_info *revs, struct object *object * Commit object? Just return it, we'll do all the complex * reachability crud. */ - if (object->type == commit_type) { + if (object->type == TYPE_COMMIT) { struct commit *commit = (struct commit *)object; if (parse_commit(commit) < 0) die("unable to parse commit %s", name); @@ -169,7 +169,7 @@ static struct commit *handle_commit(struct rev_info *revs, struct object *object * Tree object? Either mark it uniniteresting, or add it * to the list of objects to look at later.. */ - if (object->type == tree_type) { + if (object->type == TYPE_TREE) { struct tree *tree = (struct tree *)object; if (!revs->tree_objects) return NULL; @@ -184,7 +184,7 @@ static struct commit *handle_commit(struct rev_info *revs, struct object *object /* * Blob object? You know the drill by now.. */ - if (object->type == blob_type) { + if (object->type == TYPE_BLOB) { struct blob *blob = (struct blob *)object; if (!revs->blob_objects) return NULL; @@ -498,11 +498,11 @@ static int add_parents_only(struct rev_info *revs, const char *arg, int flags) return 0; while (1) { it = get_reference(revs, arg, sha1, 0); - if (strcmp(it->type, tag_type)) + if (it->type != TYPE_TAG) break; memcpy(sha1, ((struct tag*)it)->tagged->sha1, 20); } - if (strcmp(it->type, commit_type)) + if (it->type != TYPE_COMMIT) return 0; commit = (struct commit *)it; for (parents = commit->parents; parents; parents = parents->next) { |