X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=rculfhash.c;h=6e07878a1c3db3c2afac4700727491a2aa8be3ea;hb=ae450da3b54fe3c8ea8fc92ec9a9ce2ad8f131cb;hp=d733d6bd53da2cab4b849e343656ce53df4326f7;hpb=960c9e4ff8e6028f5a0d4b1c1d747b20f08c5177;p=urcu.git

diff --git a/rculfhash.c b/rculfhash.c
index d733d6b..6e07878 100644
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -724,7 +724,12 @@ struct _cds_lfht_node *lookup_bucket(struct cds_lfht *ht, unsigned long size,
 
 	assert(size > 0);
 	index = hash & (size - 1);
-	order = get_count_order_ulong(index + 1);
+	/*
+	 * equivalent to get_count_order_ulong(index + 1), but optimizes
+	 * away the non-existing 0 special-case for
+	 * get_count_order_ulong.
+	 */
+	order = fls_ulong(index);
 
 	dbg_printf("lookup hash %lu index %lu order %lu aridx %lu\n",
 		   hash, index, order, index & (!order ? 0 : ((1UL << (order - 1)) - 1)));
@@ -887,6 +892,7 @@ struct cds_lfht_node *_cds_lfht_add(struct cds_lfht *ht,
 				goto gc_node;
 			if ((mode == ADD_UNIQUE || mode == ADD_REPLACE)
 			    && !is_dummy(next)
+			    && clear_flag(iter)->p.reverse_hash == node->p.reverse_hash
 			    && !ht->compare_fct(node->key, node->key_len,
 						clear_flag(iter)->key,
 						clear_flag(iter)->key_len)) {
@@ -1336,6 +1342,7 @@ void cds_lfht_lookup(struct cds_lfht *ht, void *key, size_t key_len,
 		next = rcu_dereference(node->p.next);
 		if (likely(!is_removed(next))
 		    && !is_dummy(next)
+		    && clear_flag(node)->p.reverse_hash == reverse_hash
 		    && likely(!ht->compare_fct(node->key, node->key_len, key, key_len))) {
 				break;
 		}