}
/* Defines struct failtable. */
-HTABLE_DEFINE_TYPE(struct failtest_call, (struct failtest_call *), hash_call,
- call_eq, failtable);
+HTABLE_DEFINE_NODUPS_TYPE(struct failtest_call, (struct failtest_call *), hash_call,
+ call_eq, failtable);
bool (*failtest_exit_check)(struct tlist_calls *history);
/* Licensed under LGPLv2+ - see LICENSE file for details */
#ifndef CCAN_HTABLE_TYPE_H
#define CCAN_HTABLE_TYPE_H
+#include "config.h"
+#include <assert.h>
#include <ccan/htable/htable.h>
#include <ccan/compiler/compiler.h>
-#include "config.h"
/**
- * HTABLE_DEFINE_TYPE - create a set of htable ops for a type
+ * HTABLE_DEFINE_NODUPS_TYPE/HTABLE_DEFINE_DUPS_TYPE - create a set of htable ops for a type
* @type: a type whose pointers will be values in the hash.
* @keyof: a function/macro to extract a key: <keytype> @keyof(const type *elem)
* @hashfn: a hash function for a @key: size_t @hashfn(const <keytype> *)
* @eqfn: an equality function keys: bool @eqfn(const type *, const <keytype> *)
* @prefix: a prefix for all the functions to define (of form <name>_*)
*
- * NULL values may not be placed into the hash table.
+ * There are two variants, one of which allows duplicate keys, and one which
+ * does not. The defined functions differ in some cases, as shown below.
+ *
+ * NULL values may not be placed into the hash table (nor (void *)1).
*
* This defines the type hashtable type and an iterator type:
* struct <name>;
*
* Delete and delete-by key return true if it was in the set:
* bool <name>_del(struct <name> *ht, const <type> *e);
- * bool <name>_delkey(struct <name> *ht, const <keytype> *k);
+ * bool <name>_delkey(struct <name> *ht, const <keytype> *k) (NODUPS only);
*
* Delete by iterator:
* bool <name>_delval(struct <name> *ht, struct <name>_iter *i);
*
- * Find and return the (first) matching element, or NULL:
- * type *<name>_get(const struct @name *ht, const <keytype> *k);
+ * Find and return the matching element, or NULL:
+ * type *<name>_get(const struct @name *ht, const <keytype> *k) (NODUPS only);
*
- * Find and return all matching elements, or NULL:
+ * Test for an element:
+ * bool <name>_exists(const struct @name *ht, const <keytype> *k);
+ *
+ * Find and return all matching elements, or NULL (DUPS only):
* type *<name>_getfirst(const struct @name *ht, const <keytype> *k,
* struct <name>_iter *i);
* type *<name>_getnext(const struct @name *ht, const <keytype> *k,
* You can use HTABLE_INITIALIZER like so:
* struct <name> ht = { HTABLE_INITIALIZER(ht.raw, <name>_hash, NULL) };
*/
-#define HTABLE_DEFINE_TYPE(type, keyof, hashfn, eqfn, name) \
+#define HTABLE_DEFINE_TYPE_CORE(type, keyof, hashfn, eqfn, name) \
struct name { struct htable raw; }; \
struct name##_iter { struct htable_iter i; }; \
static inline size_t name##_hash(const void *elem, void *priv) \
{ \
return htable_copy(&dst->raw, &src->raw); \
} \
- static inline bool name##_add(struct name *ht, const type *elem) \
- { \
- return htable_add(&ht->raw, hashfn(keyof(elem)), elem); \
- } \
static inline UNNEEDED bool name##_del(struct name *ht, \
const type *elem) \
{ \
return htable_del(&ht->raw, hashfn(keyof(elem)), elem); \
} \
- static inline UNNEEDED type *name##_get(const struct name *ht, \
- const HTABLE_KTYPE(keyof, type) k) \
- { \
- struct htable_iter i; \
- size_t h = hashfn(k); \
- void *c; \
- \
- for (c = htable_firstval(&ht->raw,&i,h); \
- c; \
- c = htable_nextval(&ht->raw,&i,h)) { \
- if (eqfn(c, k)) \
- return c; \
- } \
- return NULL; \
- } \
static inline UNNEEDED type *name##_getmatch_(const struct name *ht, \
const HTABLE_KTYPE(keyof, type) k, \
size_t h, \
type *v, \
- struct name##_iter *iter) \
+ struct htable_iter *iter) \
{ \
while (v) { \
if (eqfn(v, k)) \
break; \
- v = htable_nextval(&ht->raw, &iter->i, h); \
+ v = htable_nextval(&ht->raw, iter, h); \
} \
return v; \
} \
- static inline UNNEEDED type *name##_getfirst(const struct name *ht, \
- const HTABLE_KTYPE(keyof, type) k, \
- struct name##_iter *iter) \
- { \
- size_t h = hashfn(k); \
- type *v = htable_firstval(&ht->raw, &iter->i, h); \
- return name##_getmatch_(ht, k, h, v, iter); \
- } \
- static inline UNNEEDED type *name##_getnext(const struct name *ht, \
- const HTABLE_KTYPE(keyof, type) k, \
- struct name##_iter *iter) \
+ static inline UNNEEDED bool name##_exists(const struct name *ht, \
+ const HTABLE_KTYPE(keyof, type) k) \
{ \
+ struct htable_iter i; \
size_t h = hashfn(k); \
- type *v = htable_nextval(&ht->raw, &iter->i, h); \
- return name##_getmatch_(ht, k, h, v, iter); \
- } \
- static inline UNNEEDED bool name##_delkey(struct name *ht, \
- const HTABLE_KTYPE(keyof, type) k) \
- { \
- type *elem = name##_get(ht, k); \
- if (elem) \
- return name##_del(ht, elem); \
- return false; \
+ void *v; \
+ \
+ v = htable_firstval(&ht->raw, &i, h); \
+ return name##_getmatch_(ht, k, h, v, &i) != NULL; \
} \
static inline UNNEEDED void name##_delval(struct name *ht, \
struct name##_iter *iter) \
return htable_prev(&ht->raw, &iter->i); \
}
+#define HTABLE_DEFINE_NODUPS_TYPE(type, keyof, hashfn, eqfn, name) \
+ HTABLE_DEFINE_TYPE_CORE(type, keyof, hashfn, eqfn, name) \
+ static inline UNNEEDED type *name##_get(const struct name *ht, \
+ const HTABLE_KTYPE(keyof, type) k) \
+ { \
+ struct htable_iter i; \
+ size_t h = hashfn(k); \
+ void *v; \
+ \
+ v = htable_firstval(&ht->raw, &i, h); \
+ return name##_getmatch_(ht, k, h, v, &i); \
+ } \
+ static inline bool name##_add(struct name *ht, const type *elem) \
+ { \
+ /* Open-coded for slightly more efficiency */ \
+ const HTABLE_KTYPE(keyof, type) k = keyof(elem); \
+ struct htable_iter i; \
+ size_t h = hashfn(k); \
+ void *v; \
+ \
+ v = htable_firstval(&ht->raw, &i, h); \
+ assert(!name##_getmatch_(ht, k, h, v, &i)); \
+ return htable_add(&ht->raw, h, elem); \
+ } \
+ static inline UNNEEDED bool name##_delkey(struct name *ht, \
+ const HTABLE_KTYPE(keyof, type) k) \
+ { \
+ type *elem = name##_get(ht, k); \
+ if (elem) \
+ return name##_del(ht, elem); \
+ return false; \
+ }
+
+#define HTABLE_DEFINE_DUPS_TYPE(type, keyof, hashfn, eqfn, name) \
+ HTABLE_DEFINE_TYPE_CORE(type, keyof, hashfn, eqfn, name) \
+ static inline bool name##_add(struct name *ht, const type *elem) \
+ { \
+ const HTABLE_KTYPE(keyof, type) k = keyof(elem); \
+ return htable_add(&ht->raw, hashfn(k), elem); \
+ } \
+ static inline UNNEEDED type *name##_getfirst(const struct name *ht, \
+ const HTABLE_KTYPE(keyof, type) k, \
+ struct name##_iter *iter) \
+ { \
+ size_t h = hashfn(k); \
+ type *v = htable_firstval(&ht->raw, &iter->i, h); \
+ return name##_getmatch_(ht, k, h, v, &iter->i); \
+ } \
+ static inline UNNEEDED type *name##_getnext(const struct name *ht, \
+ const HTABLE_KTYPE(keyof, type) k, \
+ struct name##_iter *iter) \
+ { \
+ size_t h = hashfn(k); \
+ type *v = htable_nextval(&ht->raw, &iter->i, h); \
+ return name##_getmatch_(ht, k, h, v, &iter->i); \
+ }
+
+
#if HAVE_TYPEOF
#define HTABLE_KTYPE(keyof, type) typeof(keyof((const type *)NULL))
#else
return obj->key == key;
}
-HTABLE_DEFINE_TYPE(struct obj, objkey, objhash, cmp, htable_obj);
+HTABLE_DEFINE_NODUPS_TYPE(struct obj, objkey, objhash, cmp, htable_obj);
static void add_vals(struct htable_obj *ht,
struct obj val[], unsigned int num)
return true;
}
+/* This variant allows duplicates! */
+HTABLE_DEFINE_DUPS_TYPE(struct obj, objkey, objhash, cmp, htable_obj_dups);
+
int main(void)
{
unsigned int i;
struct htable_obj ht, ht2;
+ struct htable_obj_dups ht_dups;
struct obj val[NUM_VALS], *result;
unsigned int dne;
void *p;
struct htable_obj_iter iter;
+ struct htable_obj_dups_iter dups_iter;
plan_tests(29);
for (i = 0; i < NUM_VALS; i++)
del_vals_bykey(&ht, val, NUM_VALS);
del_vals_bykey(&ht2, val, NUM_VALS);
+ /* Duplicates-allowed tests */
+ htable_obj_dups_init(&ht_dups);
/* Write two of the same value. */
val[1] = val[0];
- htable_obj_add(&ht, &val[0]);
- htable_obj_add(&ht, &val[1]);
+ htable_obj_dups_add(&ht_dups, &val[0]);
+ htable_obj_dups_add(&ht_dups, &val[1]);
i = 0;
- result = htable_obj_getfirst(&ht, i, &iter);
+ result = htable_obj_dups_getfirst(&ht_dups, i, &dups_iter);
ok1(result == &val[0] || result == &val[1]);
if (result == &val[0]) {
- ok1(htable_obj_getnext(&ht, i, &iter) == &val[1]);
- ok1(htable_obj_getnext(&ht, i, &iter) == NULL);
+ ok1(htable_obj_dups_getnext(&ht_dups, i, &dups_iter) == &val[1]);
+ ok1(htable_obj_dups_getnext(&ht_dups, i, &dups_iter) == NULL);
/* Deleting first should make us iterate over the other. */
- ok1(htable_obj_del(&ht, &val[0]));
- ok1(htable_obj_getfirst(&ht, i, &iter) == &val[1]);
- ok1(htable_obj_getnext(&ht, i, &iter) == NULL);
+ ok1(htable_obj_dups_del(&ht_dups, &val[0]));
+ ok1(htable_obj_dups_getfirst(&ht_dups, i, &dups_iter) == &val[1]);
+ ok1(htable_obj_dups_getnext(&ht_dups, i, &dups_iter) == NULL);
} else {
- ok1(htable_obj_getnext(&ht, i, &iter) == &val[0]);
- ok1(htable_obj_getnext(&ht, i, &iter) == NULL);
+ ok1(htable_obj_dups_getnext(&ht_dups, i, &dups_iter) == &val[0]);
+ ok1(htable_obj_dups_getnext(&ht_dups, i, &dups_iter) == NULL);
/* Deleting first should make us iterate over the other. */
- ok1(htable_obj_del(&ht, &val[1]));
- ok1(htable_obj_getfirst(&ht, i, &iter) == &val[0]);
- ok1(htable_obj_getnext(&ht, i, &iter) == NULL);
+ ok1(htable_obj_dups_del(&ht_dups, &val[1]));
+ ok1(htable_obj_dups_getfirst(&ht_dups, i, &dups_iter) == &val[0]);
+ ok1(htable_obj_dups_getnext(&ht_dups, i, &dups_iter) == NULL);
}
+ htable_obj_dups_clear(&ht_dups);
htable_obj_clear(&ht);
htable_obj_clear(&ht2);
return exit_status();
return obj->key == *key;
}
-HTABLE_DEFINE_TYPE(struct obj, objkey, objhash, cmp, htable_obj);
+HTABLE_DEFINE_NODUPS_TYPE(struct obj, objkey, objhash, cmp,
+ htable_obj);
+HTABLE_DEFINE_DUPS_TYPE(struct obj, objkey, objhash, cmp,
+ htable_obj_dups);
static void add_vals(struct htable_obj *ht,
struct obj val[], unsigned int num)
{
unsigned int i;
struct htable_obj ht, ht2;
+ struct htable_obj_dups ht_dups;
struct obj val[NUM_VALS], *result;
unsigned int dne;
void *p;
struct htable_obj_iter iter;
+ struct htable_obj_dups_iter dups_iter;
- plan_tests(35);
+ plan_tests(36);
for (i = 0; i < NUM_VALS; i++)
val[i].key = i;
dne = i;
del_vals_bykey(&ht, val, NUM_VALS);
del_vals_bykey(&ht2, val, NUM_VALS);
+ /* Duplicates-allowed tests */
+ htable_obj_dups_init(&ht_dups);
+
/* Write two of the same value. */
val[1] = val[0];
- htable_obj_add(&ht, &val[0]);
- htable_obj_add(&ht, &val[1]);
+ htable_obj_dups_add(&ht_dups, &val[0]);
+ htable_obj_dups_add(&ht_dups, &val[1]);
i = 0;
- result = htable_obj_getfirst(&ht, &i, &iter);
+ result = htable_obj_dups_getfirst(&ht_dups, &i, &dups_iter);
ok1(result == &val[0] || result == &val[1]);
if (result == &val[0]) {
- ok1(htable_obj_getnext(&ht, &i, &iter) == &val[1]);
- ok1(htable_obj_getnext(&ht, &i, &iter) == NULL);
+ ok1(htable_obj_dups_getnext(&ht_dups, &i, &dups_iter) == &val[1]);
+ ok1(htable_obj_dups_getnext(&ht_dups, &i, &dups_iter) == NULL);
/* Deleting first should make us iterate over the other. */
- ok1(htable_obj_del(&ht, &val[0]));
- ok1(htable_obj_getfirst(&ht, &i, &iter) == &val[1]);
- ok1(htable_obj_getnext(&ht, &i, &iter) == NULL);
+ ok1(htable_obj_dups_del(&ht_dups, &val[0]));
+ ok1(htable_obj_dups_getfirst(&ht_dups, &i, &dups_iter) == &val[1]);
+ ok1(htable_obj_dups_getnext(&ht_dups, &i, &dups_iter) == NULL);
} else {
- ok1(htable_obj_getnext(&ht, &i, &iter) == &val[0]);
- ok1(htable_obj_getnext(&ht, &i, &iter) == NULL);
+ ok1(htable_obj_dups_getnext(&ht_dups, &i, &dups_iter) == &val[0]);
+ ok1(htable_obj_dups_getnext(&ht_dups, &i, &dups_iter) == NULL);
/* Deleting first should make us iterate over the other. */
- ok1(htable_obj_del(&ht, &val[1]));
- ok1(htable_obj_getfirst(&ht, &i, &iter) == &val[0]);
- ok1(htable_obj_getnext(&ht, &i, &iter) == NULL);
+ ok1(htable_obj_dups_del(&ht_dups, &val[1]));
+ ok1(htable_obj_dups_getfirst(&ht_dups, &i, &dups_iter) == &val[0]);
+ ok1(htable_obj_dups_getnext(&ht_dups, &i, &dups_iter) == NULL);
}
+ htable_obj_dups_clear(&ht_dups);
+ ok1(htable_obj_dups_count(&ht_dups) == 0);
htable_obj_clear(&ht);
ok1(htable_obj_count(&ht) == 0);
htable_obj_clear(&ht2);
return key(p) == k;
}
-HTABLE_DEFINE_TYPE(ptrint_t, key, hash_uintptr, cmp, htable_ptrint);
+HTABLE_DEFINE_NODUPS_TYPE(ptrint_t, key, hash_uintptr, cmp, htable_ptrint);
/* Nanoseconds per operation */
static size_t normalize(const struct timeabs *start,
return object->key == *key;
}
-HTABLE_DEFINE_TYPE(struct object, objkey, hash_obj, cmp, htable_obj);
+HTABLE_DEFINE_NODUPS_TYPE(struct object, objkey, hash_obj, cmp, htable_obj);
static unsigned int popcount(unsigned long val)
{
return strcmp(obj, key) == 0;
}
-HTABLE_DEFINE_TYPE(char, strkey, hash_str, cmp, htable_str);
+HTABLE_DEFINE_NODUPS_TYPE(char, strkey, hash_str, cmp, htable_str);
/* Nanoseconds per operation */
static size_t normalize(const struct timeabs *start,
{
return elem->index == index;
}
-HTABLE_DEFINE_TYPE(struct htable_elem, keyof, hashfn, eqfn, hash);
+HTABLE_DEFINE_NODUPS_TYPE(struct htable_elem, keyof, hashfn, eqfn, hash);
static bool check_val(intmap_index_t i, uint64_t *v, uint64_t *expected)
{
}
/* struct thash */
-HTABLE_DEFINE_TYPE(struct trace, (const struct trace *), hash_trace, trace_eq,
- thash);
+HTABLE_DEFINE_NODUPS_TYPE(struct trace, (const struct trace *), hash_trace, trace_eq,
+ thash);
static struct thash htable
= { HTABLE_INITIALIZER(htable.raw, thash_hash, NULL) };
{
return e1 == e2;
}
-HTABLE_DEFINE_TYPE(void, objset_key_, objset_hashfn_, objset_eqfn_, objset_h);
+HTABLE_DEFINE_NODUPS_TYPE(void, objset_key_, objset_hashfn_, objset_eqfn_, objset_h);
/**
* OBJSET_MEMBERS - declare members for a type-specific unordered objset.
return streq(name1, name2);
}
-HTABLE_DEFINE_TYPE(char, option_name, option_hash, option_cmp, htable_option);
+HTABLE_DEFINE_NODUPS_TYPE(char, option_name, option_hash, option_cmp,
+ htable_option);
static struct htable_option *htable_option_new(void)
{
return strcmp(m->dir, dir) == 0;
}
-HTABLE_DEFINE_TYPE(struct manifest, manifest_name, dir_hash, dir_cmp,
- htable_manifest);
+HTABLE_DEFINE_NODUPS_TYPE(struct manifest, manifest_name, dir_hash, dir_cmp,
+ htable_manifest);
static struct htable_manifest *manifests;
const char *get_ccan_file_contents(struct ccan_file *f)
projects / ccan / commitdiff