Merge branch 'jc/triangle-push-fixup'

diff --git a/object.c b/object.c
index 20703f52ed24aa227d451bec332ac73cc3d49d3a..cbc7333a7ec083556ba9b46e1adafb695f83e0af 100644 (file)
--- a/object.c
+++ b/object.c
@@ -71,13 +71,13 @@ static unsigned int hashtable_index(const unsigned char *sha1)
 
 struct object *lookup_object(const unsigned char *sha1)
 {
-       unsigned int i;
+       unsigned int i, first;
        struct object *obj;
 
        if (!obj_hash)
                return NULL;
 
-       i = hashtable_index(sha1);
+       first = i = hashtable_index(sha1);
        while ((obj = obj_hash[i]) != NULL) {
                if (!hashcmp(sha1, obj->sha1))
                        break;
@@ -85,6 +85,16 @@ struct object *lookup_object(const unsigned char *sha1)
                if (i == obj_hash_size)
                        i = 0;
        }
+       if (obj && i != first) {
+               /*
+                * Move object to where we started to look for it so
+                * that we do not need to walk the hash table the next
+                * time we look for it.
+                */
+               struct object *tmp = obj_hash[i];
+               obj_hash[i] = obj_hash[first];
+               obj_hash[first] = tmp;
+       }
        return obj;
 }
 
@@ -260,11 +270,18 @@ void add_object_array(struct object *obj, const char *name, struct object_array
        add_object_array_with_mode(obj, name, array, S_IFINVALID);
 }
 
+/*
+ * A zero-length string to which object_array_entry::name can be
+ * initialized without requiring a malloc/free.
+ */
+static char object_array_slopbuf[1];
+
 void add_object_array_with_mode(struct object *obj, const char *name, struct object_array *array, unsigned mode)
 {
        unsigned nr = array->nr;
        unsigned alloc = array->alloc;
        struct object_array_entry *objects = array->objects;
+       struct object_array_entry *entry;
 
        if (nr >= alloc) {
                alloc = (alloc + 32) * 2;
@@ -272,28 +289,67 @@ void add_object_array_with_mode(struct object *obj, const char *name, struct obj
                array->alloc = alloc;
                array->objects = objects;
        }
-       objects[nr].item = obj;
-       objects[nr].name = name;
-       objects[nr].mode = mode;
+       entry = &objects[nr];
+       entry->item = obj;
+       if (!name)
+               entry->name = NULL;
+       else if (!*name)
+               /* Use our own empty string instead of allocating one: */
+               entry->name = object_array_slopbuf;
+       else
+               entry->name = xstrdup(name);
+       entry->mode = mode;
        array->nr = ++nr;
 }
 
-void object_array_remove_duplicates(struct object_array *array)
+void object_array_filter(struct object_array *array,
+                        object_array_each_func_t want, void *cb_data)
 {
-       unsigned int ref, src, dst;
+       unsigned nr = array->nr, src, dst;
        struct object_array_entry *objects = array->objects;
 
-       for (ref = 0; ref + 1 < array->nr; ref++) {
-               for (src = ref + 1, dst = src;
-                    src < array->nr;
-                    src++) {
-                       if (!strcmp(objects[ref].name, objects[src].name))
-                               continue;
+       for (src = dst = 0; src < nr; src++) {
+               if (want(&objects[src], cb_data)) {
                        if (src != dst)
                                objects[dst] = objects[src];
                        dst++;
+               } else {
+                       if (objects[src].name != object_array_slopbuf)
+                               free(objects[src].name);
+               }
+       }
+       array->nr = dst;
+}
+
+/*
+ * Return true iff array already contains an entry with name.
+ */
+static int contains_name(struct object_array *array, const char *name)
+{
+       unsigned nr = array->nr, i;
+       struct object_array_entry *object = array->objects;
+
+       for (i = 0; i < nr; i++, object++)
+               if (!strcmp(object->name, name))
+                       return 1;
+       return 0;
+}
+
+void object_array_remove_duplicates(struct object_array *array)
+{
+       unsigned nr = array->nr, src;
+       struct object_array_entry *objects = array->objects;
+
+       array->nr = 0;
+       for (src = 0; src < nr; src++) {
+               if (!contains_name(array, objects[src].name)) {
+                       if (src != array->nr)
+                               objects[array->nr] = objects[src];
+                       array->nr++;
+               } else {
+                       if (objects[src].name != object_array_slopbuf)
+                               free(objects[src].name);
                }
-               array->nr = dst;
        }
 }