htable: reduce size of htable by storing perfect bitnum, not mask.

[ccan] / ccan / htable / test / run.c

diff --git a/ccan/htable/test/run.c b/ccan/htable/test/run.c
index 7fc05e24f6bfac4b38748491911c6741d0b841a8..85502c4ab1f8d3dbeb6e69cde0ecaa2cb4560b7e 100644 (file)
--- a/ccan/htable/test/run.c
+++ b/ccan/htable/test/run.c
@@ -10,7 +10,7 @@
 /* We use the number divided by two as the hash (for lots of
    collisions), plus set all the higher bits so we can detect if they
    don't get masked out. */
 /* We use the number divided by two as the hash (for lots of
    collisions), plus set all the higher bits so we can detect if they
    don't get masked out. */

-static size_t hash(const void *elem, void *unused)
+static size_t hash(const void *elem, void *unused UNNEEDED)

 {
        size_t h = *(uint64_t *)elem / 2;
        h |= -1UL << NUM_BITS;
 {
        size_t h = *(uint64_t *)elem / 2;
        h |= -1UL << NUM_BITS;


@@ -95,7 +95,7 @@ static bool check_mask(struct htable *ht, uint64_t val[], unsigned num)
        return true;
 }
 
        return true;
 }
 

-int main(int argc, char *argv[])
+int main(void)

 {
        unsigned int i, weight;
        uintptr_t perfect_bit;
 {
        unsigned int i, weight;
        uintptr_t perfect_bit;


@@ -105,13 +105,13 @@ int main(int argc, char *argv[])
        void *p;
        struct htable_iter iter;
 
        void *p;
        struct htable_iter iter;
 

-       plan_tests(29);
+       plan_tests(36);

        for (i = 0; i < NUM_VALS; i++)
                val[i] = i;
        dne = i;
 
        htable_init(&ht, hash, NULL);
        for (i = 0; i < NUM_VALS; i++)
                val[i] = i;
        dne = i;
 
        htable_init(&ht, hash, NULL);

-       ok1(ht.max == 0);
+       ok1(ht_max(&ht) == 0);

        ok1(ht.bits == 0);
 
        /* We cannot find an entry which doesn't exist. */
        ok1(ht.bits == 0);
 
        /* We cannot find an entry which doesn't exist. */


@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
        /* This should increase it once. */
        add_vals(&ht, val, 0, 1);
        ok1(ht.bits == 1);
        /* This should increase it once. */
        add_vals(&ht, val, 0, 1);
        ok1(ht.bits == 1);

-       ok1(ht.max == 1);
+       ok1(ht_max(&ht) == 1);

        weight = 0;
        for (i = 0; i < sizeof(ht.common_mask) * CHAR_BIT; i++) {
                if (ht.common_mask & ((uintptr_t)1 << i)) {
        weight = 0;
        for (i = 0; i < sizeof(ht.common_mask) * CHAR_BIT; i++) {
                if (ht.common_mask & ((uintptr_t)1 << i)) {


@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
        /* This should increase it again. */
        add_vals(&ht, val, 1, 1);
        ok1(ht.bits == 2);
        /* This should increase it again. */
        add_vals(&ht, val, 1, 1);
        ok1(ht.bits == 2);

-       ok1(ht.max == 3);
+       ok1(ht_max(&ht) == 3);

 
        /* Mask should be set. */
        ok1(ht.common_mask != 0);
 
        /* Mask should be set. */
        ok1(ht.common_mask != 0);


@@ -156,6 +156,11 @@ int main(int argc, char *argv[])
                i++;
        ok1(i == NUM_VALS);
 
                i++;
        ok1(i == NUM_VALS);
 

+       i = 0;
+       for (p = htable_prev(&ht, &iter); p; p = htable_prev(&ht, &iter))
+               i++;
+       ok1(i == NUM_VALS);
+

        /* Delete all. */
        del_vals(&ht, val, NUM_VALS);
        ok1(!htable_get(&ht, hash(&val[0], NULL), objcmp, &val[0]));
        /* Delete all. */
        del_vals(&ht, val, NUM_VALS);
        ok1(!htable_get(&ht, hash(&val[0], NULL), objcmp, &val[0]));


@@ -178,18 +183,30 @@ int main(int argc, char *argv[])
        /* Corner cases: wipe out the perfect bit using bogus pointer. */
        htable_clear(&ht);
        htable_add(&ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1]));
        /* Corner cases: wipe out the perfect bit using bogus pointer. */
        htable_clear(&ht);
        htable_add(&ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1]));

-       ok1(ht.perfect_bit);
-       perfect_bit = ht.perfect_bit;
+       ok1(ht_perfect_mask(&ht));
+       perfect_bit = ht_perfect_mask(&ht);

        htable_add(&ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1]
                                   | perfect_bit));
        htable_add(&ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1]
                                   | perfect_bit));

-       ok1(ht.perfect_bit == 0);
+       ok1(ht_perfect_mask(&ht) == 0);

        htable_del(&ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1] | perfect_bit));
 
        /* Enlarging should restore it... */
        add_vals(&ht, val, 0, NUM_VALS-1);
 
        htable_del(&ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1] | perfect_bit));
 
        /* Enlarging should restore it... */
        add_vals(&ht, val, 0, NUM_VALS-1);
 

-       ok1(ht.perfect_bit != 0);
+       ok1(ht_perfect_mask(&ht) != 0);

        htable_clear(&ht);
 
        htable_clear(&ht);
 

+       ok1(htable_init_sized(&ht, hash, NULL, 1024));
+       ok1(ht_max(&ht) >= 1024);
+       htable_clear(&ht);
+
+       ok1(htable_init_sized(&ht, hash, NULL, 1023));
+       ok1(ht_max(&ht) >= 1023);
+       htable_clear(&ht);
+
+       ok1(htable_init_sized(&ht, hash, NULL, 1025));
+       ok1(ht_max(&ht) >= 1025);
+       htable_clear(&ht);
+       

        return exit_status();
 }
        return exit_status();
 }