![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/object.c b/object.c
index 3259862ab2eeeb3adcd52c24c801fd4d4e3212b7..b5d8ed467d1c10c2f2dd596717159f7ee48a8007 100644 (file)
--- a/object.c
+++ b/object.c
#include "commit.h"
#include "tag.h"
-struct object **objs;
-static int nr_objs;
-int obj_allocs;
+static struct object **obj_hash;
+static int nr_objs, obj_hash_size;
-int track_object_refs = 1;
-
-static int hashtable_index(const unsigned char *sha1)
+unsigned int get_max_object_index(void)
{
- unsigned int i = *(unsigned int *)sha1;
- return (int)(i % obj_allocs);
+ return obj_hash_size;
}
-static int find_object(const unsigned char *sha1)
+struct object *get_indexed_object(unsigned int idx)
{
- int i = hashtable_index(sha1);
-
- if (!objs)
- return -1;
-
- while (objs[i]) {
- if (memcmp(sha1, objs[i]->sha1, 20) == 0)
- return i;
- i++;
- if (i == obj_allocs)
- i = 0;
- }
- return -1 - i;
+ return obj_hash[idx];
}
-struct object *lookup_object(const unsigned char *sha1)
+const char *type_names[] = {
+ "none", "commit", "tree", "blob", "tag",
+ "bad type 5", "bad type 6", "delta", "bad",
+};
+
+static unsigned int hash_obj(struct object *obj, unsigned int n)
{
- int pos = find_object(sha1);
- if (pos >= 0)
- return objs[pos];
- return NULL;
+ unsigned int hash = *(unsigned int *)obj->sha1;
+ return hash % n;
}
-void created_object(const unsigned char *sha1, struct object *obj)
+static void insert_obj_hash(struct object *obj, struct object **hash, unsigned int size)
{
- int pos;
+ int j = hash_obj(obj, size);
- obj->parsed = 0;
- memcpy(obj->sha1, sha1, 20);
- obj->type = NULL;
- obj->refs = NULL;
- obj->used = 0;
-
- if (obj_allocs - 1 <= nr_objs * 2) {
- int i, count = obj_allocs;
- obj_allocs = (obj_allocs < 32 ? 32 : 2 * obj_allocs);
- objs = xrealloc(objs, obj_allocs * sizeof(struct object *));
- memset(objs + count, 0, (obj_allocs - count)
- * sizeof(struct object *));
- for (i = 0; i < count; i++)
- if (objs[i]) {
- int j = find_object(objs[i]->sha1);
- if (j != i) {
- j = -1 - j;
- objs[j] = objs[i];
- objs[i] = NULL;
- }
- }
+ while (hash[j]) {
+ j++;
+ if (j >= size)
+ j = 0;
}
-
- pos = find_object(sha1);
- if (pos >= 0)
- die("Inserting %s twice\n", sha1_to_hex(sha1));
- pos = -pos-1;
-
- objs[pos] = obj;
- nr_objs++;
+ hash[j] = obj;
}
-struct object_refs *alloc_object_refs(unsigned count)
+static int hashtable_index(const unsigned char *sha1)
{
- struct object_refs *refs;
- size_t size = sizeof(*refs) + count*sizeof(struct object *);
-
- refs = xmalloc(size);
- memset(refs, 0, size);
- refs->count = count;
- return refs;
+ unsigned int i;
+ memcpy(&i, sha1, sizeof(unsigned int));
+ return (int)(i % obj_hash_size);
}
-static int compare_object_pointers(const void *a, const void *b)
+struct object *lookup_object(const unsigned char *sha1)
{
- const struct object * const *pa = a;
- const struct object * const *pb = b;
- if (*pa == *pb)
- return 0;
- else if (*pa < *pb)
- return -1;
- else
- return 1;
-}
+ int i;
+ struct object *obj;
-void set_object_refs(struct object *obj, struct object_refs *refs)
-{
- unsigned int i, j;
+ if (!obj_hash)
+ return NULL;
- /* Do not install empty list of references */
- if (refs->count < 1) {
- free(refs);
- return;
+ i = hashtable_index(sha1);
+ while ((obj = obj_hash[i]) != NULL) {
+ if (!memcmp(sha1, obj->sha1, 20))
+ break;
+ i++;
+ if (i == obj_hash_size)
+ i = 0;
}
+ return obj;
+}
- /* Sort the list and filter out duplicates */
- qsort(refs->ref, refs->count, sizeof(refs->ref[0]),
- compare_object_pointers);
- for (i = j = 1; i < refs->count; i++) {
- if (refs->ref[i] != refs->ref[i - 1])
- refs->ref[j++] = refs->ref[i];
- }
- if (j < refs->count) {
- /* Duplicates were found - reallocate list */
- size_t size = sizeof(*refs) + j*sizeof(struct object *);
- refs->count = j;
- refs = xrealloc(refs, size);
+static void grow_object_hash(void)
+{
+ int i;
+ int new_hash_size = obj_hash_size < 32 ? 32 : 2 * obj_hash_size;
+ struct object **new_hash;
+
+ new_hash = calloc(new_hash_size, sizeof(struct object *));
+ 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);
}
-
- for (i = 0; i < refs->count; i++)
- refs->ref[i]->used = 1;
- obj->refs = refs;
+ free(obj_hash);
+ obj_hash = new_hash;
+ obj_hash_size = new_hash_size;
}
-void mark_reachable(struct object *obj, unsigned int mask)
+void created_object(const unsigned char *sha1, struct object *obj)
{
- if (!track_object_refs)
- die("cannot do reachability with object refs turned off");
- /* If we've been here already, don't bother */
- if (obj->flags & mask)
- return;
- obj->flags |= mask;
- if (obj->refs) {
- const struct object_refs *refs = obj->refs;
- unsigned i;
- for (i = 0; i < refs->count; i++)
- mark_reachable(refs->ref[i], mask);
- }
+ obj->parsed = 0;
+ obj->used = 0;
+ obj->type = OBJ_NONE;
+ obj->flags = 0;
+ memcpy(obj->sha1, sha1, 20);
+
+ if (obj_hash_size - 1 <= nr_objs * 2)
+ grow_object_hash();
+
+ insert_obj_hash(obj, obj_hash, obj_hash_size);
+ nr_objs++;
}
struct object *lookup_object_type(const unsigned char *sha1, const char *type)
{
struct object *obj = lookup_object(sha1);
if (!obj) {
- union any_object *ret = xmalloc(sizeof(*ret));
- memset(ret, 0, sizeof(*ret));
+ union any_object *ret = xcalloc(1, sizeof(*ret));
created_object(sha1, &ret->object);
- ret->object.type = NULL;
+ ret->object.type = OBJ_NONE;
return &ret->object;
}
return obj;
struct object *obj;
if (check_sha1_signature(sha1, buffer, size, type) < 0)
printf("sha1 mismatch %s\n", sha1_to_hex(sha1));
- if (!strcmp(type, "blob")) {
+ if (!strcmp(type, blob_type)) {
struct blob *blob = lookup_blob(sha1);
parse_blob_buffer(blob, buffer, size);
obj = &blob->object;
- } else if (!strcmp(type, "tree")) {
+ } else if (!strcmp(type, tree_type)) {
struct tree *tree = lookup_tree(sha1);
- parse_tree_buffer(tree, buffer, size);
obj = &tree->object;
- } else if (!strcmp(type, "commit")) {
+ if (!tree->object.parsed) {
+ parse_tree_buffer(tree, buffer, size);
+ buffer = NULL;
+ }
+ } else if (!strcmp(type, commit_type)) {
struct commit *commit = lookup_commit(sha1);
parse_commit_buffer(commit, buffer, size);
if (!commit->buffer) {
buffer = NULL;
}
obj = &commit->object;
- } else if (!strcmp(type, "tag")) {
+ } else if (!strcmp(type, tag_type)) {
struct tag *tag = lookup_tag(sha1);
parse_tag_buffer(tag, buffer, size);
obj = &tag->object;
}
return 0;
}
+
+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;
+}