projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compare hash value before call compare_fct()
[urcu.git]
/
rculfhash.c
diff --git
a/rculfhash.c
b/rculfhash.c
index d733d6bd53da2cab4b849e343656ce53df4326f7..6e07878a1c3db3c2afac4700727491a2aa8be3ea 100644
(file)
--- 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);
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)));
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)
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)) {
&& !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)
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;
}
&& likely(!ht->compare_fct(node->key, node->key_len, key, key_len))) {
break;
}
This page took
0.031242 seconds
and
4
git commands to generate.