projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rculfhash: Simplify lookup_bucket()
[urcu.git]
/
rculfhash.c
diff --git
a/rculfhash.c
b/rculfhash.c
index c7b9ea895cf6594d11a9ef8a56a461ba3bc2ae7d..189f8c831237edfe205c6461babadb765b537285 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)));
@@
-855,7
+860,7
@@
struct cds_lfht_node *_cds_lfht_add(struct cds_lfht *ht,
enum add_mode mode, int dummy)
{
struct cds_lfht_node *iter_prev, *iter, *next, *new_node, *new_next,
enum add_mode mode, int dummy)
{
struct cds_lfht_node *iter_prev, *iter, *next, *new_node, *new_next,
- *
dummy_node, *
return_node;
+ *return_node;
struct _cds_lfht_node *lookup;
assert(!is_dummy(node));
struct _cds_lfht_node *lookup;
assert(!is_dummy(node));
@@
-924,7
+929,7
@@
struct cds_lfht_node *_cds_lfht_add(struct cds_lfht *ht,
return_node = NULL;
else /* ADD_DEFAULT and ADD_UNIQUE */
return_node = node;
return_node = NULL;
else /* ADD_DEFAULT and ADD_UNIQUE */
return_node = node;
- goto
gc_
end;
+ goto end;
}
replace:
}
replace:
@@
-946,10
+951,6
@@
struct cds_lfht_node *_cds_lfht_add(struct cds_lfht *ht,
(void) uatomic_cmpxchg(&iter_prev->p.next, iter, new_next);
/* retry */
}
(void) uatomic_cmpxchg(&iter_prev->p.next, iter, new_next);
/* retry */
}
-gc_end:
- /* Garbage collect logically removed nodes in the bucket */
- dummy_node = (struct cds_lfht_node *) lookup;
- _cds_lfht_gc_bucket(dummy_node, node);
end:
return return_node;
}
end:
return return_node;
}
This page took
0.02486 seconds
and
4
git commands to generate.