#include <stdbool.h>
#include <string.h>
-#define NUM_VALS (1 << HTABLE_BASE_BITS)
+#define NUM_BITS 7
+#define NUM_VALS (1 << NUM_BITS)
struct obj {
+ /* Makes sure we don't try to treat and obj as a key or vice versa */
+ unsigned char unused;
unsigned int key;
};
static size_t objhash(const unsigned int *key)
{
size_t h = *key / 2;
- h |= -1UL << HTABLE_BASE_BITS;
+ h |= -1UL << NUM_BITS;
return h;
}
-static bool cmp(const unsigned int *key1, const unsigned int *key2)
+static bool cmp(const struct obj *obj, const unsigned int *key)
{
- return *key1 == *key2;
+ return obj->key == *key;
}
-HTABLE_DEFINE_TYPE(struct obj, objkey, objhash, cmp, obj);
+HTABLE_DEFINE_TYPE(struct obj, objkey, objhash, cmp, htable_obj);
static void add_vals(struct htable_obj *ht,
struct obj val[], unsigned int num)
int main(int argc, char *argv[])
{
unsigned int i;
- struct htable_obj *ht;
- struct obj val[NUM_VALS];
+ struct htable_obj ht, ht2;
+ struct obj val[NUM_VALS], *result;
unsigned int dne;
void *p;
struct htable_obj_iter iter;
- plan_tests(20);
+ plan_tests(29);
for (i = 0; i < NUM_VALS; i++)
val[i].key = i;
dne = i;
- ht = htable_obj_new();
- ok1(((struct htable *)ht)->max < (1 << ((struct htable *)ht)->bits));
- ok1(((struct htable *)ht)->bits == HTABLE_BASE_BITS);
+ htable_obj_init(&ht);
+ ok1(ht.raw.max == 0);
+ ok1(ht.raw.bits == 0);
/* We cannot find an entry which doesn't exist. */
- ok1(!htable_obj_get(ht, &dne));
+ ok1(!htable_obj_get(&ht, &dne));
- /* Fill it, it should increase in size (once). */
- add_vals(ht, val, NUM_VALS);
- ok1(((struct htable *)ht)->bits == HTABLE_BASE_BITS + 1);
- ok1(((struct htable *)ht)->max < (1 << ((struct htable *)ht)->bits));
+ /* Fill it, it should increase in size. */
+ add_vals(&ht, val, NUM_VALS);
+ ok1(ht.raw.bits == NUM_BITS + 1);
+ ok1(ht.raw.max < (1 << ht.raw.bits));
/* Mask should be set. */
- ok1(((struct htable *)ht)->common_mask != 0);
- ok1(((struct htable *)ht)->common_mask != -1);
- ok1(check_mask((struct htable *)ht, val, NUM_VALS));
+ ok1(ht.raw.common_mask != 0);
+ ok1(ht.raw.common_mask != -1);
+ ok1(check_mask(&ht.raw, val, NUM_VALS));
/* Find all. */
- find_vals(ht, val, NUM_VALS);
- ok1(!htable_obj_get(ht, &dne));
+ find_vals(&ht, val, NUM_VALS);
+ ok1(!htable_obj_get(&ht, &dne));
/* Walk once, should get them all. */
i = 0;
- for (p = htable_obj_first(ht,&iter); p; p = htable_obj_next(ht, &iter))
+ for (p = htable_obj_first(&ht,&iter); p; p = htable_obj_next(&ht, &iter))
+ i++;
+ ok1(i == NUM_VALS);
+ i = 0;
+ for (p = htable_obj_prev(&ht,&iter); p; p = htable_obj_prev(&ht, &iter))
i++;
ok1(i == NUM_VALS);
/* Delete all. */
- del_vals(ht, val, NUM_VALS);
- ok1(!htable_obj_get(ht, &val[0].key));
+ del_vals(&ht, val, NUM_VALS);
+ ok1(!htable_obj_get(&ht, &val[0].key));
/* Worst case, a "pointer" which doesn't have any matching bits. */
- htable_add((struct htable *)ht, 0,
- (void *)~(uintptr_t)&val[NUM_VALS-1]);
- htable_obj_add(ht, &val[NUM_VALS-1]);
- ok1(((struct htable *)ht)->common_mask == 0);
- ok1(((struct htable *)ht)->common_bits == 0);
+ htable_add(&ht.raw, 0, (void *)~(uintptr_t)&val[NUM_VALS-1]);
+ htable_obj_add(&ht, &val[NUM_VALS-1]);
+ ok1(ht.raw.common_mask == 0);
+ ok1(ht.raw.common_bits == 0);
/* Delete the bogus one before we trip over it. */
- htable_del((struct htable *)ht, 0,
- (void *)~(uintptr_t)&val[NUM_VALS-1]);
+ htable_del(&ht.raw, 0, (void *)~(uintptr_t)&val[NUM_VALS-1]);
/* Add the rest. */
- add_vals(ht, val, NUM_VALS-1);
+ add_vals(&ht, val, NUM_VALS-1);
/* Check we can find them all. */
- find_vals(ht, val, NUM_VALS);
- ok1(!htable_obj_get(ht, &dne));
+ find_vals(&ht, val, NUM_VALS);
+ ok1(!htable_obj_get(&ht, &dne));
+
+ /* Check copy. */
+ ok1(htable_obj_copy(&ht2, &ht));
/* Delete them all by key. */
- del_vals_bykey(ht, val, NUM_VALS);
- htable_obj_free(ht);
+ del_vals_bykey(&ht, val, NUM_VALS);
+ del_vals_bykey(&ht2, val, NUM_VALS);
+
+ /* Write two of the same value. */
+ val[1] = val[0];
+ htable_obj_add(&ht, &val[0]);
+ htable_obj_add(&ht, &val[1]);
+ i = 0;
+
+ result = htable_obj_getfirst(&ht, &i, &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);
+
+ /* 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);
+ } else {
+ ok1(htable_obj_getnext(&ht, &i, &iter) == &val[0]);
+ ok1(htable_obj_getnext(&ht, &i, &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);
+ }
+ htable_obj_clear(&ht);
+ htable_obj_clear(&ht2);
return exit_status();
}
projects / ccan / blobdiff