X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_ja.c;h=63683b6faa1a309adb919ef2c70cffdb887c3703;hb=c6cd5af33ff0ac5cbce33be352ec9bfd2262cbc1;hp=c3467443506f9d1105e9e291d9a4fe34a88c6150;hpb=4df4328c2d098606a67655dcde9ffa5a0163d411;p=userspace-rcu.git

diff --git a/tests/test_urcu_ja.c b/tests/test_urcu_ja.c
index c346744..63683b6 100644
--- a/tests/test_urcu_ja.c
+++ b/tests/test_urcu_ja.c
@@ -74,8 +74,13 @@ unsigned int nr_writers;
 static unsigned int add_ratio = 50;
 static uint64_t key_mul = 1ULL;
 
+static int add_unique, add_replace;
+
 static pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
 
+static int leak_detection;
+static unsigned long test_nodes_allocated, test_nodes_freed;
+
 void set_affinity(void)
 {
 	cpu_set_t mask;
@@ -128,11 +133,31 @@ void rcu_copy_mutex_unlock(void)
 	}
 }
 
+static
+struct ja_test_node *node_alloc(void)
+{
+	struct ja_test_node *node;
+
+	node = calloc(sizeof(*node), 1);
+	if (leak_detection && node)
+		uatomic_inc(&test_nodes_allocated);
+	return node;
+}
+
+static
+void free_node(struct ja_test_node *node)
+{
+	poison_free(node);
+	if (leak_detection)
+		uatomic_inc(&test_nodes_freed);
+}
+
+static
 void free_node_cb(struct rcu_head *head)
 {
 	struct ja_test_node *node =
 		caa_container_of(head, struct ja_test_node, node.head);
-	poison_free(node);
+	free_node(node);
 }
 
 #if 0
@@ -165,9 +190,11 @@ void show_usage(int argc, char **argv)
 	printf("        [-c duration] (reader C.S. duration (in loops))\n");
 	printf("        [-v] (verbose output)\n");
 	printf("        [-a cpu#] [-a cpu#]... (affinity)\n");
+	printf("        [-u] Add unique keys.\n");
+	printf("        [-s] Replace existing keys.\n");
 printf("        [not -u nor -s] Add entries (supports redundant keys).\n");
 	printf("        [-r ratio] Add ratio (in %% of add+removal).\n");
-	printf("        [-k nr_nodes] Number of nodes to insert initially.\n");
+	printf("        [-k] Populate init nodes.\n");
 	printf("        [-R offset] Lookup pool offset.\n");
 	printf("        [-S offset] Write pool offset.\n");
 	printf("        [-T offset] Init pool offset.\n");
@@ -175,18 +202,20 @@ printf("        [not -u nor -s] Add entries (supports redundant keys).\n");
 	printf("        [-N size] Write pool size.\n");
 	printf("        [-O size] Init pool size.\n");
 	printf("        [-V] Validate lookups of init values (use with filled init pool, same lookup range, with different write range).\n");
-	printf("        [-s] Do sanity test.\n");
+	printf("        [-t] Do sanity test.\n");
 	printf("        [-B] Key bits for multithread test (default: 32).\n");
 	printf("        [-m factor] Key multiplication factor.\n");
+	printf("	[-l] Memory leak detection.\n");
 	printf("\n\n");
 }
 
