X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=db45c8c389801a3af5a40dfc58c3e2a492172dc0;hp=d2dd4889f70d45361a6a88c84efea516f13cece8;hb=3fb1173c93240deac2f4a9ca9a24a4c8f24c772a;hpb=7ed7682ffb933c7376830bb73b7f5701e566a559 diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c index d2dd488..db45c8c 100644 --- a/tests/test_urcu_hash.c +++ b/tests/test_urcu_hash.c @@ -200,7 +200,11 @@ static void sigusr2_handler(int signo) { char msg[1] = { 0x42 }; - write(count_pipe[1], msg, 1); /* wakeup thread */ + ssize_t ret; + + do { + ret = write(count_pipe[1], msg, 1); /* wakeup thread */ + } while (ret == -1L && errno == EINTR); } /* @@ -349,11 +353,10 @@ void hashword2( static unsigned long test_hash(void *_key, size_t length, unsigned long seed) { - unsigned long key = (unsigned long) _key; - unsigned long v; + unsigned int key = (unsigned int) _key; - assert(length == sizeof(unsigned long)); - return hash_u32(&v, 1, seed); + assert(length == sizeof(unsigned int)); + return hash_u32(&key, 1, seed); } #else static @@ -397,7 +400,8 @@ void *thr_count(void *arg) rcu_register_thread(); for (;;) { - unsigned long count, removed, approx_before, approx_after; + unsigned long count, removed; + long approx_before, approx_after; ssize_t len; char buf[1]; @@ -416,12 +420,12 @@ void *thr_count(void *arg) &approx_after); rcu_read_unlock(); printf("done.\n"); - printf("Approximation before node accounting: %lu nodes.\n", + printf("Approximation before node accounting: %ld nodes.\n", approx_before); printf("Accounting of nodes in the hash table: " "%lu nodes + %lu logically removed.\n", count, removed); - printf("Approximation after node accounting: %lu nodes.\n", + printf("Approximation after node accounting: %ld nodes.\n", approx_after); } rcu_unregister_thread(); @@ -514,15 +518,15 @@ void *thr_writer(void *_count) 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) % write_pool_size) + write_pool_offset), sizeof(void *)); + rcu_read_lock(); if (add_unique) { ret_node = cds_lfht_add_unique(test_ht, node); } else { if (add_replace) - ret_node = cds_lfht_replace(test_ht, node); + ret_node = cds_lfht_add_replace(test_ht, node); else cds_lfht_add(test_ht, node); } @@ -544,13 +548,10 @@ void *thr_writer(void *_count) cds_lfht_lookup(test_ht, (void *)(((unsigned long) rand_r(&rand_lookup) % write_pool_size) + write_pool_offset), sizeof(void *), &iter); - node = cds_lfht_iter_get_node(&iter); - if (node) - ret = cds_lfht_del(test_ht, node); - else - ret = -ENOENT; + ret = cds_lfht_del(test_ht, &iter); rcu_read_unlock(); if (ret == 0) { + node = cds_lfht_iter_get_node(&iter); call_rcu(&node->head, free_node_cb); nr_del++; } else @@ -614,7 +615,7 @@ static int populate_hash(void) ret_node = cds_lfht_add_unique(test_ht, node); } else { if (add_replace) - ret_node = cds_lfht_replace(test_ht, node); + ret_node = cds_lfht_add_replace(test_ht, node); else cds_lfht_add(test_ht, node); } @@ -635,6 +636,26 @@ static int populate_hash(void) return 0; } +static +void test_delete_all_nodes(struct cds_lfht *ht) +{ + struct cds_lfht_iter iter; + struct cds_lfht_node *node; + unsigned long count = 0; + + cds_lfht_first(ht, &iter); + while ((node = cds_lfht_iter_get_node(&iter)) != NULL) { + int ret; + + ret = cds_lfht_del(test_ht, &iter); + assert(!ret); + call_rcu(&node->head, free_node_cb); + cds_lfht_next(ht, &iter); + count++; + } + printf("deleted %lu nodes.\n", count); +} + void show_usage(int argc, char **argv) { printf("Usage : %s nr_readers nr_writers duration (s)\n", argv[0]); @@ -672,7 +693,8 @@ int main(int argc, char **argv) struct wr_count *count_writer; unsigned long long tot_reads = 0, tot_writes = 0, tot_add = 0, tot_add_exist = 0, tot_remove = 0; - unsigned long count, removed, approx_before, approx_after; + unsigned long count, removed; + long approx_before, approx_after; int i, a, ret; struct sigaction act; unsigned int remain; @@ -870,7 +892,8 @@ int main(int argc, char **argv) opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0, NULL); ret = populate_hash(); assert(!ret); - rcu_unregister_thread(); + + rcu_thread_offline(); next_aff = 0; @@ -924,28 +947,36 @@ int main(int argc, char **argv) } { char msg[1] = { 0x42 }; - write(count_pipe[1], msg, 1); /* wakeup thread */ + ssize_t ret; + + do { + ret = write(count_pipe[1], msg, 1); /* wakeup thread */ + } while (ret == -1L && errno == EINTR); } err = pthread_join(tid_count, &tret); if (err != 0) exit(1); - printf("Counting nodes... "); fflush(stdout); + rcu_thread_online(); + rcu_read_lock(); + printf("Counting nodes... "); cds_lfht_count_nodes(test_ht, &approx_before, &count, &removed, &approx_after); printf("done.\n"); + test_delete_all_nodes(test_ht); + rcu_read_unlock(); + rcu_thread_offline(); if (count || removed) { - printf("Approximation before node accounting: %lu nodes.\n", + printf("Approximation before node accounting: %ld nodes.\n", approx_before); - printf("WARNING: nodes left in the hash table upon destroy: " + printf("Nodes deleted from hash table before destroy: " "%lu nodes + %lu logically removed.\n", count, removed); - printf("Approximation after node accounting: %lu nodes.\n", + printf("Approximation after node accounting: %ld nodes.\n", approx_after); } ret = cds_lfht_destroy(test_ht, NULL); - if (ret) printf_verbose("final delete aborted\n"); else @@ -960,6 +991,7 @@ int main(int argc, char **argv) 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); + rcu_unregister_thread(); free_all_cpu_call_rcu_data(); free(tid_reader); free(tid_writer);