X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=280000c1d4c53edff4a79293891c7275e5528fb5;hb=33c7c748c098dfc963c934fde62328169834c1ed;hp=b1ff4acb852de2da22c698944a31f5234884ab11;hpb=b8e1907c4dbf59a2b0e627f6b4e942c6a4d13283;p=urcu.git diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c index b1ff4ac..280000c 100644 --- a/tests/test_urcu_hash.c +++ b/tests/test_urcu_hash.c @@ -37,8 +37,8 @@ #include #endif -#define HASH_SIZE 32 -#define RAND_POOL 10000 +#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 @@ -100,6 +100,10 @@ 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 rand_pool = DEFAULT_RAND_POOL; +static int add_only, add_unique; + static inline void loop_sleep(unsigned long l) { while(l-- != 0) @@ -111,7 +115,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]; @@ -351,7 +355,7 @@ void *thr_reader(void *_count) for (;;) { rcu_read_lock(); node = ht_lookup(test_ht, - (void *)(unsigned long)(rand_r(&rand_lookup) % RAND_POOL), + (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool), sizeof(void *)); if (node == NULL) lookup_fail++; @@ -387,7 +391,7 @@ void free_node_cb(struct rcu_head *head) void *thr_writer(void *_count) { - struct rcu_ht_node *node; + struct rcu_ht_node *node, *ret_node; struct wr_count *count = _count; int ret; @@ -404,15 +408,18 @@ void *thr_writer(void *_count) cmm_smp_mb(); for (;;) { - if (rand_r(&rand_lookup) & 1) { + if (add_only || rand_r(&rand_lookup) & 1) { node = malloc(sizeof(struct rcu_ht_node)); rcu_read_lock(); ht_node_init(node, - (void *)(unsigned long)(rand_r(&rand_lookup) % RAND_POOL), + (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool), sizeof(void *)); - ret = ht_add_unique(test_ht, node); + if (add_unique) + ret_node = ht_add_unique(test_ht, node); + else + ht_add(test_ht, node); rcu_read_unlock(); - if (ret) { + if (add_unique && ret_node != node) { free(node); nr_addexist++; } else @@ -421,7 +428,7 @@ void *thr_writer(void *_count) /* May delete */ rcu_read_lock(); node = ht_lookup(test_ht, - (void *)(unsigned long)(rand_r(&rand_lookup) % RAND_POOL), + (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool), sizeof(void *)); if (node) ret = ht_remove(test_ht, node); @@ -476,6 +483,10 @@ 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("\n"); } @@ -553,13 +564,45 @@ 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; } } + /* 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; + } + 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()); @@ -568,7 +611,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 = ht_new(test_hash, test_compare, 0x42UL, - HASH_SIZE, call_rcu); + init_hash_size, call_rcu); + + err = create_all_cpu_call_rcu_data(0); + assert(!err); + next_aff = 0; for (i = 0; i < nr_readers; i++) { @@ -606,21 +653,27 @@ int main(int argc, char **argv) tot_add += count_writer[i].add; tot_remove += count_writer[i].remove; } + printf("Counting nodes... "); + fflush(stdout); ht_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 = ht_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 " + "wdelay %6lu rand_pool %12llu nr_reads %12llu nr_writes %12llu nr_ops %12llu " "nr_add %12llu nr_remove %12llu nr_leaked %12llu\n", argv[0], duration, nr_readers, rduration, - nr_writers, wdelay, tot_reads, tot_writes, + nr_writers, wdelay, rand_pool, tot_reads, tot_writes, tot_reads + tot_writes, tot_add, tot_remove, tot_add - tot_remove - count); free(tid_reader);