mirror of
https://github.com/git/git.git
synced 2025-12-05 18:47:16 -06:00
596184786c
Callers which want to know how many items are in an oidmap have to look at the underlying hashmap struct, leaking an implementation detail. Let's provide a type-appropriate wrapper and use it. Note in the call from lookup_replace_object(), the caller was actually looking at the hashmap's tablesize parameter (the allocated size of the table) rather than hashmap_get_size(), the number of items in the table. This probably should have been checking the number of items all along, but the two are functionally equivalent here since we only add to the map and never remove anything. Thus if there was any allocation, it was because there is at least one item. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
99 lines
2.5 KiB
C
99 lines
2.5 KiB
C
#ifndef OIDMAP_H
|
|
#define OIDMAP_H
|
|
|
|
#include "hash.h"
|
|
#include "hashmap.h"
|
|
|
|
/*
|
|
* struct oidmap_entry is a structure representing an entry in the hash table,
|
|
* which must be used as first member of user data structures.
|
|
*
|
|
* Users should set the oid field. oidmap_put() will populate the
|
|
* internal_entry field.
|
|
*/
|
|
struct oidmap_entry {
|
|
/* For internal use only */
|
|
struct hashmap_entry internal_entry;
|
|
|
|
struct object_id oid;
|
|
};
|
|
|
|
struct oidmap {
|
|
struct hashmap map;
|
|
};
|
|
|
|
#define OIDMAP_INIT { { NULL } }
|
|
|
|
/*
|
|
* Initializes an oidmap structure.
|
|
*
|
|
* `map` is the oidmap to initialize.
|
|
*
|
|
* If the total number of entries is known in advance, the `initial_size`
|
|
* parameter may be used to preallocate a sufficiently large table and thus
|
|
* prevent expensive resizing. If 0, the table is dynamically resized.
|
|
*/
|
|
void oidmap_init(struct oidmap *map, size_t initial_size);
|
|
|
|
/*
|
|
* Clear an oidmap, freeing any allocated memory. The map is empty and
|
|
* can be reused without another explicit init.
|
|
*
|
|
* If `free_entries` is true, each oidmap_entry in the map is freed as well
|
|
* using stdlibs free().
|
|
*/
|
|
void oidmap_clear(struct oidmap *map, int free_entries);
|
|
|
|
/*
|
|
* Returns the oidmap entry for the specified oid, or NULL if not found.
|
|
*/
|
|
void *oidmap_get(const struct oidmap *map,
|
|
const struct object_id *key);
|
|
|
|
/*
|
|
* Adds or replaces an oidmap entry.
|
|
*
|
|
* ((struct oidmap_entry *) entry)->internal_entry will be populated by this
|
|
* function.
|
|
*
|
|
* Returns the replaced entry, or NULL if not found (i.e. the entry was added).
|
|
*/
|
|
void *oidmap_put(struct oidmap *map, void *entry);
|
|
|
|
/*
|
|
* Removes an oidmap entry matching the specified oid.
|
|
*
|
|
* Returns the removed entry, or NULL if not found.
|
|
*/
|
|
void *oidmap_remove(struct oidmap *map, const struct object_id *key);
|
|
|
|
static inline unsigned int oidmap_get_size(struct oidmap *map)
|
|
{
|
|
return hashmap_get_size(&map->map);
|
|
}
|
|
|
|
struct oidmap_iter {
|
|
struct hashmap_iter h_iter;
|
|
};
|
|
|
|
static inline void oidmap_iter_init(struct oidmap *map, struct oidmap_iter *iter)
|
|
{
|
|
hashmap_iter_init(&map->map, &iter->h_iter);
|
|
}
|
|
|
|
static inline void *oidmap_iter_next(struct oidmap_iter *iter)
|
|
{
|
|
/* TODO: this API could be reworked to do compile-time type checks */
|
|
return (void *)hashmap_iter_next(&iter->h_iter);
|
|
}
|
|
|
|
static inline void *oidmap_iter_first(struct oidmap *map,
|
|
struct oidmap_iter *iter)
|
|
{
|
|
oidmap_iter_init(map, iter);
|
|
/* TODO: this API could be reworked to do compile-time type checks */
|
|
return (void *)oidmap_iter_next(iter);
|
|
}
|
|
|
|
#endif
|