X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=9ae1fa0791cec5bbbf89e4513bd33a030977911d;hb=5afadd129c36f4778bcc12c8def6f4e3f9604c7b;hp=c796b6faa7741ca7697ca0cb73f737dc7a8e1e64;hpb=9357c41599e239897db0cc18e1fbaecd1065ebc0;p=urcu.git

diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index c796b6f..9ae1fa0 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
@@ -515,10 +518,10 @@ 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 {
@@ -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]);
@@ -865,8 +888,9 @@ int main(int argc, char **argv)
 	 */
 	rcu_register_thread();
 	test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL,
-			init_hash_size,
-			opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0, NULL);
+			init_hash_size, 1,
+			(opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0) |
+			CDS_LFHT_ACCOUNTING, NULL);
       	ret = populate_hash();
 	assert(!ret);
 
@@ -924,25 +948,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",