diff options
Diffstat (limited to 'object.h')
| -rw-r--r-- | object.h | 77 |
1 files changed, 49 insertions, 28 deletions
@@ -4,55 +4,76 @@ struct object_list { struct object *item; struct object_list *next; - const char *name; }; -struct object_refs { - unsigned count; - 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; + unsigned mode; + } *objects; }; +#define OBJECT_ARRAY_INIT { 0, 0, NULL } + +#define TYPE_BITS 3 +#define FLAG_BITS 27 + +/* + * The object type is stored in 3 bits. + */ struct object { unsigned parsed : 1; unsigned used : 1; - unsigned int flags; + unsigned type : TYPE_BITS; + unsigned flags : FLAG_BITS; unsigned char sha1[20]; - const char *type; - struct object_refs *refs; - void *util; }; -extern int track_object_refs; -extern int obj_allocs; -extern struct object **objs; - -/** Internal only **/ +extern const char *typename(unsigned int type); +extern int type_from_string(const char *str); + +extern unsigned int get_max_object_index(void); +extern struct object *get_indexed_object(unsigned int); + +/* + * This can be used to see if we have heard of the object before, but + * it can return "yes we have, and here is a half-initialised object" + * for an object that we haven't loaded/parsed yet. + * + * When parsing a commit to create an in-core commit object, its + * parents list holds commit objects that represent its parents, but + * they are expected to be lazily initialized and do not know what + * their trees or parents are yet. When this function returns such a + * half-initialised objects, the caller is expected to initialize them + * by calling parse_object() on them. + */ 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); +extern void *create_object(const unsigned char *sha1, int type, void *obj); /** Returns the object, having parsed it to find out what it is. **/ struct object *parse_object(const unsigned char *sha1); +/* 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, enum object_type type, unsigned long size, void *buffer, int *eaten_p); + /** 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 *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); +void add_object_array_with_mode(struct object *obj, const char *name, struct object_array *array, unsigned mode); +void object_array_remove_duplicates(struct object_array *); + #endif /* OBJECT_H */ |