-
 static
 int test_8bit_key(void)
 {
-	int ret;
+	int ret, i;
 	uint64_t key;
+	uint64_t ka[] = { 4, 17, 100, 222 };
+	uint64_t ka_test_offset = 5;
 
 	/* Test with 8-bit key */
 	test_ja = cds_ja_new(8);
@@ -198,8 +227,7 @@ int test_8bit_key(void)
 	/* Add keys */
 	printf("Test #1: add keys (8-bit).\n");
 	for (key = 0; key < 200; key++) {
-		struct ja_test_node *node =
-			calloc(sizeof(*node), 1);
+		struct ja_test_node *node = node_alloc();
 
 		ja_test_node_init(node, key);
 		rcu_read_lock();
@@ -268,6 +296,67 @@ int test_8bit_key(void)
 	}
 	printf("OK\n");
 
+	printf("Test #5: lookup lower equal (8-bit).\n");
+
+	for (i = 0; i < CAA_ARRAY_SIZE(ka); i++) {
+		struct ja_test_node *node = node_alloc();
+
+		key = ka[i];
+		ja_test_node_init(node, key);
+		rcu_read_lock();
+		ret = cds_ja_add(test_ja, key, &node->node);
+		rcu_read_unlock();
+		if (ret) {
+			fprintf(stderr, "Error (%d) adding node %" PRIu64 "\n",
+				ret, key);
+			assert(0);
+		}
+	}
+
+	for (i = 0; i < CAA_ARRAY_SIZE(ka); i++) {
+		struct cds_hlist_head head;
+		struct ja_test_node *node;
+
+		key = ka[i] + ka_test_offset;
+		rcu_read_lock();
+		head = cds_ja_lookup_lower_equal(test_ja, key);
+		if (cds_hlist_empty(&head)) {
+			fprintf(stderr, "Error lookup lower equal. Cannot find expected key %" PRIu64" below or equal to %" PRIu64 ".\n",
+				ka[i], key);
+			assert(0);
+		}
+		node = cds_hlist_first_entry_rcu(&head, struct ja_test_node, node.list);
+		if (node->key != ka[i]) {
+			fprintf(stderr, "Error lookup lower equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 " instead.\n",
+				ka[i], key, node->key);
+			assert(0);
+		}
+		rcu_read_unlock();
+	}
+
+	for (i = 0; i < CAA_ARRAY_SIZE(ka); i++) {
+		struct cds_hlist_head head;
+		struct ja_test_node *node;
+
+		key = ka[i];	/* without offset */
+		rcu_read_lock();
+		head = cds_ja_lookup_lower_equal(test_ja, key);
+		if (cds_hlist_empty(&head)) {
+			fprintf(stderr, "Error lookup lower equal. Cannot find expected key %" PRIu64" below or equal to %" PRIu64 ".\n",
+				ka[i], key);
+			assert(0);
+		}
+		node = cds_hlist_first_entry_rcu(&head, struct ja_test_node, node.list);
+		if (node->key != ka[i]) {
+			fprintf(stderr, "Error lookup lower equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 " instead.\n",
+				ka[i], key, node->key);
+			assert(0);
+		}
+		rcu_read_unlock();
+	}
+
+	printf("OK\n");
+
 	ret = cds_ja_destroy(test_ja, free_node_cb);
 	if (ret) {
 		fprintf(stderr, "Error destroying judy array\n");
@@ -279,8 +368,10 @@ int test_8bit_key(void)
 static
 int test_16bit_key(void)
 {
-	int ret;
+	int ret, i;
 	uint64_t key;
+	uint64_t ka[] = { 4, 105, 222, 4000, 4111, 59990, 65435 };
+	uint64_t ka_test_offset = 100;
 
 	/* Test with 16-bit key */
 	test_ja = cds_ja_new(16);
@@ -293,8 +384,7 @@ int test_16bit_key(void)
 	printf("Test #1: add keys (16-bit).\n");
 	for (key = 0; key < 10000; key++) {
 	//for (key = 0; key < 65536; key+=256) {
-		struct ja_test_node *node =
-			calloc(sizeof(*node), 1);
+		struct ja_test_node *node = node_alloc();
 
 		ja_test_node_init(node, key);
 		rcu_read_lock();
@@ -365,6 +455,67 @@ int test_16bit_key(void)
 	}
 	printf("OK\n");
 
+	printf("Test #5: lookup lower equal (16-bit).\n");
+
+	for (i = 0; i < CAA_ARRAY_SIZE(ka); i++) {
+		struct ja_test_node *node = node_alloc();
+
+		key = ka[i];
+		ja_test_node_init(node, key);
+		rcu_read_lock();
+		ret = cds_ja_add(test_ja, key, &node->node);
+		rcu_read_unlock();
+		if (ret) {
+			fprintf(stderr, "Error (%d) adding node %" PRIu64 "\n",
+				ret, key);
+			assert(0);
+		}
+	}
+
+	for (i = 0; i < CAA_ARRAY_SIZE(ka); i++) {
+		struct cds_hlist_head head;
+		struct ja_test_node *node;
+
+		key = ka[i] + ka_test_offset;
+		rcu_read_lock();
+		head = cds_ja_lookup_lower_equal(test_ja, key);
+		if (cds_hlist_empty(&head)) {
+			fprintf(stderr, "Error lookup lower equal. Cannot find expected key %" PRIu64" below or equal to %" PRIu64 ".\n",
+				ka[i], key);
+			assert(0);
+		}
+		node = cds_hlist_first_entry_rcu(&head, struct ja_test_node, node.list);
+		if (node->key != ka[i]) {
+			fprintf(stderr, "Error lookup lower equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 " instead.\n",
+				ka[i], key, node->key);
+			assert(0);
+		}
+		rcu_read_unlock();
+	}
+
+	for (i = 0; i < CAA_ARRAY_SIZE(ka); i++) {
+		struct cds_hlist_head head;
+		struct ja_test_node *node;
+
+		key = ka[i];	/* without offset */
+		rcu_read_lock();
+		head = cds_ja_lookup_lower_equal(test_ja, key);
+		if (cds_hlist_empty(&head)) {
+			fprintf(stderr, "Error lookup lower equal. Cannot find expected key %" PRIu64" below or equal to %" PRIu64 ".\n",
+				ka[i], key);
+			assert(0);
+		}
+		node = cds_hlist_first_entry_rcu(&head, struct ja_test_node, node.list);
+		if (node->key != ka[i]) {
+			fprintf(stderr, "Error lookup lower equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 " instead.\n",
+				ka[i], key, node->key);
+			assert(0);
+		}
+		rcu_read_unlock();
+	}
+
+	printf("OK\n");
+
 	ret = cds_ja_destroy(test_ja, free_node_cb);
 	if (ret) {
 		fprintf(stderr, "Error destroying judy array\n");
@@ -400,8 +551,7 @@ int test_sparse_key(unsigned int bits, int nr_dup)
 	for (i = 0; i < nr_dup; i++) {
 		zerocount = 0;
 		for (key = 0; key <= max_key && (key != 0 || zerocount < 1); key += 1ULL << (bits - 8)) {
-			struct ja_test_node *node =
-				calloc(sizeof(*node), 1);
+			struct ja_test_node *node = node_alloc();
 
 			ja_test_node_init(node, key);
 			rcu_read_lock();
@@ -463,7 +613,7 @@ int test_sparse_key(unsigned int bits, int nr_dup)
 		}
 		printf("OK\n");
 	}
-	printf("Test #4: remove keys (16-bit).\n");
+	printf("Test #4: remove keys (%u-bit).\n", bits);
 	zerocount = 0;
 	for (key = 0; key <= max_key && (key != 0 || zerocount < 1); key += 1ULL << (bits - 8)) {
 		struct cds_hlist_head head;
@@ -665,21 +815,34 @@ void *test_ja_rw_thr_writer(void *_count)
 	for (;;) {
 		if ((addremove == AR_ADD)
 				|| (addremove == AR_RANDOM && is_add())) {
-			struct ja_test_node *node = malloc(sizeof(*node));
+			struct ja_test_node *node = node_alloc();
+			struct cds_ja_node *ret_node;
 
 			/* note: only inserting ulong keys */
 			key = ((unsigned long) rand_r(&URCU_TLS(rand_lookup)) % write_pool_size) + write_pool_offset;
 			key *= key_mul;
 			ja_test_node_init(node, key);
 			rcu_read_lock();
-			ret = cds_ja_add(test_ja, key, &node->node);
-			URCU_TLS(nr_add)++;
-			rcu_read_unlock();
-			if (ret) {
-				fprintf(stderr, "Error (%d) adding node %" PRIu64 "\n",
-					ret, key);
-				assert(0);
+			if (add_unique) {
+				ret_node = cds_ja_add_unique(test_ja, key, &node->node);
+				if (ret_node != &node->node) {
+					free_node(node);
+					URCU_TLS(nr_addexist)++;
+				} else {
+					URCU_TLS(nr_add)++;
+				}
+			} else if (add_replace) {
+				assert(0);	/* not implemented yet. */
+			} else {
+				ret = cds_ja_add(test_ja, key, &node->node);
+				if (ret) {
+					fprintf(stderr, "Error in cds_ja_add: %d\n", ret);
+					free_node(node);
+				} else {
+					URCU_TLS(nr_add)++;
+				}
 			}
+			rcu_read_unlock();
 		} else {
 			struct ja_test_node *node;
 
@@ -743,7 +906,7 @@ int do_mt_populate_ja(void)
 	printf("Starting rw test\n");
 
 	for (iter = init_pool_offset; iter < init_pool_offset + init_pool_size; iter++) {
-		struct ja_test_node *node = malloc(sizeof(*node));
+		struct ja_test_node *node = node_alloc();
 		uint64_t key;
 
 		/* note: only inserting ulong keys */
@@ -836,13 +999,13 @@ int do_mt_test(void)
 		tot_add_exist += count_writer[i].add_exist;
 		tot_remove += count_writer[i].remove;
 	}
+	rcu_thread_online_qsbr();
 
 	ret = cds_ja_destroy(test_ja, free_node_cb);
 	if (ret) {
 		fprintf(stderr, "Error destroying judy array\n");
 		goto end;
 	}
-	rcu_thread_online_qsbr();
 
 	free(tid_reader);
 	free(tid_writer);
@@ -853,6 +1016,21 @@ end:
 	return ret;
 }
 
+static
+int check_memory_leaks(void)
+{
+	unsigned long na, nf;
+
+	na = uatomic_read(&test_nodes_allocated);
+	nf = uatomic_read(&test_nodes_freed);
+	if (na != nf) {
+		fprintf(stderr, "Memory leak of %ld test nodes detected. Allocated: %lu, freed: %lu\n",
+			na - nf, na, nf);
+		return -1;
+	}
+	return 0;
+}
+
 int main(int argc, char **argv)
 {
 	int i, j, a, ret, err;
@@ -925,7 +1103,7 @@ int main(int argc, char **argv)
 			add_ratio = atoi(argv[++i]);
 			break;
 		case 'k':
-			init_populate = atol(argv[++i]);
+			init_populate = 1;
 			break;
 		case 'R':
 			lookup_pool_offset = atol(argv[++i]);
@@ -948,7 +1126,7 @@ int main(int argc, char **argv)
 		case 'V':
 			validate_lookup = 1;
 			break;
-		case 's':
+		case 't':
 			sanity_test = 1;
 			break;
 		case 'B':
@@ -957,6 +1135,15 @@ int main(int argc, char **argv)
 		case 'm':
 			key_mul = atoll(argv[++i]);
 			break;
+		case 'u':
+			add_unique = 1;
+			break;
+		case 's':
+			add_replace = 1;
+			break;
+		case 'l':
+			leak_detection = 1;
+			break;
 		}
 	}
 
@@ -965,12 +1152,20 @@ int main(int argc, char **argv)
 	printf_verbose("Writer delay : %lu loops.\n", wdelay);
 	printf_verbose("Reader duration : %lu loops.\n", rduration);
 	printf_verbose("Add ratio: %u%%.\n", add_ratio);
+	printf_verbose("Mode:%s%s.\n",
+		" add/remove",
+		add_unique ? " uniquify" : ( add_replace ? " replace" : " insert"));
+	printf_verbose("Key multiplication factor: %" PRIu64 ".\n", key_mul);
 	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",
 		lookup_pool_offset, lookup_pool_size);
 	printf_verbose("Update pool size offset %lu size %lu.\n",
 		write_pool_offset, write_pool_size);
+	if (validate_lookup)
+		printf_verbose("Validating lookups.\n");
+	if (leak_detection)
+		printf_verbose("Memory leak dection activated.\n");
 	printf_verbose("thread %-6s, thread id : %lx, tid %lu\n",
 			"main", pthread_self(), (unsigned long)gettid());
 
@@ -997,79 +1192,20 @@ int main(int argc, char **argv)
 
 	if (sanity_test) {
 		ret = do_sanity_test();
-		if (ret) {
-			fprintf(stderr, "Error in sanity test\n");
-		}
 	} else {
-		do_mt_test();
+		ret = do_mt_test();
 	}
 
-	rcu_unregister_thread();
-	free_all_cpu_call_rcu_data();
-	return 0;
+	/* Wait for in-flight call_rcu free to complete for leak detection */
+	rcu_barrier();
 
-#if 0
-	/*
-	 * Hash Population needs to be seen as a RCU reader
-	 * thread from the point of view of resize.
-	 */
-	rcu_register_thread();
-      	ret = (get_populate_hash_cb())();
-	assert(!ret);
-
-	rcu_thread_offline();
-
-	/* teardown counter thread */
-	act.sa_handler = SIG_IGN;
-	act.sa_flags = SA_RESTART;
-	ret = sigaction(SIGUSR2, &act, NULL);
-	if (ret == -1) {
-		perror("sigaction");
-		return -1;
-	}
-	{
-		char msg[1] = { 0x42 };
-		ssize_t ret;
+	ret |= check_memory_leaks();
 
-		do {
-			ret = write(count_pipe[1], msg, 1);	/* wakeup thread */
-		} while (ret == -1L && errno == EINTR);
-	}
+	rcu_unregister_thread();
+	free_all_cpu_call_rcu_data();
 
-	fflush(stdout);
-	rcu_thread_online();
-	rcu_read_lock();
-	printf("Counting nodes... ");
-	cds_lfht_count_nodes(test_ht, &approx_before, &count, &approx_after);
-	printf("done.\n");
-	test_delete_all_nodes(test_ht);
-	rcu_read_unlock();
-	rcu_thread_offline();
-	if (count) {
-		printf("Approximation before node accounting: %ld nodes.\n",
-			approx_before);
-		printf("Nodes deleted from hash table before destroy: "
-			"%lu nodes.\n",
-			count);
-		printf("Approximation after node accounting: %ld nodes.\n",
-			approx_after);
+	if (ret) {
+		printf("Test ended with error: %d\n", ret);
 	}
-	ret = cds_lfht_destroy(test_ht, NULL);
-	if (ret)
-		printf_verbose("final delete aborted\n");
-	else
-		printf_verbose("final delete success\n");
-	printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
-	       tot_writes);
-	printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu "
-		"nr_writers %3u "
-		"wdelay %6lu nr_reads %12llu nr_writes %12llu nr_ops %12llu "
-		"nr_add %12llu nr_add_fail %12llu nr_remove %12llu nr_leaked %12lld\n",
-		argv[0], duration, nr_readers, rduration,
-		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();
-#endif
-	return 0;
+	return ret;
 }