X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=24245932c0862925bd7584abf9d448921d456c7a;hb=c8f5b3840334aed3e15baf10f6dc0f4fd074a367;hp=effd5356d042bfe614e876d7883425a021cfd162;hpb=9a940059880e189503befb3dbcc0ed556eb93124;p=urcu.git diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c index effd535..2424593 100644 --- a/tests/test_urcu_hash.c +++ b/tests/test_urcu_hash.c @@ -115,10 +115,15 @@ 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 unsigned long init_pool_offset, lookup_pool_offset, write_pool_offset; +static unsigned long init_pool_size = DEFAULT_RAND_POOL, + lookup_pool_size = DEFAULT_RAND_POOL, + write_pool_size = DEFAULT_RAND_POOL; +static int validate_lookup; + static inline void loop_sleep(unsigned long l) { while(l-- != 0) @@ -395,12 +400,16 @@ void *thr_reader(void *_count) for (;;) { rcu_read_lock(); node = cds_lfht_lookup(test_ht, - (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool), + (void *)(((unsigned long) rand_r(&rand_lookup) % lookup_pool_size) + lookup_pool_offset), sizeof(void *)); - if (node == NULL) + if (node == NULL) { + if (validate_lookup) { + printf("[ERROR] Lookup cannot find initial node.\n"); + } lookup_fail++; - else + } else { lookup_ok++; + } debug_yield_read(); if (unlikely(rduration)) loop_sleep(rduration); @@ -455,7 +464,7 @@ void *thr_writer(void *_count) node = malloc(sizeof(struct cds_lfht_node)); rcu_read_lock(); cds_lfht_node_init(node, - (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool), + (void *)(((unsigned long) rand_r(&rand_lookup) % write_pool_size) + write_pool_offset), sizeof(void *)); if (add_unique) ret_node = cds_lfht_add_unique(test_ht, node); @@ -471,7 +480,7 @@ void *thr_writer(void *_count) /* May delete */ rcu_read_lock(); node = cds_lfht_lookup(test_ht, - (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool), + (void *)(((unsigned long) rand_r(&rand_lookup) % write_pool_size) + write_pool_offset), sizeof(void *)); if (node) ret = cds_lfht_remove(test_ht, node); @@ -526,17 +535,16 @@ static int populate_hash(void) if (!init_populate) return 0; - if (add_unique && init_populate * 10 > rand_pool) { + if (add_unique && init_populate * 10 > init_pool_size) { 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; +"larger random pool (-p option). This may take a while...\n", init_populate, init_pool_size); } 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), + (void *)(((unsigned long) rand_r(&rand_lookup) % init_pool_size) + init_pool_offset), sizeof(void *)); if (add_unique) ret_node = cds_lfht_add_unique(test_ht, node); @@ -562,12 +570,18 @@ 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(" [-R offset] Lookup pool offset."); + printf(" [-S offset] Write pool offset."); + printf(" [-T offset] Init pool offset."); + printf(" [-M size] Lookup pool size."); + printf(" [-N size] Write pool size."); + printf(" [-O size] Init pool size."); + printf(" [-V] Validate lookups of init values (use with filled init pool, same lookup range, with different write range)."); printf("\n"); } @@ -647,13 +661,6 @@ 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); @@ -673,6 +680,28 @@ int main(int argc, char **argv) case 'A': opt_auto_resize = 1; break; + case 'R': + lookup_pool_offset = atol(argv[++i]); + break; + case 'S': + write_pool_offset = atol(argv[++i]); + break; + case 'T': + init_pool_offset = atol(argv[++i]); + break; + case 'M': + lookup_pool_size = atol(argv[++i]); + break; + case 'N': + write_pool_size = atol(argv[++i]); + break; + case 'O': + init_pool_size = atol(argv[++i]); + break; + case 'V': + validate_lookup = 1; + break; + } } @@ -701,11 +730,16 @@ int main(int argc, char **argv) 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("Init pool size offset %lu size %lu.\n", + init_pool_offset, init_pool_size); + printf_verbose("Lookup pool size offset %lu size %lu.\n", + lookup_pool_offset, lookup_pool_size); + printf_verbose("Update pool size offset %lu size %lu.\n", + write_pool_offset, write_pool_size); printf_verbose("thread %-6s, thread id : %lx, tid %lu\n", "main", pthread_self(), (unsigned long)gettid()); @@ -717,7 +751,8 @@ int main(int argc, char **argv) init_hash_size, opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0, call_rcu, synchronize_rcu, rcu_read_lock, - rcu_read_unlock); + rcu_read_unlock, rcu_thread_offline, + rcu_thread_online); ret = populate_hash(); assert(!ret); err = create_all_cpu_call_rcu_data(0); @@ -781,12 +816,13 @@ int main(int argc, char **argv) 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 " + "wdelay %6lu 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, rand_pool, tot_reads, tot_writes, + nr_writers, wdelay, 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);