2006-01-07 09:33:54 +00:00
|
|
|
#include "cache.h"
|
2005-04-18 18:39:48 +00:00
|
|
|
#include "object.h"
|
2005-04-28 14:46:33 +00:00
|
|
|
#include "blob.h"
|
|
|
|
#include "tree.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "tag.h"
|
2005-04-18 18:39:48 +00:00
|
|
|
|
2006-06-30 18:20:33 +00:00
|
|
|
static struct object **obj_hash;
|
|
|
|
static int nr_objs, obj_hash_size;
|
2006-06-30 04:38:55 +00:00
|
|
|
|
|
|
|
unsigned int get_max_object_index(void)
|
|
|
|
{
|
2006-06-30 18:20:33 +00:00
|
|
|
return obj_hash_size;
|
2006-06-30 04:38:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
struct object *get_indexed_object(unsigned int idx)
|
|
|
|
{
|
2006-06-30 18:20:33 +00:00
|
|
|
return obj_hash[idx];
|
2006-06-30 04:38:55 +00:00
|
|
|
}
|
2005-04-18 18:39:48 +00:00
|
|
|
|
2007-02-26 19:55:58 +00:00
|
|
|
static const char *object_type_strings[] = {
|
|
|
|
NULL, /* OBJ_NONE = 0 */
|
|
|
|
"commit", /* OBJ_COMMIT = 1 */
|
|
|
|
"tree", /* OBJ_TREE = 2 */
|
|
|
|
"blob", /* OBJ_BLOB = 3 */
|
|
|
|
"tag", /* OBJ_TAG = 4 */
|
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-14 23:45:13 +00:00
|
|
|
};
|
|
|
|
|
2007-02-26 19:55:58 +00:00
|
|
|
const char *typename(unsigned int type)
|
|
|
|
{
|
|
|
|
if (type >= ARRAY_SIZE(object_type_strings))
|
|
|
|
return NULL;
|
|
|
|
return object_type_strings[type];
|
|
|
|
}
|
|
|
|
|
|
|
|
int type_from_string(const char *str)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 1; i < ARRAY_SIZE(object_type_strings); i++)
|
|
|
|
if (!strcmp(str, object_type_strings[i]))
|
|
|
|
return i;
|
|
|
|
die("invalid object type \"%s\"", str);
|
|
|
|
}
|
|
|
|
|
2006-06-30 18:20:33 +00:00
|
|
|
static unsigned int hash_obj(struct object *obj, unsigned int n)
|
|
|
|
{
|
|
|
|
unsigned int hash = *(unsigned int *)obj->sha1;
|
|
|
|
return hash % n;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void insert_obj_hash(struct object *obj, struct object **hash, unsigned int size)
|
|
|
|
{
|
|
|
|
int j = hash_obj(obj, size);
|
|
|
|
|
|
|
|
while (hash[j]) {
|
|
|
|
j++;
|
|
|
|
if (j >= size)
|
|
|
|
j = 0;
|
|
|
|
}
|
|
|
|
hash[j] = obj;
|
|
|
|
}
|
|
|
|
|
2006-02-12 01:57:57 +00:00
|
|
|
static int hashtable_index(const unsigned char *sha1)
|
|
|
|
{
|
2006-02-12 02:51:19 +00:00
|
|
|
unsigned int i;
|
|
|
|
memcpy(&i, sha1, sizeof(unsigned int));
|
2006-06-30 18:20:33 +00:00
|
|
|
return (int)(i % obj_hash_size);
|
2006-02-12 01:57:57 +00:00
|
|
|
}
|
|
|
|
|
2006-06-30 18:20:33 +00:00
|
|
|
struct object *lookup_object(const unsigned char *sha1)
|
2005-04-18 18:39:48 +00:00
|
|
|
{
|
2006-02-12 02:51:19 +00:00
|
|
|
int i;
|
2006-06-30 18:20:33 +00:00
|
|
|
struct object *obj;
|
2005-04-18 18:39:48 +00:00
|
|
|
|
2006-06-30 18:20:33 +00:00
|
|
|
if (!obj_hash)
|
|
|
|
return NULL;
|
2005-04-18 18:39:48 +00:00
|
|
|
|
2006-02-12 02:51:19 +00:00
|
|
|
i = hashtable_index(sha1);
|
2006-06-30 18:20:33 +00:00
|
|
|
while ((obj = obj_hash[i]) != NULL) {
|
2006-08-17 18:54:57 +00:00
|
|
|
if (!hashcmp(sha1, obj->sha1))
|
2006-06-30 18:20:33 +00:00
|
|
|
break;
|
2006-02-12 01:57:57 +00:00
|
|
|
i++;
|
2006-06-30 18:20:33 +00:00
|
|
|
if (i == obj_hash_size)
|
2006-02-12 01:57:57 +00:00
|
|
|
i = 0;
|
|
|
|
}
|
2006-06-30 18:20:33 +00:00
|
|
|
return obj;
|
2005-04-18 18:39:48 +00:00
|
|
|
}
|
|
|
|
|
2006-06-30 18:20:33 +00:00
|
|
|
static void grow_object_hash(void)
|
2005-04-18 18:39:48 +00:00
|
|
|
{
|
2006-06-30 18:20:33 +00:00
|
|
|
int i;
|
|
|
|
int new_hash_size = obj_hash_size < 32 ? 32 : 2 * obj_hash_size;
|
|
|
|
struct object **new_hash;
|
|
|
|
|
2006-08-28 00:26:07 +00:00
|
|
|
new_hash = xcalloc(new_hash_size, sizeof(struct object *));
|
2006-06-30 18:20:33 +00:00
|
|
|
for (i = 0; i < obj_hash_size; i++) {
|
|
|
|
struct object *obj = obj_hash[i];
|
|
|
|
if (!obj)
|
|
|
|
continue;
|
|
|
|
insert_obj_hash(obj, new_hash, new_hash_size);
|
|
|
|
}
|
|
|
|
free(obj_hash);
|
|
|
|
obj_hash = new_hash;
|
|
|
|
obj_hash_size = new_hash_size;
|
2005-04-18 18:39:48 +00:00
|
|
|
}
|
|
|
|
|
2005-06-03 15:05:39 +00:00
|
|
|
void created_object(const unsigned char *sha1, struct object *obj)
|
2005-04-18 18:39:48 +00:00
|
|
|
{
|
|
|
|
obj->parsed = 0;
|
|
|
|
obj->used = 0;
|
2006-07-12 03:45:31 +00:00
|
|
|
obj->type = OBJ_NONE;
|
2006-06-30 18:20:33 +00:00
|
|
|
obj->flags = 0;
|
2006-08-23 06:49:00 +00:00
|
|
|
hashcpy(obj->sha1, sha1);
|
2005-04-18 18:39:48 +00:00
|
|
|
|
2006-06-30 18:20:33 +00:00
|
|
|
if (obj_hash_size - 1 <= nr_objs * 2)
|
|
|
|
grow_object_hash();
|
2005-04-18 18:39:48 +00:00
|
|
|
|
2006-06-30 18:20:33 +00:00
|
|
|
insert_obj_hash(obj, obj_hash, obj_hash_size);
|
2005-04-18 18:39:48 +00:00
|
|
|
nr_objs++;
|
|
|
|
}
|
|
|
|
|
2005-08-02 23:45:48 +00:00
|
|
|
union any_object {
|
|
|
|
struct object object;
|
|
|
|
struct commit commit;
|
|
|
|
struct tree tree;
|
|
|
|
struct blob blob;
|
|
|
|
struct tag tag;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct object *lookup_unknown_object(const unsigned char *sha1)
|
|
|
|
{
|
|
|
|
struct object *obj = lookup_object(sha1);
|
|
|
|
if (!obj) {
|
2006-04-03 18:30:46 +00:00
|
|
|
union any_object *ret = xcalloc(1, sizeof(*ret));
|
2005-08-02 23:45:48 +00:00
|
|
|
created_object(sha1, &ret->object);
|
2006-07-12 03:45:31 +00:00
|
|
|
ret->object.type = OBJ_NONE;
|
2005-08-02 23:45:48 +00:00
|
|
|
return &ret->object;
|
|
|
|
}
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
2007-02-26 19:55:59 +00:00
|
|
|
struct object *parse_object_buffer(const unsigned char *sha1, enum object_type type, unsigned long size, void *buffer, int *eaten_p)
|
2006-09-15 20:30:02 +00:00
|
|
|
{
|
|
|
|
struct object *obj;
|
|
|
|
int eaten = 0;
|
|
|
|
|
2007-02-26 19:55:59 +00:00
|
|
|
if (type == OBJ_BLOB) {
|
2006-09-15 20:30:02 +00:00
|
|
|
struct blob *blob = lookup_blob(sha1);
|
|
|
|
parse_blob_buffer(blob, buffer, size);
|
|
|
|
obj = &blob->object;
|
2007-02-26 19:55:59 +00:00
|
|
|
} else if (type == OBJ_TREE) {
|
2006-09-15 20:30:02 +00:00
|
|
|
struct tree *tree = lookup_tree(sha1);
|
|
|
|
obj = &tree->object;
|
|
|
|
if (!tree->object.parsed) {
|
|
|
|
parse_tree_buffer(tree, buffer, size);
|
|
|
|
eaten = 1;
|
|
|
|
}
|
2007-02-26 19:55:59 +00:00
|
|
|
} else if (type == OBJ_COMMIT) {
|
2006-09-15 20:30:02 +00:00
|
|
|
struct commit *commit = lookup_commit(sha1);
|
|
|
|
parse_commit_buffer(commit, buffer, size);
|
|
|
|
if (!commit->buffer) {
|
|
|
|
commit->buffer = buffer;
|
|
|
|
eaten = 1;
|
|
|
|
}
|
|
|
|
obj = &commit->object;
|
2007-02-26 19:55:59 +00:00
|
|
|
} else if (type == OBJ_TAG) {
|
2006-09-15 20:30:02 +00:00
|
|
|
struct tag *tag = lookup_tag(sha1);
|
|
|
|
parse_tag_buffer(tag, buffer, size);
|
|
|
|
obj = &tag->object;
|
|
|
|
} else {
|
|
|
|
obj = NULL;
|
|
|
|
}
|
|
|
|
*eaten_p = eaten;
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
2005-06-03 15:05:39 +00:00
|
|
|
struct object *parse_object(const unsigned char *sha1)
|
2005-04-28 14:46:33 +00:00
|
|
|
{
|
2005-06-27 10:33:33 +00:00
|
|
|
unsigned long size;
|
2007-02-26 19:55:59 +00:00
|
|
|
enum object_type type;
|
2006-09-15 20:30:02 +00:00
|
|
|
int eaten;
|
2007-02-26 19:55:59 +00:00
|
|
|
void *buffer = read_sha1_file(sha1, &type, &size);
|
2006-09-15 20:30:02 +00:00
|
|
|
|
2005-06-27 10:33:33 +00:00
|
|
|
if (buffer) {
|
2005-05-06 17:48:34 +00:00
|
|
|
struct object *obj;
|
2007-02-26 19:55:59 +00:00
|
|
|
if (check_sha1_signature(sha1, buffer, size, typename(type)) < 0)
|
2005-04-28 14:46:33 +00:00
|
|
|
printf("sha1 mismatch %s\n", sha1_to_hex(sha1));
|
2006-09-15 20:30:02 +00:00
|
|
|
|
|
|
|
obj = parse_object_buffer(sha1, type, size, buffer, &eaten);
|
|
|
|
if (!eaten)
|
|
|
|
free(buffer);
|
2005-05-06 17:48:34 +00:00
|
|
|
return obj;
|
2005-04-28 14:46:33 +00:00
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
2005-08-02 23:45:48 +00:00
|
|
|
|
|
|
|
struct object_list *object_list_insert(struct object *item,
|
|
|
|
struct object_list **list_p)
|
|
|
|
{
|
|
|
|
struct object_list *new_list = xmalloc(sizeof(struct object_list));
|
|
|
|
new_list->item = item;
|
|
|
|
new_list->next = *list_p;
|
|
|
|
*list_p = new_list;
|
|
|
|
return new_list;
|
|
|
|
}
|
|
|
|
|
2005-09-05 06:04:18 +00:00
|
|
|
void object_list_append(struct object *item,
|
|
|
|
struct object_list **list_p)
|
|
|
|
{
|
|
|
|
while (*list_p) {
|
|
|
|
list_p = &((*list_p)->next);
|
|
|
|
}
|
|
|
|
*list_p = xmalloc(sizeof(struct object_list));
|
|
|
|
(*list_p)->next = NULL;
|
|
|
|
(*list_p)->item = item;
|
|
|
|
}
|
|
|
|
|
2005-08-02 23:45:48 +00:00
|
|
|
unsigned object_list_length(struct object_list *list)
|
|
|
|
{
|
|
|
|
unsigned ret = 0;
|
|
|
|
while (list) {
|
|
|
|
list = list->next;
|
|
|
|
ret++;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int object_list_contains(struct object_list *list, struct object *obj)
|
|
|
|
{
|
|
|
|
while (list) {
|
|
|
|
if (list->item == obj)
|
|
|
|
return 1;
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
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 00:42:35 +00:00
|
|
|
|
|
|
|
void add_object_array(struct object *obj, const char *name, struct object_array *array)
|
|
|
|
{
|
|
|
|
unsigned nr = array->nr;
|
|
|
|
unsigned alloc = array->alloc;
|
|
|
|
struct object_array_entry *objects = array->objects;
|
|
|
|
|
|
|
|
if (nr >= alloc) {
|
|
|
|
alloc = (alloc + 32) * 2;
|
|
|
|
objects = xrealloc(objects, alloc * sizeof(*objects));
|
|
|
|
array->alloc = alloc;
|
|
|
|
array->objects = objects;
|
|
|
|
}
|
|
|
|
objects[nr].item = obj;
|
|
|
|
objects[nr].name = name;
|
|
|
|
array->nr = ++nr;
|
|
|
|
}
|