X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=2bdaa38ac6da8e3da5654ff06516fca12846c3cc;hb=59b10634e3ec5ca35111f24d8b880935193e6266;hp=b13b1bd6f125d18dfbf4d6c6e603d21a49c33bd3;hpb=cd1ae16ab299679750ce9d80579180951f8b877c;p=urcu.git diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c index b13b1bd..2bdaa38 100644 --- a/tests/test_urcu_hash.c +++ b/tests/test_urcu_hash.c @@ -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) @@ -104,8 +116,12 @@ 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 int validate_lookup; + static inline void loop_sleep(unsigned long l) { while(l-- != 0) @@ -151,6 +167,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. */ @@ -357,12 +398,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) % rand_pool) + 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); @@ -412,11 +457,12 @@ 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, - (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool), + (void *)(unsigned long)((rand_r(&rand_lookup) % rand_pool) + write_pool_offset), sizeof(void *)); if (add_unique) ret_node = cds_lfht_add_unique(test_ht, node); @@ -432,7 +478,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) % rand_pool) + write_pool_offset), sizeof(void *)); if (node) ret = cds_lfht_remove(test_ht, node); @@ -480,17 +526,23 @@ void *thr_writer(void *_count) return ((void*)2); } -static void populate_hash(void) +static int populate_hash(void) { struct cds_lfht_node *node, *ret_node; if (!init_populate) - return; + 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). This may take a while...\n", init_populate, rand_pool); + } 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) % rand_pool) + init_pool_offset), sizeof(void *)); if (add_unique) ret_node = cds_lfht_add_unique(test_ht, node); @@ -503,6 +555,7 @@ static void populate_hash(void) nr_add++; nr_writes++; } + return 0; } void show_usage(int argc, char **argv) @@ -520,6 +573,11 @@ void show_usage(int argc, char **argv) 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(" [-V] Validate lookups of init values (use with filled init pool, same lookup range, with different write range)."); printf("\n"); } @@ -534,6 +592,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); @@ -620,6 +680,22 @@ int main(int argc, char **argv) case 'k': init_populate = atol(argv[++i]); break; + 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 'V': + validate_lookup = 1; + break; + } } @@ -630,6 +706,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); @@ -647,8 +737,13 @@ 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); - populate_hash(); + 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); @@ -671,7 +766,10 @@ int main(int argc, char **argv) test_go = 1; - sleep(duration); + remain = duration; + do { + remain = sleep(remain); + } while (remain > 0); test_stop = 1; @@ -713,6 +811,7 @@ int main(int argc, char **argv) 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);