unsigned long start, unsigned long len);
};
-enum add_mode {
- ADD_DEFAULT = 0,
- ADD_UNIQUE = 1,
- ADD_REPLACE = 2,
-};
-
static
-struct cds_lfht_node *_cds_lfht_add(struct cds_lfht *ht,
- unsigned long size,
- struct cds_lfht_node *node,
- enum add_mode mode, int dummy);
+void _cds_lfht_add(struct cds_lfht *ht,
+ unsigned long size,
+ struct cds_lfht_node *node,
+ struct cds_lfht_iter *unique_ret,
+ int dummy);
/*
* Algorithm to reverse bits in a word by lookup table, extended to
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)));
static
int _cds_lfht_replace(struct cds_lfht *ht, unsigned long size,
struct cds_lfht_node *old_node,
- struct cds_lfht_node *ret_next,
+ struct cds_lfht_node *old_next,
struct cds_lfht_node *new_node)
{
- struct cds_lfht_node *dummy, *old_next;
+ struct cds_lfht_node *dummy, *ret_next;
struct _cds_lfht_node *lookup;
int flagged = 0;
assert(!is_removed(new_node));
assert(!is_dummy(new_node));
assert(new_node != old_node);
- do {
+ for (;;) {
/* Insert after node to be replaced */
- old_next = ret_next;
if (is_removed(old_next)) {
/*
* Too late, the old node has been removed under us
*/
ret_next = uatomic_cmpxchg(&old_node->p.next,
old_next, flag_removed(new_node));
- } while (ret_next != old_next);
+ if (ret_next == old_next)
+ break;
+ old_next = ret_next;
+ }
/* We performed the replacement. */
flagged = 1;
}
}
+/*
+ * A non-NULL unique_ret pointer uses the "add unique" (or uniquify) add
+ * mode. A NULL unique_ret allows creation of duplicate keys.
+ */
static
-struct cds_lfht_node *_cds_lfht_add(struct cds_lfht *ht,
- unsigned long size,
- struct cds_lfht_node *node,
- enum add_mode mode, int dummy)
+void _cds_lfht_add(struct cds_lfht *ht,
+ unsigned long size,
+ struct cds_lfht_node *node,
+ struct cds_lfht_iter *unique_ret,
+ 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));
assert(!is_removed(node));
if (!size) {
assert(dummy);
+ assert(!unique_ret);
node->p.next = flag_dummy(get_end());
- return node; /* Initial first add (head) */
+ return; /* Initial first add (head) */
}
lookup = lookup_bucket(ht, size, bit_reverse_ulong(node->p.reverse_hash));
for (;;) {
goto insert;
if (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 */
+ if (dummy && clear_flag(iter)->p.reverse_hash == node->p.reverse_hash)
+ goto insert;
next = rcu_dereference(clear_flag(iter)->p.next);
if (unlikely(is_removed(next)))
goto gc_node;
- if ((mode == ADD_UNIQUE || mode == ADD_REPLACE)
+ if (unique_ret
&& !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)) {
- if (mode == ADD_UNIQUE)
- return clear_flag(iter);
- else /* mode == ADD_REPLACE */
- goto replace;
+ unique_ret->node = clear_flag(iter);
+ unique_ret->next = next;
+ return;
}
/* Only account for identical reverse hash once */
if (iter_prev->p.reverse_hash != clear_flag(iter)->p.reverse_hash
new_node) != iter) {
continue; /* retry */
} else {
- if (mode == ADD_REPLACE)
- return_node = NULL;
- else /* ADD_DEFAULT and ADD_UNIQUE */
- return_node = node;
- goto gc_end;
- }
-
- replace:
-
- if (!_cds_lfht_replace(ht, size, clear_flag(iter), next,
- node)) {
- return_node = clear_flag(iter);
- goto end; /* gc already done */
- } else {
- continue; /* retry */
+ return_node = node;
+ goto end;
}
gc_node:
(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;
+ if (unique_ret) {
+ unique_ret->node = return_node;
+ /* unique_ret->next left unset, never used. */
+ }
}
static
i, j, !i ? 0 : (1UL << (i - 1)) + j);
new_node->p.reverse_hash =
bit_reverse_ulong(!i ? 0 : (1UL << (i - 1)) + j);
- (void) _cds_lfht_add(ht, !i ? 0 : (1UL << (i - 1)),
- new_node, ADD_DEFAULT, 1);
+ _cds_lfht_add(ht, !i ? 0 : (1UL << (i - 1)),
+ new_node, NULL, 1);
}
ht->cds_lfht_rcu_read_unlock();
}
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;
}
node->p.reverse_hash = bit_reverse_ulong((unsigned long) hash);
size = rcu_dereference(ht->t.size);
- (void) _cds_lfht_add(ht, size, node, ADD_DEFAULT, 0);
+ _cds_lfht_add(ht, size, node, NULL, 0);
ht_count_add(ht, size);
}
struct cds_lfht_node *node)
{
unsigned long hash, size;
- struct cds_lfht_node *ret;
+ struct cds_lfht_iter iter;
hash = ht->hash_fct(node->key, node->key_len, ht->hash_seed);
node->p.reverse_hash = bit_reverse_ulong((unsigned long) hash);
size = rcu_dereference(ht->t.size);
- ret = _cds_lfht_add(ht, size, node, ADD_UNIQUE, 0);
- if (ret == node)
+ _cds_lfht_add(ht, size, node, &iter, 0);
+ if (iter.node == node)
ht_count_add(ht, size);
- return ret;
+ return iter.node;
}
struct cds_lfht_node *cds_lfht_add_replace(struct cds_lfht *ht,
struct cds_lfht_node *node)
{
unsigned long hash, size;
- struct cds_lfht_node *ret;
+ struct cds_lfht_iter iter;
hash = ht->hash_fct(node->key, node->key_len, ht->hash_seed);
node->p.reverse_hash = bit_reverse_ulong((unsigned long) hash);
size = rcu_dereference(ht->t.size);
- ret = _cds_lfht_add(ht, size, node, ADD_REPLACE, 0);
- if (ret == NULL)
- ht_count_add(ht, size);
- return ret;
+ for (;;) {
+ _cds_lfht_add(ht, size, node, &iter, 0);
+ if (iter.node == node) {
+ ht_count_add(ht, size);
+ return NULL;
+ }
+
+ if (!_cds_lfht_replace(ht, size, iter.node, iter.next, node))
+ return iter.node;
+ }
}
int cds_lfht_replace(struct cds_lfht *ht, struct cds_lfht_iter *old_iter,