htable: add htable_count().

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

diff --git a/ccan/htable/test/run.c b/ccan/htable/test/run.c
index 067816a9c51c474aef38d78337f2fab05937a759..3608941d97a9de42fde9a96d60d761e00662fc8e 100644 (file)
--- a/ccan/htable/test/run.c
+++ b/ccan/htable/test/run.c
@@ -67,7 +67,7 @@ static void find_vals(struct htable *ht,
                        return;
                }
        }
-       pass("Found %llu numbers in hash", (long long)i);
+       ok1(htable_count(ht) == i);
 }
 
 static void del_vals(struct htable *ht,
@@ -105,12 +105,13 @@ int main(void)
        void *p;
        struct htable_iter iter;
 
-       plan_tests(36);
+       plan_tests(38);
        for (i = 0; i < NUM_VALS; i++)
                val[i] = i;
        dne = i;
 
        htable_init(&ht, hash, NULL);
+       ok1(htable_count(&ht) == 0);
        ok1(ht_max(&ht) == 0);
        ok1(ht.bits == 0);
 
@@ -183,17 +184,17 @@ int main(void)
        /* 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));
-       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);
 
-       ok1(ht.perfect_bit != 0);
+       ok1(ht_perfect_mask(&ht) != 0);
        htable_clear(&ht);
 
        ok1(htable_init_sized(&ht, hash, NULL, 1024));
@@ -207,6 +208,8 @@ int main(void)
        ok1(htable_init_sized(&ht, hash, NULL, 1025));
        ok1(ht_max(&ht) >= 1025);
        htable_clear(&ht);
-       
+
+       ok1(htable_count(&ht) == 0);
+
        return exit_status();
 }