struct lfht_test_node {
struct cds_lfht_node node;
+ void *key;
+ unsigned int key_len;
/* cache-cold for iteration */
struct rcu_head head;
};
void lfht_test_node_init(struct lfht_test_node *node, void *key,
size_t key_len)
{
- cds_lfht_node_init(&node->node, key, key_len);
+ cds_lfht_node_init(&node->node);
+ node->key = key;
+ node->key_len = key_len;
}
static inline struct lfht_test_node *
#if (CAA_BITS_PER_LONG == 32)
static
-unsigned long test_hash(void *_key, size_t length, unsigned long seed)
+unsigned long test_hash(const void *_key, size_t length, unsigned long seed)
{
unsigned int key = (unsigned int) _key;
}
#else
static
-unsigned long test_hash(void *_key, size_t length, unsigned long seed)
+unsigned long test_hash(const void *_key, size_t length, unsigned long seed)
{
union {
uint64_t v64;
#endif
static
-unsigned long test_compare(void *key1, size_t key1_len,
- void *key2, size_t key2_len)
+unsigned long test_compare(const void *key1, size_t key1_len,
+ const void *key2, size_t key2_len)
{
if (caa_unlikely(key1_len != key2_len))
return -1;
}
static
-int test_match(struct cds_lfht_node *node, void *arg)
+int test_match(struct cds_lfht_node *node, const void *key)
{
- return !test_compare(node->key, node->key_len,
- arg, sizeof(unsigned long));
+ struct lfht_test_node *test_node = to_test_node(node);
+
+ return !test_compare(test_node->key, test_node->key_len,
+ key, sizeof(unsigned long));
}
static
{
assert(key_len == sizeof(unsigned long));
- cds_lfht_lookup(ht, test_match,
- test_hash(key, key_len, TEST_HASH_SEED),
- key, iter);
+ cds_lfht_lookup(ht, test_hash(key, key_len, TEST_HASH_SEED),
+ test_match, key, iter);
}
void *thr_count(void *arg)
sizeof(void *));
rcu_read_lock();
if (add_unique) {
- ret_node = cds_lfht_add_unique(test_ht, test_match,
- test_hash(node->node.key, node->node.key_len, TEST_HASH_SEED),
- &node->node);
+ ret_node = cds_lfht_add_unique(test_ht,
+ test_hash(node->key, node->key_len, TEST_HASH_SEED),
+ test_match, node->key, &node->node);
} else {
if (add_replace)
- ret_node = cds_lfht_add_replace(test_ht, test_match,
- test_hash(node->node.key, node->node.key_len, TEST_HASH_SEED),
- &node->node);
+ ret_node = cds_lfht_add_replace(test_ht,
+ test_hash(node->key, node->key_len, TEST_HASH_SEED),
+ test_match, node->key, &node->node);
else
cds_lfht_add(test_ht,
- test_hash(node->node.key, node->node.key_len, TEST_HASH_SEED),
+ test_hash(node->key, node->key_len, TEST_HASH_SEED),
&node->node);
}
rcu_read_unlock();
sizeof(void *));
rcu_read_lock();
if (add_unique) {
- ret_node = cds_lfht_add_unique(test_ht, test_match,
- test_hash(node->node.key, node->node.key_len, TEST_HASH_SEED),
- &node->node);
+ ret_node = cds_lfht_add_unique(test_ht,
+ test_hash(node->key, node->key_len, TEST_HASH_SEED),
+ test_match, node->key, &node->node);
} else {
if (add_replace)
- ret_node = cds_lfht_add_replace(test_ht, test_match,
- test_hash(node->node.key, node->node.key_len, TEST_HASH_SEED),
- &node->node);
+ ret_node = cds_lfht_add_replace(test_ht,
+ test_hash(node->key, node->key_len, TEST_HASH_SEED),
+ test_match, node->key, &node->node);
else
cds_lfht_add(test_ht,
- test_hash(node->node.key, node->node.key_len, TEST_HASH_SEED),
+ test_hash(node->key, node->key_len, TEST_HASH_SEED),
&node->node);
}
rcu_read_unlock();
struct lfht_test_node *node;
unsigned long count = 0;
- cds_lfht_first(ht, &iter);
- while ((node = cds_lfht_iter_get_test_node(&iter)) != NULL) {
+ cds_lfht_for_each_entry(ht, &iter, node, node) {
int ret;
ret = cds_lfht_del(test_ht, &iter);
assert(!ret);
call_rcu(&node->head, free_node_cb);
- cds_lfht_next(ht, &iter);
count++;
}
printf("deleted %lu nodes.\n", count);