X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=80169127dcd3121b59cd9d6b082ec2a0eaa30960;hb=3967a8a8984fe5cb7ac83996db6709c8aae857c2;hp=c3ea83f2b62ec68f269e0d51ab38bd55c338fffc;hpb=14044b37bb7ba51676f1c3f139facae9b06dbc51;p=urcu.git diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c index c3ea83f..8016912 100644 --- a/tests/test_urcu_hash.c +++ b/tests/test_urcu_hash.c @@ -1,5 +1,5 @@ /* - * test_ht.c + * test_urcu_hash.c * * Userspace RCU library - test program * @@ -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; }; @@ -101,6 +102,7 @@ static unsigned long duration; static unsigned long rduration; static unsigned long init_hash_size = DEFAULT_HASH_SIZE; +static unsigned long init_populate; static unsigned long rand_pool = DEFAULT_RAND_POOL; static int add_only, add_unique; @@ -149,6 +151,31 @@ static void set_affinity(void) sched_setaffinity(0, sizeof(mask), &mask); } +static enum { + AR_RANDOM = 0, + AR_ADD = 1, + AR_REMOVE = -1, +} addremove; /* 1: add, -1 remove, 0: random */ + +static +void sigusr1_handler(int signo) +{ + switch (addremove) { + case AR_ADD: + printf("Add/Remove: random.\n"); + addremove = AR_RANDOM; + break; + case AR_RANDOM: + printf("Add/Remove: remove only.\n"); + addremove = AR_REMOVE; + break; + case AR_REMOVE: + printf("Add/Remove: add only.\n"); + addremove = AR_ADD; + break; + } +} + /* * returns 0 if test should end. */ @@ -368,6 +395,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(); @@ -408,7 +437,8 @@ void *thr_writer(void *_count) cmm_smp_mb(); for (;;) { - if (add_only || rand_r(&rand_lookup) & 1) { + if ((addremove == AR_ADD || add_only) + || (addremove == AR_RANDOM && rand_r(&rand_lookup) & 1)) { node = malloc(sizeof(struct cds_lfht_node)); rcu_read_lock(); cds_lfht_node_init(node, @@ -458,6 +488,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,10 +501,44 @@ 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); } +static int populate_hash(void) +{ + struct cds_lfht_node *node, *ret_node; + + if (!init_populate) + return 0; + + if (add_unique && init_populate * 10 > rand_pool) { + printf("WARNING: required to populate %lu nodes (-k), but random " +"pool is quite small (%lu values) and we are in add_unique (-u) mode. Try with a " +"larger random pool (-p option).\n", init_populate, rand_pool); + return -1; + } + + while (nr_add < init_populate) { + node = malloc(sizeof(struct cds_lfht_node)); + cds_lfht_node_init(node, + (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool), + sizeof(void *)); + if (add_unique) + ret_node = cds_lfht_add_unique(test_ht, node); + else + cds_lfht_add(test_ht, node); + if (add_unique && ret_node != node) { + free(node); + nr_addexist++; + } else + nr_add++; + nr_writes++; + } + return 0; +} + void show_usage(int argc, char **argv) { printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]); @@ -487,6 +553,7 @@ void show_usage(int argc, char **argv) printf(" [-h size] (initial hash table size)"); printf(" [-u] Uniquify add."); printf(" [-i] Add only (no removal)."); + printf(" [-k nr_nodes] Number of nodes to insert initially."); printf("\n"); } @@ -498,9 +565,11 @@ 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; + struct sigaction act; + unsigned int remain; if (argc < 4) { show_usage(argc, argv); @@ -584,6 +653,9 @@ int main(int argc, char **argv) case 'i': add_only = 1; break; + case 'k': + init_populate = atol(argv[++i]); + break; } } @@ -594,6 +666,20 @@ int main(int argc, char **argv) return -1; } + memset(&act, 0, sizeof(act)); + ret = sigemptyset(&act.sa_mask); + if (ret == -1) { + perror("sigemptyset"); + return -1; + } + act.sa_handler = sigusr1_handler; + act.sa_flags = SA_RESTART; + ret = sigaction(SIGUSR1, &act, NULL); + if (ret == -1) { + perror("sigaction"); + return -1; + } + printf_verbose("running test for %lu seconds, %u readers, %u writers.\n", duration, nr_readers, nr_writers); printf_verbose("Writer delay : %lu loops.\n", wdelay); @@ -612,7 +698,8 @@ int main(int argc, char **argv) count_writer = malloc(sizeof(*count_writer) * nr_writers); test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL, init_hash_size, call_rcu); - + ret = populate_hash(); + assert(!ret); err = create_all_cpu_call_rcu_data(0); assert(!err); @@ -635,7 +722,10 @@ int main(int argc, char **argv) test_go = 1; - sleep(duration); + remain = duration; + do { + remain = sleep(remain); + } while (remain > 0); test_stop = 1; @@ -651,6 +741,7 @@ 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; } printf("Counting nodes... "); @@ -671,11 +762,11 @@ int main(int argc, char **argv) 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 %12lld\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_add - tot_remove - count); + tot_reads + tot_writes, tot_add, tot_add_exist, tot_remove, + (long long) tot_add + init_populate - tot_remove - count); free(tid_reader); free(tid_writer); free(count_reader);