projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup duplicated code
[urcu.git]
/
tests
/
test_urcu_hash.c
diff --git
a/tests/test_urcu_hash.c
b/tests/test_urcu_hash.c
index 87c4ad13781393a1d3aeb522f0e8c4406e52d037..043a33a9353105eac57e2363693bdfb41c49f12c 100644
(file)
--- a/
tests/test_urcu_hash.c
+++ b/
tests/test_urcu_hash.c
@@
-384,7
+384,7
@@
void hashword2(
#if (CAA_BITS_PER_LONG == 32)
static
#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;
{
unsigned int key = (unsigned int) _key;
@@
-393,7
+393,7
@@
unsigned long test_hash(void *_key, size_t length, unsigned long seed)
}
#else
static
}
#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;
{
union {
uint64_t v64;
@@
-413,8
+413,8
@@
unsigned long test_hash(void *_key, size_t length, unsigned long seed)
#endif
static
#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;
{
if (caa_unlikely(key1_len != key2_len))
return -1;
@@
-426,7
+426,7
@@
unsigned long test_compare(void *key1, size_t key1_len,
}
static
}
static
-int test_match(struct cds_lfht_node *node, void *key)
+int test_match(struct cds_lfht_node *node,
const
void *key)
{
struct lfht_test_node *test_node = to_test_node(node);
{
struct lfht_test_node *test_node = to_test_node(node);
@@
-440,9
+440,8
@@
void cds_lfht_test_lookup(struct cds_lfht *ht, void *key, size_t key_len,
{
assert(key_len == sizeof(unsigned long));
{
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)
}
void *thr_count(void *arg)
@@
-577,14
+576,14
@@
void *thr_writer(void *_count)
sizeof(void *));
rcu_read_lock();
if (add_unique) {
sizeof(void *));
rcu_read_lock();
if (add_unique) {
- ret_node = cds_lfht_add_unique(test_ht,
test_match, node->key,
+ ret_node = cds_lfht_add_unique(test_ht,
test_hash(node->key, node->key_len, TEST_HASH_SEED),
test_hash(node->key, node->key_len, TEST_HASH_SEED),
- &node->node);
+
test_match, node->key,
&node->node);
} else {
if (add_replace)
} else {
if (add_replace)
- ret_node = cds_lfht_add_replace(test_ht,
test_match, node->key,
+ ret_node = cds_lfht_add_replace(test_ht,
test_hash(node->key, node->key_len, TEST_HASH_SEED),
test_hash(node->key, node->key_len, TEST_HASH_SEED),
- &node->node);
+
test_match, node->key,
&node->node);
else
cds_lfht_add(test_ht,
test_hash(node->key, node->key_len, TEST_HASH_SEED),
else
cds_lfht_add(test_ht,
test_hash(node->key, node->key_len, TEST_HASH_SEED),
@@
-674,14
+673,14
@@
static int populate_hash(void)
sizeof(void *));
rcu_read_lock();
if (add_unique) {
sizeof(void *));
rcu_read_lock();
if (add_unique) {
- ret_node = cds_lfht_add_unique(test_ht,
test_match, node->key,
+ ret_node = cds_lfht_add_unique(test_ht,
test_hash(node->key, node->key_len, TEST_HASH_SEED),
test_hash(node->key, node->key_len, TEST_HASH_SEED),
- &node->node);
+
test_match, node->key,
&node->node);
} else {
if (add_replace)
} else {
if (add_replace)
- ret_node = cds_lfht_add_replace(test_ht,
test_match, node->key,
+ ret_node = cds_lfht_add_replace(test_ht,
test_hash(node->key, node->key_len, TEST_HASH_SEED),
test_hash(node->key, node->key_len, TEST_HASH_SEED),
- &node->node);
+
test_match, node->key,
&node->node);
else
cds_lfht_add(test_ht,
test_hash(node->key, node->key_len, TEST_HASH_SEED),
else
cds_lfht_add(test_ht,
test_hash(node->key, node->key_len, TEST_HASH_SEED),
@@
-711,14
+710,12
@@
void test_delete_all_nodes(struct cds_lfht *ht)
struct lfht_test_node *node;
unsigned long count = 0;
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);
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);
count++;
}
printf("deleted %lu nodes.\n", count);
@@
-899,7
+896,7
@@
int main(int argc, char **argv)
return -1;
}
return -1;
}
- if (min_hash_alloc_size && min_hash_alloc_size
*
(min_hash_alloc_size - 1)) {
+ if (min_hash_alloc_size && min_hash_alloc_size
&
(min_hash_alloc_size - 1)) {
printf("Error: Min hash alloc size %lu is not a power of 2.\n",
min_hash_alloc_size);
return -1;
printf("Error: Min hash alloc size %lu is not a power of 2.\n",
min_hash_alloc_size);
return -1;
@@
-970,7
+967,7
@@
int main(int argc, char **argv)
* thread from the point of view of resize.
*/
rcu_register_thread();
* thread from the point of view of resize.
*/
rcu_register_thread();
- test_ht = cds_lfht_new(init_hash_size, min_hash_alloc_size,
+ test_ht = cds_lfht_new(init_hash_size, min_hash_alloc_size,
(1UL << 18),
(opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0) |
CDS_LFHT_ACCOUNTING, NULL);
ret = populate_hash();
(opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0) |
CDS_LFHT_ACCOUNTING, NULL);
ret = populate_hash();
This page took
0.025156 seconds
and
4
git commands to generate.