X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest_urcu_hash.c;h=98227c219abf11e9ea7aa667ecad4e98e65f8278;hb=175ec0eb63121c55ccddea8755dd401dc06c14a8;hp=c796b6faa7741ca7697ca0cb73f737dc7a8e1e64;hpb=8c35d699cf442f91fbba3c99beaa41a083ef7bff;p=urcu.git

diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index c796b6f..98227c2 100644
--- a/tests/test_urcu_hash.c
+++ b/tests/test_urcu_hash.c
@@ -515,10 +515,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 +633,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]);
@@ -930,19 +950,20 @@ int main(int argc, char **argv)
 	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",