2005-04-19 02:39:48 +08:00
|
|
|
#ifndef OBJECT_H
|
|
|
|
|
#define OBJECT_H
|
|
|
|
|
|
|
|
|
|
struct object_list {
|
|
|
|
|
struct object *item;
|
|
|
|
|
struct object_list *next;
|
|
|
|
|
};
|
|
|
|
|
|
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 08:42:35 +08:00
|
|
|
struct object_array {
|
|
|
|
|
unsigned int nr;
|
|
|
|
|
unsigned int alloc;
|
|
|
|
|
struct object_array_entry {
|
|
|
|
|
struct object *item;
|
object_array_entry: fix memory handling of the name field
Previously, the memory management of the object_array_entry::name
field was inconsistent and undocumented. object_array_entries are
ultimately created by a single function, add_object_array_with_mode(),
which has an argument "const char *name". This function used to
simply set the name field to reference the string pointed to by the
name parameter, and nobody on the object_array side ever freed the
memory. Thus, it assumed that the memory for the name field would be
managed by the caller, and that the lifetime of that string would be
at least as long as the lifetime of the object_array_entry. But
callers were inconsistent:
* Some passed pointers to constant strings or argv entries, which was
OK.
* Some passed pointers to newly-allocated memory, but didn't arrange
for the memory ever to be freed.
* Some passed the return value of sha1_to_hex(), which is a pointer to
a statically-allocated buffer that can be overwritten at any time.
* Some passed pointers to refnames that they received from a
for_each_ref()-type iteration, but the lifetimes of such refnames is
not guaranteed by the refs API.
Bring consistency to this mess by changing object_array to make its
own copy for the object_array_entry::name field and free this memory
when an object_array_entry is deleted from the array.
Many callers were passing the empty string as the name parameter, so
as a performance optimization, treat the empty string specially.
Instead of making a copy, store a pointer to a statically-allocated
empty string to object_array_entry::name. When deleting such an
entry, skip the free().
Change the callers that were already passing copies to
add_object_array_with_mode() to either skip the copy, or (if the
memory needed to be allocated anyway) freeing the memory itself.
A part of this commit effectively reverts
70d26c6e76 read_revisions_from_stdin: make copies for handle_revision_arg
because the copying introduced by that commit (which is still
necessary) is now done at a deeper level.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-05-25 17:08:14 +08:00
|
|
|
/*
|
|
|
|
|
* name or NULL. If non-NULL, the memory pointed to
|
|
|
|
|
* is owned by this object *except* if it points at
|
|
|
|
|
* object_array_slopbuf, which is a static copy of the
|
|
|
|
|
* empty string.
|
|
|
|
|
*/
|
|
|
|
|
char *name;
|
2007-04-23 00:43:58 +08:00
|
|
|
unsigned mode;
|
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 08:42:35 +08:00
|
|
|
} *objects;
|
|
|
|
|
};
|
|
|
|
|
|
2010-08-29 10:04:17 +08:00
|
|
|
#define OBJECT_ARRAY_INIT { 0, 0, NULL }
|
|
|
|
|
|
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 07:45:13 +08:00
|
|
|
#define TYPE_BITS 3
|
|
|
|
|
#define FLAG_BITS 27
|
|
|
|
|
|
2006-07-12 11:45:31 +08:00
|
|
|
/*
|
|
|
|
|
* The object type is stored in 3 bits.
|
|
|
|
|
*/
|
2005-04-19 02:39:48 +08: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 07:45:13 +08:00
|
|
|
unsigned type : TYPE_BITS;
|
|
|
|
|
unsigned flags : FLAG_BITS;
|
2005-04-19 02:39:48 +08:00
|
|
|
unsigned char sha1[20];
|
|
|
|
|
};
|
|
|
|
|
|
2007-02-27 03:55:58 +08:00
|
|
|
extern const char *typename(unsigned int type);
|
|
|
|
|
extern int type_from_string(const char *str);
|
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 07:45:13 +08:00
|
|
|
|
2006-06-30 12:38:55 +08:00
|
|
|
extern unsigned int get_max_object_index(void);
|
|
|
|
|
extern struct object *get_indexed_object(unsigned int);
|
2006-06-19 02:45:02 +08:00
|
|
|
|
2008-09-11 03:22:35 +08:00
|
|
|
/*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
2005-06-03 23:05:39 +08:00
|
|
|
struct object *lookup_object(const unsigned char *sha1);
|
2005-04-19 02:39:48 +08:00
|
|
|
|
2007-04-17 13:11:43 +08:00
|
|
|
extern void *create_object(const unsigned char *sha1, int type, void *obj);
|
2005-04-19 02:39:48 +08:00
|
|
|
|
2013-03-17 16:22:36 +08:00
|
|
|
/*
|
|
|
|
|
* Returns the object, having parsed it to find out what it is.
|
|
|
|
|
*
|
|
|
|
|
* Returns NULL if the object is missing or corrupt.
|
|
|
|
|
*/
|
2005-06-03 23:05:39 +08:00
|
|
|
struct object *parse_object(const unsigned char *sha1);
|
2005-04-28 22:46:33 +08:00
|
|
|
|
2013-03-17 16:22:36 +08:00
|
|
|
/*
|
|
|
|
|
* Like parse_object, but will die() instead of returning NULL. If the
|
|
|
|
|
* "name" parameter is not NULL, it is included in the error message
|
|
|
|
|
* (otherwise, the sha1 hex is given).
|
|
|
|
|
*/
|
|
|
|
|
struct object *parse_object_or_die(const unsigned char *sha1, const char *name);
|
|
|
|
|
|
2006-09-16 04:30:02 +08: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.
|
|
|
|
|
*/
|
2007-02-27 03:55:59 +08:00
|
|
|
struct object *parse_object_buffer(const unsigned char *sha1, enum object_type type, unsigned long size, void *buffer, int *eaten_p);
|
2006-09-16 04:30:02 +08:00
|
|
|
|
2005-08-03 07:45:48 +08:00
|
|
|
/** Returns the object, with potentially excess memory allocated. **/
|
|
|
|
|
struct object *lookup_unknown_object(const unsigned char *sha1);
|
|
|
|
|
|
2007-06-07 15:04:01 +08:00
|
|
|
struct object_list *object_list_insert(struct object *item,
|
2005-08-03 07:45:48 +08:00
|
|
|
struct object_list **list_p);
|
|
|
|
|
|
|
|
|
|
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 08:42:35 +08:00
|
|
|
/* Object array handling .. */
|
|
|
|
|
void add_object_array(struct object *obj, const char *name, struct object_array *array);
|
2007-04-23 00:43:58 +08:00
|
|
|
void add_object_array_with_mode(struct object *obj, const char *name, struct object_array *array, unsigned mode);
|
2013-05-25 17:08:08 +08:00
|
|
|
|
|
|
|
|
typedef int (*object_array_each_func_t)(struct object_array_entry *, void *);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Apply want to each entry in array, retaining only the entries for
|
|
|
|
|
* which the function returns true. Preserve the order of the entries
|
|
|
|
|
* that are retained.
|
|
|
|
|
*/
|
|
|
|
|
void object_array_filter(struct object_array *array,
|
|
|
|
|
object_array_each_func_t want, void *cb_data);
|
|
|
|
|
|
2013-05-25 17:08:10 +08:00
|
|
|
/*
|
|
|
|
|
* Remove from array all but the first entry with a given name.
|
|
|
|
|
* Warning: this function uses an O(N^2) algorithm.
|
|
|
|
|
*/
|
|
|
|
|
void object_array_remove_duplicates(struct object_array *array);
|
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 08:42:35 +08:00
|
|
|
|
2012-03-29 15:21:21 +08:00
|
|
|
void clear_object_flags(unsigned flags);
|
|
|
|
|
|
2005-04-19 02:39:48 +08:00
|
|
|
#endif /* OBJECT_H */
|
