mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
6da1a25814
hashmap_free(), hashmap_free_entries(), and hashmap_free_() have existed
for a while, but aren't necessarily the clearest names, especially with
hashmap_partial_clear() being added to the mix and lazy-initialization
now being supported. Peff suggested we adopt the following names[1]:
- hashmap_clear() - remove all entries and de-allocate any
hashmap-specific data, but be ready for reuse
- hashmap_clear_and_free() - ditto, but free the entries themselves
- hashmap_partial_clear() - remove all entries but don't deallocate
table
- hashmap_partial_clear_and_free() - ditto, but free the entries
This patch provides the new names and converts all existing callers over
to the new naming scheme.
[1] https://lore.kernel.org/git/20201030125059.GA3277724@coredump.intra.peff.net/
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
61 lines
1.5 KiB
C
61 lines
1.5 KiB
C
#include "cache.h"
|
|
#include "oidmap.h"
|
|
|
|
static int oidmap_neq(const void *hashmap_cmp_fn_data,
|
|
const struct hashmap_entry *e1,
|
|
const struct hashmap_entry *e2,
|
|
const void *keydata)
|
|
{
|
|
const struct oidmap_entry *a, *b;
|
|
|
|
a = container_of(e1, const struct oidmap_entry, internal_entry);
|
|
b = container_of(e2, const struct oidmap_entry, internal_entry);
|
|
|
|
if (keydata)
|
|
return !oideq(&a->oid, (const struct object_id *) keydata);
|
|
return !oideq(&a->oid, &b->oid);
|
|
}
|
|
|
|
void oidmap_init(struct oidmap *map, size_t initial_size)
|
|
{
|
|
hashmap_init(&map->map, oidmap_neq, NULL, initial_size);
|
|
}
|
|
|
|
void oidmap_free(struct oidmap *map, int free_entries)
|
|
{
|
|
if (!map)
|
|
return;
|
|
|
|
/* TODO: make oidmap itself not depend on struct layouts */
|
|
hashmap_clear_(&map->map, free_entries ? 0 : -1);
|
|
}
|
|
|
|
void *oidmap_get(const struct oidmap *map, const struct object_id *key)
|
|
{
|
|
if (!map->map.cmpfn)
|
|
return NULL;
|
|
|
|
return hashmap_get_from_hash(&map->map, oidhash(key), key);
|
|
}
|
|
|
|
void *oidmap_remove(struct oidmap *map, const struct object_id *key)
|
|
{
|
|
struct hashmap_entry entry;
|
|
|
|
if (!map->map.cmpfn)
|
|
oidmap_init(map, 0);
|
|
|
|
hashmap_entry_init(&entry, oidhash(key));
|
|
return hashmap_remove(&map->map, &entry, key);
|
|
}
|
|
|
|
void *oidmap_put(struct oidmap *map, void *entry)
|
|
{
|
|
struct oidmap_entry *to_put = entry;
|
|
|
|
if (!map->map.cmpfn)
|
|
oidmap_init(map, 0);
|
|
|
|
hashmap_entry_init(&to_put->internal_entry, oidhash(&to_put->oid));
|
|
return hashmap_put(&map->map, &to_put->internal_entry);
|
|
}
|