projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rculfhash: rename likely/unlikely (add caa_ prefix)
[userspace-rcu.git]
/
rculfhash.c
diff --git
a/rculfhash.c
b/rculfhash.c
index f4187e7993ca9ea53a6915ede1edb6673388db48..d1a17669f9fa176660b9552241808f2760f6bdcc 100644
(file)
--- a/
rculfhash.c
+++ b/
rculfhash.c
@@
-604,7
+604,7
@@
int ht_get_split_count_index(unsigned long hash)
assert(split_count_mask >= 0);
cpu = sched_getcpu();
assert(split_count_mask >= 0);
cpu = sched_getcpu();
- if (unlikely(cpu < 0))
+ if (
caa_
unlikely(cpu < 0))
return hash & split_count_mask;
else
return cpu & split_count_mask;
return hash & split_count_mask;
else
return cpu & split_count_mask;
@@
-623,11
+623,11
@@
void ht_count_add(struct cds_lfht *ht, unsigned long size, unsigned long hash)
unsigned long split_count;
int index;
unsigned long split_count;
int index;
- if (unlikely(!ht->split_count))
+ if (
caa_
unlikely(!ht->split_count))
return;
index = ht_get_split_count_index(hash);
split_count = uatomic_add_return(&ht->split_count[index].add, 1);
return;
index = ht_get_split_count_index(hash);
split_count = uatomic_add_return(&ht->split_count[index].add, 1);
- if (unlikely(!(split_count & ((1UL << COUNT_COMMIT_ORDER) - 1)))) {
+ if (
caa_
unlikely(!(split_count & ((1UL << COUNT_COMMIT_ORDER) - 1)))) {
long count;
dbg_printf("add split count %lu\n", split_count);
long count;
dbg_printf("add split count %lu\n", split_count);
@@
-650,11
+650,11
@@
void ht_count_del(struct cds_lfht *ht, unsigned long size, unsigned long hash)
unsigned long split_count;
int index;
unsigned long split_count;
int index;
- if (unlikely(!ht->split_count))
+ if (
caa_
unlikely(!ht->split_count))
return;
index = ht_get_split_count_index(hash);
split_count = uatomic_add_return(&ht->split_count[index].del, 1);
return;
index = ht_get_split_count_index(hash);
split_count = uatomic_add_return(&ht->split_count[index].del, 1);
- if (unlikely(!(split_count & ((1UL << COUNT_COMMIT_ORDER) - 1)))) {
+ if (
caa_
unlikely(!(split_count & ((1UL << COUNT_COMMIT_ORDER) - 1)))) {
long count;
dbg_printf("del split count %lu\n", split_count);
long count;
dbg_printf("del split count %lu\n", split_count);
@@
-806,12
+806,12
@@
void _cds_lfht_gc_bucket(struct cds_lfht_node *dummy, struct cds_lfht_node *node
*/
assert(dummy != node);
for (;;) {
*/
assert(dummy != node);
for (;;) {
- if (unlikely(is_end(iter)))
+ if (
caa_
unlikely(is_end(iter)))
return;
return;
- if (likely(clear_flag(iter)->p.reverse_hash > node->p.reverse_hash))
+ if (
caa_
likely(clear_flag(iter)->p.reverse_hash > node->p.reverse_hash))
return;
next = rcu_dereference(clear_flag(iter)->p.next);
return;
next = rcu_dereference(clear_flag(iter)->p.next);
- if (likely(is_removed(next)))
+ if (
caa_
likely(is_removed(next)))
break;
iter_prev = clear_flag(iter);
iter = next;
break;
iter_prev = clear_flag(iter);
iter = next;
@@
-915,9
+915,9
@@
void _cds_lfht_add(struct cds_lfht *ht,
iter = rcu_dereference(iter_prev->p.next);
assert(iter_prev->p.reverse_hash <= node->p.reverse_hash);
for (;;) {
iter = rcu_dereference(iter_prev->p.next);
assert(iter_prev->p.reverse_hash <= node->p.reverse_hash);
for (;;) {
- if (unlikely(is_end(iter)))
+ if (
caa_
unlikely(is_end(iter)))
goto insert;
goto insert;
- if (likely(clear_flag(iter)->p.reverse_hash > node->p.reverse_hash))
+ if (
caa_
likely(clear_flag(iter)->p.reverse_hash > node->p.reverse_hash))
goto insert;
/* dummy node is the first node of the identical-hash-value chain */
goto insert;
/* dummy node is the first node of the identical-hash-value chain */
@@
-925,7
+925,7
@@
void _cds_lfht_add(struct cds_lfht *ht,
goto insert;
next = rcu_dereference(clear_flag(iter)->p.next);
goto insert;
next = rcu_dereference(clear_flag(iter)->p.next);
- if (unlikely(is_removed(next)))
+ if (
caa_
unlikely(is_removed(next)))
goto gc_node;
/* uniquely add */
goto gc_node;
/* uniquely add */
@@
-1015,7
+1015,7
@@
int _cds_lfht_del(struct cds_lfht *ht, unsigned long size,
struct cds_lfht_node *new_next;
next = old;
struct cds_lfht_node *new_next;
next = old;
- if (unlikely(is_removed(next)))
+ if (
caa_
unlikely(is_removed(next)))
return -ENOENT;
if (dummy_removal)
assert(is_dummy(next));
return -ENOENT;
if (dummy_removal)
assert(is_dummy(next));
@@
-1408,20
+1408,20
@@
void cds_lfht_lookup(struct cds_lfht *ht, void *key, size_t key_len,
node = rcu_dereference(dummy_node->p.next);
node = clear_flag(node);
for (;;) {
node = rcu_dereference(dummy_node->p.next);
node = clear_flag(node);
for (;;) {
- if (unlikely(is_end(node))) {
+ if (
caa_
unlikely(is_end(node))) {
node = next = NULL;
break;
}
node = next = NULL;
break;
}
- if (unlikely(node->p.reverse_hash > reverse_hash)) {
+ if (
caa_
unlikely(node->p.reverse_hash > reverse_hash)) {
node = next = NULL;
break;
}
next = rcu_dereference(node->p.next);
assert(node == clear_flag(node));
node = next = NULL;
break;
}
next = rcu_dereference(node->p.next);
assert(node == clear_flag(node));
- if (likely(!is_removed(next))
+ if (
caa_
likely(!is_removed(next))
&& !is_dummy(next)
&& node->p.reverse_hash == reverse_hash
&& !is_dummy(next)
&& node->p.reverse_hash == reverse_hash
- && likely(!ht->compare_fct(node->key, node->key_len, key, key_len))) {
+ &&
caa_
likely(!ht->compare_fct(node->key, node->key_len, key, key_len))) {
break;
}
node = clear_flag(next);
break;
}
node = clear_flag(next);
@@
-1446,18
+1446,18
@@
void cds_lfht_next_duplicate(struct cds_lfht *ht, struct cds_lfht_iter *iter)
node = clear_flag(next);
for (;;) {
node = clear_flag(next);
for (;;) {
- if (unlikely(is_end(node))) {
+ if (
caa_
unlikely(is_end(node))) {
node = next = NULL;
break;
}
node = next = NULL;
break;
}
- if (unlikely(node->p.reverse_hash > reverse_hash)) {
+ if (
caa_
unlikely(node->p.reverse_hash > reverse_hash)) {
node = next = NULL;
break;
}
next = rcu_dereference(node->p.next);
node = next = NULL;
break;
}
next = rcu_dereference(node->p.next);
- if (likely(!is_removed(next))
+ if (
caa_
likely(!is_removed(next))
&& !is_dummy(next)
&& !is_dummy(next)
- && likely(!ht->compare_fct(node->key, node->key_len, key, key_len))) {
+ &&
caa_
likely(!ht->compare_fct(node->key, node->key_len, key, key_len))) {
break;
}
node = clear_flag(next);
break;
}
node = clear_flag(next);
@@
-1473,12
+1473,12
@@
void cds_lfht_next(struct cds_lfht *ht, struct cds_lfht_iter *iter)
node = clear_flag(iter->next);
for (;;) {
node = clear_flag(iter->next);
for (;;) {
- if (unlikely(is_end(node))) {
+ if (
caa_
unlikely(is_end(node))) {
node = next = NULL;
break;
}
next = rcu_dereference(node->p.next);
node = next = NULL;
break;
}
next = rcu_dereference(node->p.next);
- if (likely(!is_removed(next))
+ if (
caa_
likely(!is_removed(next))
&& !is_dummy(next)) {
break;
}
&& !is_dummy(next)) {
break;
}
This page took
0.045954 seconds
and
4
git commands to generate.