From 9e6fabde82e91366a7fea5a81e795d26bbe7e10d Mon Sep 17 00:00:00 2001 From: Jonathan Tan Date: Fri, 29 Sep 2017 15:54:22 -0700 Subject: oidmap: map with OID as key This is similar to using the hashmap in hashmap.c, but with an easier-to-use API. In particular, custom entry comparisons no longer need to be written, and lookups can be done without constructing a temporary entry structure. This is implemented as a thin wrapper over the hashmap API. In particular, this means that there is an additional 4-byte overhead due to the fact that the first 4 bytes of the hash is redundantly stored. For now, I'm taking the simpler approach, but if need be, we can reimplement oidmap without affecting the callers significantly. oidset has been updated to use oidmap. Signed-off-by: Jonathan Tan Signed-off-by: Junio C Hamano --- oidset.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'oidset.h') diff --git a/oidset.h b/oidset.h index b7eaab5b88..f4c9e0f9c0 100644 --- a/oidset.h +++ b/oidset.h @@ -1,6 +1,8 @@ #ifndef OIDSET_H #define OIDSET_H +#include "oidmap.h" + /** * This API is similar to sha1-array, in that it maintains a set of object ids * in a memory-efficient way. The major differences are: @@ -17,10 +19,10 @@ * A single oidset; should be zero-initialized (or use OIDSET_INIT). */ struct oidset { - struct hashmap map; + struct oidmap map; }; -#define OIDSET_INIT { { NULL } } +#define OIDSET_INIT { OIDMAP_INIT } /** * Returns true iff `set` contains `oid`. -- cgit v1.2.3