X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=8f850ac75a9e478a6811a88600d064d0c821ecc7;hp=c796b6faa7741ca7697ca0cb73f737dc7a8e1e64;hb=32becef65a082247dfa6c541bf8291ca4a80a971;hpb=14b2b8b8b23d8bf89411ed532cbf9011041981c6

diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index c796b6f..8f850ac 100644
--- a/tests/test_urcu_hash.c
+++ b/tests/test_urcu_hash.c
@@ -38,6 +38,7 @@
 #endif
 
 #define DEFAULT_HASH_SIZE	32
+#define DEFAULT_MIN_ALLOC_SIZE	1
 #define DEFAULT_RAND_POOL	1000000
 
 /* Make this big enough to include the POWER5+ L3 cacheline size of 256B */
@@ -114,6 +115,7 @@ static unsigned long duration;
 static unsigned long rduration;
 
 static unsigned long init_hash_size = DEFAULT_HASH_SIZE;
+static unsigned long min_hash_alloc_size = DEFAULT_MIN_ALLOC_SIZE;
 static unsigned long init_populate;
 static int opt_auto_resize;
 static int add_only, add_unique, add_replace;
@@ -200,7 +202,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 +355,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 +520,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 +638,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]);
@@ -644,6 +669,7 @@ void show_usage(int argc, char **argv)
 	printf("        [-v] (verbose output)\n");
 	printf("        [-a cpu#] [-a cpu#]... (affinity)\n");
 	printf("        [-h size] (initial hash table size)\n");
+	printf("        [-m size] (minimum hash alloc size)\n");
 	printf("        [not -u nor -s] Add entries (supports redundant keys).\n");
 	printf("        [-u] Uniquify add (no redundant keys).\n");
 	printf("        [-s] Replace (swap) entries.\n");
@@ -745,6 +771,13 @@ int main(int argc, char **argv)
 			}
 			init_hash_size = atol(argv[++i]);
 			break;
+		case 'm':
+			if (argc < i + 2) {
+				show_usage(argc, argv);
+				return -1;
+			}
+			min_hash_alloc_size = atol(argv[++i]);
+			break;
 		case 'u':
 			if (add_replace) {
 				printf("Please specify at most one of -s or -u.\n");
@@ -800,6 +833,12 @@ int main(int argc, char **argv)
 		return -1;
 	}
 
+	if (min_hash_alloc_size && min_hash_alloc_size * (min_hash_alloc_size - 1)) {
+		printf("Error: Min hash alloc size %lu is not a power of 2.\n",
+			min_hash_alloc_size);
+		return -1;
+	}
+
 	memset(&act, 0, sizeof(act));
 	ret = sigemptyset(&act.sa_mask);
 	if (ret == -1) {
@@ -842,6 +881,7 @@ int main(int argc, char **argv)
 		add_only ? " add only" : " add/remove",
 		add_unique ? " uniquify" : ( add_replace ? " replace" : " insert"));
 	printf_verbose("Initial hash table size: %lu buckets.\n", init_hash_size);
+	printf_verbose("Minimum hash alloc size: %lu buckets.\n", min_hash_alloc_size);
 	printf_verbose("Init pool size offset %lu size %lu.\n",
 		init_pool_offset, init_pool_size);
 	printf_verbose("Lookup pool size offset %lu size %lu.\n",
@@ -865,8 +905,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, min_hash_alloc_size,
+			(opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0) |
+			CDS_LFHT_ACCOUNTING, NULL);
       	ret = populate_hash();
 	assert(!ret);
 
@@ -924,25 +965,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",