2005-04-18 20:39:48 +02:00
|
|
|
#ifndef OBJECT_H
|
|
|
|
|
#define OBJECT_H
|
|
|
|
|
|
|
|
|
|
struct object_list {
|
|
|
|
|
struct object *item;
|
|
|
|
|
struct object_list *next;
|
|
|
|
|
};
|
|
|
|
|
|
2005-11-17 06:32:44 +01:00
|
|
|
struct object_refs {
|
|
|
|
|
unsigned count;
|
2006-06-18 20:45:02 +02:00
|
|
|
struct object *base;
|
2006-01-07 10:33:54 +01:00
|
|
|
struct object *ref[FLEX_ARRAY]; /* more */
|
2005-11-17 06:32:44 +01:00
|
|
|
};
|
|
|
|
|
|
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>
2006-06-20 02:42:35 +02:00
|
|
|
struct object_array {
|
|
|
|
|
unsigned int nr;
|
|
|
|
|
unsigned int alloc;
|
|
|
|
|
struct object_array_entry {
|
|
|
|
|
struct object *item;
|
|
|
|
|
const char *name;
|
|
|
|
|
} *objects;
|
|
|
|
|
};
|
|
|
|
|
|
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>
2006-06-15 01:45:13 +02:00
|
|
|
#define TYPE_BITS 3
|
|
|
|
|
#define FLAG_BITS 27
|
|
|
|
|
|
2006-07-12 05:45:31 +02:00
|
|
|
/*
|
|
|
|
|
* The object type is stored in 3 bits.
|
|
|
|
|
*/
|
2005-04-18 20:39:48 +02:00
|
|
|
struct object {
|
|
|
|
|
unsigned parsed : 1;
|
|
|
|
|
unsigned used : 1;
|
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>
2006-06-15 01:45:13 +02:00
|
|
|
unsigned type : TYPE_BITS;
|
|
|
|
|
unsigned flags : FLAG_BITS;
|
2005-04-18 20:39:48 +02:00
|
|
|
unsigned char sha1[20];
|
|
|
|
|
};
|
|
|
|
|
|
2005-09-16 23:55:33 +02:00
|
|
|
extern int track_object_refs;
|
2006-07-12 05:45:31 +02:00
|
|
|
extern const char *type_names[9];
|
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>
2006-06-15 01:45:13 +02:00
|
|
|
|
2006-06-30 06:38:55 +02:00
|
|
|
extern unsigned int get_max_object_index(void);
|
|
|
|
|
extern struct object *get_indexed_object(unsigned int);
|
|
|
|
|
|
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>
2006-06-15 01:45:13 +02:00
|
|
|
static inline const char *typename(unsigned int type)
|
|
|
|
|
{
|
2006-07-12 05:45:31 +02:00
|
|
|
return type_names[type > OBJ_BAD ? OBJ_BAD : type];
|
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>
2006-06-15 01:45:13 +02:00
|
|
|
}
|
2005-04-18 20:39:48 +02:00
|
|
|
|
2006-06-18 20:45:02 +02:00
|
|
|
extern struct object_refs *lookup_object_refs(struct object *);
|
|
|
|
|
|
2005-06-22 02:35:10 +02:00
|
|
|
/** Internal only **/
|
2005-06-03 17:05:39 +02:00
|
|
|
struct object *lookup_object(const unsigned char *sha1);
|
2005-04-18 20:39:48 +02:00
|
|
|
|
2005-06-22 02:35:10 +02:00
|
|
|
/** Returns the object, having looked it up as being the given type. **/
|
|
|
|
|
struct object *lookup_object_type(const unsigned char *sha1, const char *type);
|
|
|
|
|
|
2005-06-03 17:05:39 +02:00
|
|
|
void created_object(const unsigned char *sha1, struct object *obj);
|
2005-04-18 20:39:48 +02:00
|
|
|
|
2005-04-28 16:46:33 +02:00
|
|
|
/** Returns the object, having parsed it to find out what it is. **/
|
2005-06-03 17:05:39 +02:00
|
|
|
struct object *parse_object(const unsigned char *sha1);
|
2005-04-28 16:46:33 +02:00
|
|
|
|
2006-09-15 22:30:02 +02:00
|
|
|
/* Given the result of read_sha1_file(), returns the object after
|
|
|
|
|
* parsing it. eaten_p indicates if the object has a borrowed copy
|
|
|
|
|
* of buffer and the caller should not free() it.
|
|
|
|
|
*/
|
|
|
|
|
struct object *parse_object_buffer(const unsigned char *sha1, const char *type, unsigned long size, void *buffer, int *eaten_p);
|
|
|
|
|
|
2005-08-03 01:45:48 +02:00
|
|
|
/** Returns the object, with potentially excess memory allocated. **/
|
|
|
|
|
struct object *lookup_unknown_object(const unsigned char *sha1);
|
|
|
|
|
|
2005-11-17 06:32:44 +01:00
|
|
|
struct object_refs *alloc_object_refs(unsigned count);
|
|
|
|
|
void set_object_refs(struct object *obj, struct object_refs *refs);
|
2005-04-18 20:39:48 +02:00
|
|
|
|
|
|
|
|
void mark_reachable(struct object *obj, unsigned int mask);
|
|
|
|
|
|
2005-08-03 01:45:48 +02:00
|
|
|
struct object_list *object_list_insert(struct object *item,
|
|
|
|
|
struct object_list **list_p);
|
|
|
|
|
|
2005-09-05 08:04:18 +02:00
|
|
|
void object_list_append(struct object *item,
|
|
|
|
|
struct object_list **list_p);
|
|
|
|
|
|
2005-08-03 01:45:48 +02:00
|
|
|
unsigned object_list_length(struct object_list *list);
|
|
|
|
|
|
|
|
|
|
int object_list_contains(struct object_list *list, struct object *obj);
|
|
|
|
|
|
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>
2006-06-20 02:42:35 +02:00
|
|
|
/* Object array handling .. */
|
|
|
|
|
void add_object_array(struct object *obj, const char *name, struct object_array *array);
|
|
|
|
|
|
2005-04-18 20:39:48 +02:00
|
|
|
#endif /* OBJECT_H */
|