Partial revert "htable: handle v. unlikely case where entries look deleted/empty."

[ccan] / ccan / htable / tools / speed.c

diff --git a/ccan/htable/tools/speed.c b/ccan/htable/tools/speed.c
index 3fd1e8926fce0d74fd92ece44a44edf62b50305d..e185b6f69eb74f3435789d82abe144eb32d8d1ca 100644 (file)
--- a/ccan/htable/tools/speed.c
+++ b/ccan/htable/tools/speed.c
@@ -70,7 +70,7 @@ static size_t perfect(const struct htable *ht)
        size_t i, placed_perfect = 0;
 
        for (i = 0; i < ((size_t)1 << ht->bits); i++) {
-               if (!entry_is_valid(ht, i))
+               if (!entry_is_valid(ht->table[i]))
                        continue;
                if (hash_bucket(ht, ht->rehash(get_raw_ptr(ht, ht->table[i]),
                                               ht->priv)) == i) {
@@ -87,7 +87,7 @@ static size_t count_deleted(const struct htable *ht)
        size_t i, delete_markers = 0;
 
        for (i = 0; i < ((size_t)1 << ht->bits); i++) {
-               if (entry_is_deleted(ht, i))
+               if (ht->table[i] == HTABLE_DELETED)
                        delete_markers++;
        }
        return delete_markers;