X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=3a87d483f9a15ad981b0af52e0198a70ea55db1c;hb=151e7a93d1cb77c3f7c78370ce1eee2c6a49e690;hp=be0eaf4f6e746864ff8093503999cb1304144016;hpb=3c16bf4b5cae53ee352482072bec2e326477d8b3;p=urcu.git diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c index be0eaf4..3a87d48 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,7 +66,7 @@ static inline pid_t gettid(void) #else #define debug_yield_read() #endif -#include +#include #include #include @@ -102,7 +102,9 @@ 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 opt_auto_resize; static int add_only, add_unique; static inline void loop_sleep(unsigned long l) @@ -150,6 +152,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. */ @@ -369,6 +396,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(); @@ -409,7 +438,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, @@ -459,6 +489,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(); @@ -475,6 +507,39 @@ void *thr_writer(void *_count) 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]); @@ -489,6 +554,8 @@ 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(" [-A] Automatically resize hash table."); printf("\n"); } @@ -503,6 +570,8 @@ int main(int argc, char **argv) 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); @@ -586,6 +655,12 @@ int main(int argc, char **argv) case 'i': add_only = 1; break; + case 'k': + init_populate = atol(argv[++i]); + break; + case 'A': + opt_auto_resize = 1; + break; } } @@ -596,6 +671,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); @@ -613,8 +702,11 @@ int main(int argc, char **argv) count_reader = malloc(sizeof(*count_reader) * nr_readers); count_writer = malloc(sizeof(*count_writer) * nr_writers); test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL, - init_hash_size, call_rcu); - + init_hash_size, + opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0, + call_rcu, synchronize_rcu); + ret = populate_hash(); + assert(!ret); err = create_all_cpu_call_rcu_data(0); assert(!err); @@ -637,7 +729,10 @@ int main(int argc, char **argv) test_go = 1; - sleep(duration); + remain = duration; + do { + remain = sleep(remain); + } while (remain > 0); test_stop = 1; @@ -674,11 +769,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_add_fail %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_add_exist, tot_remove, - tot_add - tot_remove - count); + (long long) tot_add + init_populate - tot_remove - count); free(tid_reader); free(tid_writer); free(count_reader);