X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=ffd8e2f774111625be67d5698caef5216fe11dde;hb=5567839e38c20a97960b6472bddbfd7eb6d9bc40;hp=0af6eebf6b781caa4edf0bc35116afa0991b92c6;hpb=6d5c0ca90ae4e999cdf4366ff615a6c619e7257e;p=urcu.git diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c index 0af6eeb..ffd8e2f 100644 --- a/tests/test_urcu_hash.c +++ b/tests/test_urcu_hash.c @@ -66,13 +66,14 @@ static inline pid_t gettid(void) #else #define debug_yield_read() #endif -#include +#include #include #include struct wr_count { unsigned long update_ops; unsigned long add; + unsigned long add_exist; unsigned long remove; }; @@ -84,7 +85,7 @@ static unsigned long __thread nr_delnoent; static unsigned long __thread lookup_fail; static unsigned long __thread lookup_ok; -static struct rcu_ht *test_ht; +static struct cds_lfht *test_ht; struct test_data { int a; @@ -115,7 +116,7 @@ static int verbose_mode; #define printf_verbose(fmt, args...) \ do { \ if (verbose_mode) \ - printf(fmt, args); \ + printf(fmt, ## args); \ } while (0) static unsigned int cpu_affinities[NR_CPUS]; @@ -338,7 +339,7 @@ unsigned long test_compare(void *key1, size_t key1_len, void *thr_reader(void *_count) { unsigned long long *count = _count; - struct rcu_ht_node *node; + struct cds_lfht_node *node; printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", "reader", pthread_self(), (unsigned long)gettid()); @@ -354,7 +355,7 @@ void *thr_reader(void *_count) for (;;) { rcu_read_lock(); - node = ht_lookup(test_ht, + node = cds_lfht_lookup(test_ht, (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool), sizeof(void *)); if (node == NULL) @@ -368,6 +369,8 @@ void *thr_reader(void *_count) nr_reads++; if (unlikely(!test_duration_read())) break; + if (unlikely((nr_reads & ((1 << 10) - 1)) == 0)) + rcu_quiescent_state(); } rcu_unregister_thread(); @@ -384,14 +387,14 @@ void *thr_reader(void *_count) static void free_node_cb(struct rcu_head *head) { - struct rcu_ht_node *node = - caa_container_of(head, struct rcu_ht_node, head); + struct cds_lfht_node *node = + caa_container_of(head, struct cds_lfht_node, head); free(node); } void *thr_writer(void *_count) { - struct rcu_ht_node *node, *ret_node; + struct cds_lfht_node *node, *ret_node; struct wr_count *count = _count; int ret; @@ -409,15 +412,15 @@ void *thr_writer(void *_count) for (;;) { if (add_only || rand_r(&rand_lookup) & 1) { - node = malloc(sizeof(struct rcu_ht_node)); + node = malloc(sizeof(struct cds_lfht_node)); rcu_read_lock(); - ht_node_init(node, + cds_lfht_node_init(node, (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool), sizeof(void *)); if (add_unique) - ret_node = ht_add_unique(test_ht, node); + ret_node = cds_lfht_add_unique(test_ht, node); else - ht_add(test_ht, node); + cds_lfht_add(test_ht, node); rcu_read_unlock(); if (add_unique && ret_node != node) { free(node); @@ -427,11 +430,11 @@ void *thr_writer(void *_count) } else { /* May delete */ rcu_read_lock(); - node = ht_lookup(test_ht, + node = cds_lfht_lookup(test_ht, (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool), sizeof(void *)); if (node) - ret = ht_remove(test_ht, node); + ret = cds_lfht_remove(test_ht, node); else ret = -ENOENT; rcu_read_unlock(); @@ -458,6 +461,8 @@ void *thr_writer(void *_count) break; if (unlikely(wdelay)) loop_sleep(wdelay); + if (unlikely((nr_writes & ((1 << 10) - 1)) == 0)) + rcu_quiescent_state(); } rcu_unregister_thread(); @@ -469,6 +474,7 @@ void *thr_writer(void *_count) nr_addexist, nr_del, nr_delnoent); count->update_ops = nr_writes; count->add = nr_add; + count->add_exist = nr_addexist; count->remove = nr_del; return ((void*)2); } @@ -498,7 +504,7 @@ int main(int argc, char **argv) unsigned long long *count_reader; struct wr_count *count_writer; unsigned long long tot_reads = 0, tot_writes = 0, - tot_add = 0, tot_remove = 0; + tot_add = 0, tot_add_exist = 0, tot_remove = 0; unsigned long count, removed; int i, a, ret; @@ -610,7 +616,7 @@ int main(int argc, char **argv) tid_writer = malloc(sizeof(*tid_writer) * nr_writers); count_reader = malloc(sizeof(*count_reader) * nr_readers); count_writer = malloc(sizeof(*count_writer) * nr_writers); - test_ht = ht_new(test_hash, test_compare, 0x42UL, + test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL, init_hash_size, call_rcu); err = create_all_cpu_call_rcu_data(0); @@ -651,24 +657,31 @@ int main(int argc, char **argv) exit(1); tot_writes += count_writer[i].update_ops; tot_add += count_writer[i].add; + tot_add_exist += count_writer[i].add_exist; tot_remove += count_writer[i].remove; } - ht_count_nodes(test_ht, &count, &removed); + printf("Counting nodes... "); + fflush(stdout); + cds_lfht_count_nodes(test_ht, &count, &removed); + printf("done.\n"); if (count || removed) printf("WARNING: nodes left in the hash table upon destroy: " "%lu nodes + %lu logically removed.\n", count, removed); - (void) ht_destroy(test_ht); + ret = cds_lfht_destroy(test_ht); - printf_verbose("final delete: %d items\n", ret); + if (ret) + printf_verbose("final delete aborted\n"); + else + printf_verbose("final delete success\n"); printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads, tot_writes); printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu " "nr_writers %3u " "wdelay %6lu rand_pool %12llu nr_reads %12llu nr_writes %12llu nr_ops %12llu " - "nr_add %12llu nr_remove %12llu nr_leaked %12llu\n", + "nr_add %12llu nr_add_fail %12llu nr_remove %12llu nr_leaked %12llu\n", argv[0], duration, nr_readers, rduration, nr_writers, wdelay, rand_pool, tot_reads, tot_writes, - tot_reads + tot_writes, tot_add, tot_remove, + tot_reads + tot_writes, tot_add, tot_add_exist, tot_remove, tot_add - tot_remove - count); free(tid_reader); free(tid_writer);