X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=ccan%2Fhtable%2Ftools%2Fspeed.c;h=3fd1e8926fce0d74fd92ece44a44edf62b50305d;hb=7218ee2476d8a7e4f9413781e2bedcd2daaa8190;hp=dce3fdf911430ce66e8e6b16c2604723d9634f89;hpb=adfa48b95c197a6ead2725835753732a9e03afa8;p=ccan

diff --git a/ccan/htable/tools/speed.c b/ccan/htable/tools/speed.c
index dce3fdf9..3fd1e892 100644
--- a/ccan/htable/tools/speed.c
+++ b/ccan/htable/tools/speed.c
@@ -70,12 +70,12 @@ 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->table[i]))
+		if (!entry_is_valid(ht, i))
 			continue;
 		if (hash_bucket(ht, ht->rehash(get_raw_ptr(ht, ht->table[i]),
 					       ht->priv)) == i) {
-			assert((ht->table[i] & ht->perfect_bit)
-			       == ht->perfect_bit);
+			assert((ht->table[i] & ht_perfect_mask(ht))
+			       == ht_perfect_mask(ht));
 			placed_perfect++;
 		}
 	}
@@ -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 (ht->table[i] == HTABLE_DELETED)
+		if (entry_is_deleted(ht, i))
 			delete_markers++;
 	}
 	return delete_markers;