X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=d7c2fc2da4098ea37de585590564e403032fadbe;hp=e8c51d86acaa4043391b91f1262755c654d28682;hb=5f51139190536f948f9571fdf3c97cf0198356d0;hpb=658744f695e314f2a445d04f9b818d713fc5246f diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c index e8c51d8..d7c2fc2 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 * @@ -37,8 +37,8 @@ #include #endif -#define HASH_SIZE 32 -#define RAND_POOL 1000000 +#define DEFAULT_HASH_SIZE 32 +#define DEFAULT_RAND_POOL 1000000 /* Make this big enough to include the POWER5+ L3 cacheline size of 256B */ #define CACHE_LINE_SIZE 4096 @@ -46,6 +46,18 @@ /* hardcoded number of CPUs */ #define NR_CPUS 16384 +#ifdef POISON_FREE +#define poison_free(ptr) \ + do { \ + memset(ptr, 0x42, sizeof(*(ptr))); \ + free(ptr); \ + } while (0) +#else +#define poison_free(ptr) free(ptr) +#endif + + + #if defined(_syscall0) _syscall0(pid_t, gettid) #elif defined(__NR_gettid) @@ -66,13 +78,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 +97,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; @@ -100,6 +113,12 @@ static unsigned long duration; /* read-side C.S. duration, in loops */ 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) { while(l-- != 0) @@ -111,7 +130,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]; @@ -145,6 +164,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. */ @@ -334,7 +378,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()); @@ -350,8 +394,8 @@ void *thr_reader(void *_count) for (;;) { rcu_read_lock(); - node = ht_lookup(test_ht, - (void *)(unsigned long)(rand_r(&rand_lookup) % RAND_POOL), + node = cds_lfht_lookup(test_ht, + (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool), sizeof(void *)); if (node == NULL) lookup_fail++; @@ -364,6 +408,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(); @@ -380,14 +426,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; + struct cds_lfht_node *node, *ret_node; struct wr_count *count = _count; int ret; @@ -404,15 +450,19 @@ void *thr_writer(void *_count) cmm_smp_mb(); for (;;) { - if (rand_r(&rand_lookup) & 1) { - node = malloc(sizeof(struct rcu_ht_node)); + if ((addremove == AR_ADD || add_only) + || (addremove == AR_RANDOM && rand_r(&rand_lookup) & 1)) { + node = malloc(sizeof(struct cds_lfht_node)); rcu_read_lock(); - ht_node_init(node, - (void *)(unsigned long)(rand_r(&rand_lookup) % RAND_POOL), + cds_lfht_node_init(node, + (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool), sizeof(void *)); - ret = ht_add_unique(test_ht, node); + if (add_unique) + ret_node = cds_lfht_add_unique(test_ht, node); + else + cds_lfht_add(test_ht, node); rcu_read_unlock(); - if (ret) { + if (add_unique && ret_node != node) { free(node); nr_addexist++; } else @@ -420,11 +470,11 @@ void *thr_writer(void *_count) } else { /* May delete */ rcu_read_lock(); - node = ht_lookup(test_ht, - (void *)(unsigned long)(rand_r(&rand_lookup) % RAND_POOL), + 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(); @@ -451,6 +501,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(); @@ -462,10 +514,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]); @@ -476,6 +562,12 @@ void show_usage(int argc, char **argv) printf(" [-c duration] (reader C.S. duration (in loops))"); printf(" [-v] (verbose output)"); printf(" [-a cpu#] [-a cpu#]... (affinity)"); + printf(" [-p size] (random key value pool size)"); + 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"); } @@ -487,9 +579,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); @@ -553,13 +647,65 @@ int main(int argc, char **argv) case 'v': verbose_mode = 1; break; + case 'p': + if (argc < i + 2) { + show_usage(argc, argv); + return -1; + } + rand_pool = atol(argv[++i]); + break; + case 'h': + if (argc < i + 2) { + show_usage(argc, argv); + return -1; + } + init_hash_size = atol(argv[++i]); + break; + case 'u': + add_unique = 1; + break; + case 'i': + add_only = 1; + break; + case 'k': + init_populate = atol(argv[++i]); + break; + case 'A': + opt_auto_resize = 1; + break; } } + /* Check if hash size is power of 2 */ + if (init_hash_size && init_hash_size & (init_hash_size - 1)) { + printf("Error: Hash table size %lu is not a power of 2.\n", + init_hash_size); + 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); printf_verbose("Reader duration : %lu loops.\n", rduration); + printf_verbose("Random pool size : %lu.\n", rand_pool); + printf_verbose("Mode:%s%s.\n", + add_only ? " add only" : " add/remove", + add_unique ? " uniquify" : ""); + printf_verbose("Initial hash table size: %lu buckets.\n", init_hash_size); printf_verbose("thread %-6s, thread id : %lx, tid %lu\n", "main", pthread_self(), (unsigned long)gettid()); @@ -567,8 +713,17 @@ 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, - HASH_SIZE, call_rcu); + test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL, + init_hash_size, + opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0, + call_rcu, synchronize_rcu, rcu_read_lock, + rcu_read_unlock, rcu_thread_offline, + rcu_thread_online); + ret = populate_hash(); + assert(!ret); + err = create_all_cpu_call_rcu_data(0); + assert(!err); + next_aff = 0; for (i = 0; i < nr_readers; i++) { @@ -588,7 +743,10 @@ int main(int argc, char **argv) test_go = 1; - sleep(duration); + remain = duration; + do { + remain = sleep(remain); + } while (remain > 0); test_stop = 1; @@ -604,25 +762,33 @@ 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 nr_reads %12llu nr_writes %12llu nr_ops %12llu " - "nr_add %12llu nr_remove %12llu nr_leaked %12llu\n", + "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 %12lld\n", argv[0], duration, nr_readers, rduration, - nr_writers, wdelay, tot_reads, tot_writes, - tot_reads + tot_writes, tot_add, tot_remove, - tot_add - tot_remove - count); + nr_writers, wdelay, rand_pool, tot_reads, tot_writes, + tot_reads + tot_writes, tot_add, tot_add_exist, tot_remove, + (long long) tot_add + init_populate - tot_remove - count); + free_all_cpu_call_rcu_data(); free(tid_reader); free(tid_writer); free(count_reader);