X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=31113533b25187cbf71c0fd8832671d8addc24d1;hb=0422d92c2d658f6093b8209f75808efd2109a110;hp=25f872f7319a03f3a1c1847aee7e7efcf9d8dcf0;hpb=8ed51e048a8e89b09cca31271d640bbaa521c74a;p=urcu.git diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c index 25f872f..3111353 100644 --- a/tests/test_urcu_hash.c +++ b/tests/test_urcu_hash.c @@ -41,6 +41,8 @@ #define DEFAULT_MIN_ALLOC_SIZE 1 #define DEFAULT_RAND_POOL 1000000 +#define TEST_HASH_SEED 0x42UL + /* Make this big enough to include the POWER5+ L3 cacheline size of 256B */ #define CACHE_LINE_SIZE 4096 @@ -105,6 +107,31 @@ struct test_data { int b; }; +struct lfht_test_node { + struct cds_lfht_node node; + /* cache-cold for iteration */ + struct rcu_head head; +}; + +static inline struct lfht_test_node * +to_test_node(struct cds_lfht_node *node) +{ + return caa_container_of(node, struct lfht_test_node, node); +} + +static inline +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); +} + +static inline struct lfht_test_node * +cds_lfht_iter_get_test_node(struct cds_lfht_iter *iter) +{ + return to_test_node(cds_lfht_iter_get_node(iter)); +} + static volatile int test_go, test_stop; static unsigned long wdelay; @@ -394,6 +421,24 @@ unsigned long test_compare(void *key1, size_t key1_len, return 1; } +static +int test_match(struct cds_lfht_node *node, void *arg) +{ + return !test_compare(node->key, node->key_len, + arg, sizeof(unsigned long)); +} + +static +void cds_lfht_test_lookup(struct cds_lfht *ht, void *key, size_t key_len, + struct cds_lfht_iter *iter) +{ + assert(key_len == sizeof(unsigned long)); + + cds_lfht_lookup(ht, test_match, + test_hash(key, key_len, TEST_HASH_SEED), + key, iter); +} + void *thr_count(void *arg) { printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", @@ -437,7 +482,7 @@ void *thr_count(void *arg) void *thr_reader(void *_count) { unsigned long long *count = _count; - struct cds_lfht_node *node; + struct lfht_test_node *node; struct cds_lfht_iter iter; printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", @@ -454,10 +499,10 @@ void *thr_reader(void *_count) for (;;) { rcu_read_lock(); - cds_lfht_lookup(test_ht, + cds_lfht_test_lookup(test_ht, (void *)(((unsigned long) rand_r(&rand_lookup) % lookup_pool_size) + lookup_pool_offset), sizeof(void *), &iter); - node = cds_lfht_iter_get_node(&iter); + node = cds_lfht_iter_get_test_node(&iter); if (node == NULL) { if (validate_lookup) { printf("[ERROR] Lookup cannot find initial node.\n"); @@ -492,14 +537,15 @@ void *thr_reader(void *_count) static void free_node_cb(struct rcu_head *head) { - struct cds_lfht_node *node = - caa_container_of(head, struct cds_lfht_node, head); + struct lfht_test_node *node = + caa_container_of(head, struct lfht_test_node, head); free(node); } void *thr_writer(void *_count) { - struct cds_lfht_node *node, *ret_node; + struct lfht_test_node *node; + struct cds_lfht_node *ret_node; struct cds_lfht_iter iter; struct wr_count *count = _count; int ret; @@ -519,26 +565,33 @@ void *thr_writer(void *_count) for (;;) { if ((addremove == AR_ADD || add_only) || (addremove == AR_RANDOM && rand_r(&rand_lookup) & 1)) { - node = malloc(sizeof(struct cds_lfht_node)); - cds_lfht_node_init(node, + node = malloc(sizeof(struct lfht_test_node)); + lfht_test_node_init(node, (void *)(((unsigned long) rand_r(&rand_lookup) % write_pool_size) + write_pool_offset), sizeof(void *)); rcu_read_lock(); if (add_unique) { - ret_node = cds_lfht_add_unique(test_ht, node); + ret_node = cds_lfht_add_unique(test_ht, test_match, + test_hash(node->node.key, node->node.key_len, TEST_HASH_SEED), + &node->node); } else { if (add_replace) - ret_node = cds_lfht_add_replace(test_ht, node); + ret_node = cds_lfht_add_replace(test_ht, test_match, + test_hash(node->node.key, node->node.key_len, TEST_HASH_SEED), + &node->node); else - cds_lfht_add(test_ht, node); + cds_lfht_add(test_ht, + test_hash(node->node.key, node->node.key_len, TEST_HASH_SEED), + &node->node); } rcu_read_unlock(); - if (add_unique && ret_node != node) { + if (add_unique && ret_node != &node->node) { free(node); nr_addexist++; } else { if (add_replace && ret_node) { - call_rcu(&ret_node->head, free_node_cb); + call_rcu(&to_test_node(ret_node)->head, + free_node_cb); nr_addexist++; } else { nr_add++; @@ -547,13 +600,13 @@ void *thr_writer(void *_count) } else { /* May delete */ rcu_read_lock(); - cds_lfht_lookup(test_ht, + cds_lfht_test_lookup(test_ht, (void *)(((unsigned long) rand_r(&rand_lookup) % write_pool_size) + write_pool_offset), sizeof(void *), &iter); ret = cds_lfht_del(test_ht, &iter); rcu_read_unlock(); if (ret == 0) { - node = cds_lfht_iter_get_node(&iter); + node = cds_lfht_iter_get_test_node(&iter); call_rcu(&node->head, free_node_cb); nr_del++; } else @@ -596,7 +649,8 @@ void *thr_writer(void *_count) static int populate_hash(void) { - struct cds_lfht_node *node, *ret_node; + struct lfht_test_node *node; + struct cds_lfht_node *ret_node; if (!init_populate) return 0; @@ -608,26 +662,32 @@ static int populate_hash(void) } while (nr_add < init_populate) { - node = malloc(sizeof(struct cds_lfht_node)); - cds_lfht_node_init(node, + node = malloc(sizeof(struct lfht_test_node)); + lfht_test_node_init(node, (void *)(((unsigned long) rand_r(&rand_lookup) % init_pool_size) + init_pool_offset), sizeof(void *)); rcu_read_lock(); if (add_unique) { - ret_node = cds_lfht_add_unique(test_ht, node); + ret_node = cds_lfht_add_unique(test_ht, test_match, + test_hash(node->node.key, node->node.key_len, TEST_HASH_SEED), + &node->node); } else { if (add_replace) - ret_node = cds_lfht_add_replace(test_ht, node); + ret_node = cds_lfht_add_replace(test_ht, test_match, + test_hash(node->node.key, node->node.key_len, TEST_HASH_SEED), + &node->node); else - cds_lfht_add(test_ht, node); + cds_lfht_add(test_ht, + test_hash(node->node.key, node->node.key_len, TEST_HASH_SEED), + &node->node); } rcu_read_unlock(); - if (add_unique && ret_node != node) { + if (add_unique && ret_node != &node->node) { free(node); nr_addexist++; } else { if (add_replace && ret_node) { - call_rcu(&ret_node->head, free_node_cb); + call_rcu(&to_test_node(ret_node)->head, free_node_cb); nr_addexist++; } else { nr_add++; @@ -642,11 +702,11 @@ static void test_delete_all_nodes(struct cds_lfht *ht) { struct cds_lfht_iter iter; - struct cds_lfht_node *node; + struct lfht_test_node *node; unsigned long count = 0; cds_lfht_first(ht, &iter); - while ((node = cds_lfht_iter_get_node(&iter)) != NULL) { + while ((node = cds_lfht_iter_get_test_node(&iter)) != NULL) { int ret; ret = cds_lfht_del(test_ht, &iter); @@ -904,8 +964,7 @@ int main(int argc, char **argv) * thread from the point of view of resize. */ rcu_register_thread(); - test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL, - init_hash_size, min_hash_alloc_size, + test_ht = cds_lfht_new(init_hash_size, min_hash_alloc_size, (opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0) | CDS_LFHT_ACCOUNTING, NULL); ret = populate_hash();