X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=db45c8c389801a3af5a40dfc58c3e2a492172dc0;hb=3fb1173c93240deac2f4a9ca9a24a4c8f24c772a;hp=d6464b4b1c23dfb9714acd2053f1e29eb1099bee;hpb=6b262fd76774cdd6c7ec62d2a74515d9a28c2317;p=urcu.git diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c index d6464b4..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 @@ -633,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]); @@ -924,25 +947,30 @@ 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(); - printf("done.\n"); if (count || removed) { 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: %ld nodes.\n",