From: Jeff Hostetler <jeffhost@xxxxxxxxxxxxx>
Create helper class to extend oidmap to collect a list of
omitted or missing objects during traversal.
This will be used in a later commit by the list-object filtering
code.
Signed-off-by: Jeff Hostetler <jeffhost@xxxxxxxxxxxxx>
---
Makefile | 1 +
list-objects-filter-map.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++
list-objects-filter-map.h | 26 +++++++++++++++++++
3 files changed, 90 insertions(+)
create mode 100644 list-objects-filter-map.c
create mode 100644 list-objects-filter-map.h
diff --git a/Makefile b/Makefile
index cd75985..e59f12d 100644
--- a/Makefile
+++ b/Makefile
@@ -807,6 +807,7 @@ LIB_OBJS += levenshtein.o
LIB_OBJS += line-log.o
LIB_OBJS += line-range.o
LIB_OBJS += list-objects.o
+LIB_OBJS += list-objects-filter-map.o
LIB_OBJS += ll-merge.o
LIB_OBJS += lockfile.o
LIB_OBJS += log-tree.o
diff --git a/list-objects-filter-map.c b/list-objects-filter-map.c
new file mode 100644
index 0000000..7e496b3
--- /dev/null
+++ b/list-objects-filter-map.c
@@ -0,0 +1,63 @@
+#include "cache.h"
+#include "list-objects-filter-map.h"
+
+int list_objects_filter_map_insert(struct oidmap *map,
+ const struct object_id *oid,
+ const char *pathname, enum object_type type)
+{
+ size_t len, size;
+ struct list_objects_filter_map_entry *e;
+
+ if (oidmap_get(map, oid))
+ return 1;
+
+ len = ((pathname && *pathname) ? strlen(pathname) : 0);
+ size = (offsetof(struct list_objects_filter_map_entry, pathname) + len + 1);
+ e = xcalloc(1, size);
+
+ oidcpy(&e->entry.oid, oid);
+ e->type = type;
+ if (pathname && *pathname)
+ strcpy(e->pathname, pathname);
+
+ oidmap_put(map, e);
+ return 0;
+}
+
+static int my_cmp(const void *a, const void *b)
+{
+ const struct oidmap_entry *ea, *eb;
+
+ ea = *(const struct oidmap_entry **)a;
+ eb = *(const struct oidmap_entry **)b;
+
+ return oidcmp(&ea->oid, &eb->oid);
+}
+
+void list_objects_filter_map_foreach(struct oidmap *map,
+ list_objects_filter_map_foreach_cb cb,
+ void *cb_data)
+{
+ struct hashmap_iter iter;
+ struct list_objects_filter_map_entry **array;
+ struct list_objects_filter_map_entry *e;
+ int k, nr;
+
+ nr = hashmap_get_size(&map->map);
+ if (!nr)
+ return;
+
+ array = xcalloc(nr, sizeof(*e));
+
+ k = 0;
+ hashmap_iter_init(&map->map, &iter);
+ while ((e = hashmap_iter_next(&iter)))
+ array[k++] = e;
+
+ QSORT(array, nr, my_cmp);
+
+ for (k = 0; k < nr; k++)
+ cb(k, nr, array[k], cb_data);
+
+ free(array);
+}
diff --git a/list-objects-filter-map.h b/list-objects-filter-map.h
new file mode 100644
index 0000000..794fc81
--- /dev/null
+++ b/list-objects-filter-map.h
@@ -0,0 +1,26 @@
+#ifndef LIST_OBJECTS_FILTER_MAP_H
+#define LIST_OBJECTS_FILTER_MAP_H
+
+#include "oidmap.h"
+
+struct list_objects_filter_map_entry {
+ struct oidmap_entry entry; /* must be first */
+ enum object_type type;
+ char pathname[FLEX_ARRAY];
+};
+
+extern int list_objects_filter_map_insert(
+ struct oidmap *map,
+ const struct object_id *oid,
+ const char *pathname, enum object_type type);
+
+typedef void (*list_objects_filter_map_foreach_cb)(
+ int i, int i_limit,
+ struct list_objects_filter_map_entry *e, void *cb_data);
+
+extern void list_objects_filter_map_foreach(
+ struct oidmap *map,
+ list_objects_filter_map_foreach_cb cb,
+ void *cb_data);
+
+#endif /* LIST_OBJECTS_FILTER_MAP_H */
--
2.9.3
