mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
1f1e895fcc
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>
87 lines
2.1 KiB
C
87 lines
2.1 KiB
C
#ifndef OBJECT_H
|
|
#define OBJECT_H
|
|
|
|
struct object_list {
|
|
struct object *item;
|
|
struct object_list *next;
|
|
};
|
|
|
|
struct object_refs {
|
|
unsigned count;
|
|
struct object *base;
|
|
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_NONE 0
|
|
#define TYPE_BLOB 1
|
|
#define TYPE_TREE 2
|
|
#define TYPE_COMMIT 3
|
|
#define TYPE_TAG 4
|
|
#define TYPE_BAD 5
|
|
|
|
struct object {
|
|
unsigned parsed : 1;
|
|
unsigned used : 1;
|
|
unsigned type : TYPE_BITS;
|
|
unsigned flags : FLAG_BITS;
|
|
unsigned char sha1[20];
|
|
};
|
|
|
|
extern int track_object_refs;
|
|
extern int obj_allocs;
|
|
extern struct object **objs;
|
|
extern const char *type_names[];
|
|
|
|
static inline const char *typename(unsigned int type)
|
|
{
|
|
return type_names[type > TYPE_TAG ? TYPE_BAD : type];
|
|
}
|
|
|
|
extern struct object_refs *lookup_object_refs(struct object *);
|
|
|
|
/** Internal only **/
|
|
struct object *lookup_object(const unsigned char *sha1);
|
|
|
|
/** Returns the object, having looked it up as being the given type. **/
|
|
struct object *lookup_object_type(const unsigned char *sha1, const char *type);
|
|
|
|
void created_object(const unsigned char *sha1, struct object *obj);
|
|
|
|
/** Returns the object, having parsed it to find out what it is. **/
|
|
struct object *parse_object(const unsigned char *sha1);
|
|
|
|
/** Returns the object, with potentially excess memory allocated. **/
|
|
struct object *lookup_unknown_object(const unsigned char *sha1);
|
|
|
|
struct object_refs *alloc_object_refs(unsigned count);
|
|
void set_object_refs(struct object *obj, struct object_refs *refs);
|
|
|
|
void mark_reachable(struct object *obj, unsigned int mask);
|
|
|
|
struct object_list *object_list_insert(struct object *item,
|
|
struct object_list **list_p);
|
|
|
|
void object_list_append(struct object *item,
|
|
struct object_list **list_p);
|
|
|
|
unsigned object_list_length(struct object_list *list);
|
|
|
|
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 */
|