X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_ja.c;h=22c336bd77a704cec5c9058d686ed93441dc5f06;hb=b10c8ba83ff83cc8bed4bd62832020f9572e0e92;hp=63683b6faa1a309adb919ef2c70cffdb887c3703;hpb=c6cd5af33ff0ac5cbce33be352ec9bfd2262cbc1;p=userspace-rcu.git

diff --git a/tests/test_urcu_ja.c b/tests/test_urcu_ja.c
index 63683b6..22c336b 100644
--- a/tests/test_urcu_ja.c
+++ b/tests/test_urcu_ja.c
@@ -145,7 +145,7 @@ struct ja_test_node *node_alloc(void)
 }
 
 static
-void free_node(struct ja_test_node *node)
+void free_test_node(struct ja_test_node *node)
 {
 	poison_free(node);
 	if (leak_detection)
@@ -153,11 +153,25 @@ void free_node(struct ja_test_node *node)
 }
 
 static
-void free_node_cb(struct rcu_head *head)
+void free_test_node_cb(struct rcu_head *head)
 {
 	struct ja_test_node *node =
-		caa_container_of(head, struct ja_test_node, node.head);
-	free_node(node);
+		caa_container_of(head, struct ja_test_node, head);
+	free_test_node(node);
+}
+
+static
+void rcu_free_test_node(struct ja_test_node *test_node)
+{
+	call_rcu(&test_node->head, free_test_node_cb);
+}
+
+static
+void free_node(struct cds_ja_node *node)
+{
+	struct ja_test_node *test_node = to_test_node(node);
+
+	free_test_node(test_node);
 }
 
 #if 0
@@ -209,13 +223,40 @@ printf("        [not -u nor -s] Add entries (supports redundant keys).\n");
 	printf("\n\n");
 }
 
+static
+int test_free_all_nodes(struct cds_ja *ja)
+{
+	uint64_t key;
+	struct cds_ja_node *ja_node;
+	int ret = 0;
+
+	rcu_read_lock();
+	cds_ja_for_each_key_rcu(test_ja, key, ja_node) {
+		struct cds_ja_node *tmp_node;
+
+		cds_ja_for_each_duplicate_safe_rcu(ja_node, tmp_node) {
+			ret = cds_ja_del(test_ja, key, ja_node);
+			if (ret) {
+				fprintf(stderr, "Error (%d) removing node %" PRIu64 "\n", ret, key);
+				goto end;
+			}
+			/* Alone using Judy array, OK to free now */
+			free_node(ja_node);
+		}
+	}
+end:
+	rcu_read_unlock();
+	return ret;
+}
+
 static
 int test_8bit_key(void)
 {
 	int ret, i;
 	uint64_t key;
-	uint64_t ka[] = { 4, 17, 100, 222 };
+	uint64_t ka[] = { 5, 17, 100, 222 };
 	uint64_t ka_test_offset = 5;
+	struct cds_ja_node *ja_node;
 
 	/* Test with 8-bit key */
 	test_ja = cds_ja_new(8);
@@ -243,11 +284,9 @@ int test_8bit_key(void)
 
 	printf("Test #2: successful key lookup (8-bit).\n");
 	for (key = 0; key < 200; key++) {
-		struct cds_hlist_head head;
-
 		rcu_read_lock();
-		head = cds_ja_lookup(test_ja, key);
-		if (cds_hlist_empty(&head)) {
+		ja_node = cds_ja_lookup(test_ja, key);
+		if (!ja_node) {
 			fprintf(stderr, "Error lookup node %" PRIu64 "\n", key);
 			assert(0);
 		}
@@ -256,11 +295,9 @@ int test_8bit_key(void)
 	printf("OK\n");
 	printf("Test #3: unsuccessful key lookup (8-bit).\n");
 	for (key = 200; key < 240; key++) {
-		struct cds_hlist_head head;
-
 		rcu_read_lock();
-		head = cds_ja_lookup(test_ja, key);
-		if (!cds_hlist_empty(&head)) {
+		ja_node = cds_ja_lookup(test_ja, key);
+		if (ja_node) {
 			fprintf(stderr,
 				"Error unexpected lookup node %" PRIu64 "\n",
 				key);
@@ -271,32 +308,31 @@ int test_8bit_key(void)
 	printf("OK\n");
 	printf("Test #4: remove keys (8-bit).\n");
 	for (key = 0; key < 200; key++) {
-		struct cds_hlist_head head;
 		struct ja_test_node *node;
 
 		rcu_read_lock();
-		head = cds_ja_lookup(test_ja, key);
-		node = cds_hlist_first_entry_rcu(&head, struct ja_test_node, node.list);
-		if (!node) {
+		ja_node = cds_ja_lookup(test_ja, key);
+		if (!ja_node) {
 			fprintf(stderr, "Error lookup node %" PRIu64 "\n", key);
 			assert(0);
 		}
+		node = caa_container_of(ja_node, struct ja_test_node, node);
 		ret = cds_ja_del(test_ja, key, &node->node);
 		if (ret) {
 			fprintf(stderr, "Error (%d) removing node %" PRIu64 "\n", ret, key);
 			assert(0);
 		}
-		call_rcu(&node->node.head, free_node_cb);
-		head = cds_ja_lookup(test_ja, key);
-		if (!cds_hlist_empty(&head)) {
-			fprintf(stderr, "Error lookup %" PRIu64 ": %p (after delete) failed. Node is not expected.\n", key, head.next);
+		rcu_free_test_node(node);
+		ja_node = cds_ja_lookup(test_ja, key);
+		if (ja_node) {
+			fprintf(stderr, "Error lookup %" PRIu64 ": %p (after delete) failed. Node is not expected.\n", key, ja_node);
 			assert(0);
 		}
 		rcu_read_unlock();
 	}
 	printf("OK\n");
 
-	printf("Test #5: lookup lower equal (8-bit).\n");
+	printf("Test #5: lookup below/above equal (8-bit).\n");
 
 	for (i = 0; i < CAA_ARRAY_SIZE(ka); i++) {
 		struct ja_test_node *node = node_alloc();
@@ -314,42 +350,76 @@ int test_8bit_key(void)
 	}
 
 	for (i = 0; i < CAA_ARRAY_SIZE(ka); i++) {
-		struct cds_hlist_head head;
 		struct ja_test_node *node;
+		uint64_t result_key;
 
 		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",
+		ja_node = cds_ja_lookup_below_equal(test_ja, key, &result_key);
+		if (!ja_node) {
+			fprintf(stderr, "Error lookup below 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);
+		node = caa_container_of(ja_node, struct ja_test_node, node);
+		if (node->key != ka[i] || result_key != ka[i]) {
+			fprintf(stderr, "Error lookup below equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 "/%" PRIu64" instead.\n",
+				ka[i], key, node->key, result_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;
+		uint64_t result_key;
+
+		key = ka[i] - ka_test_offset;
+		rcu_read_lock();
+		ja_node = cds_ja_lookup_above_equal(test_ja, key, &result_key);
+		if (!ja_node) {
+			fprintf(stderr, "Error lookup above equal. Cannot find expected key %" PRIu64" below or equal to %" PRIu64 ".\n",
+				ka[i], key);
+			assert(0);
+		}
+		node = caa_container_of(ja_node, struct ja_test_node, node);
+		if (node->key != ka[i] || result_key != ka[i]) {
+			fprintf(stderr, "Error lookup above equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 "/%" PRIu64" instead.\n",
+				ka[i], key, node->key, result_key);
+			assert(0);
+		}
+		rcu_read_unlock();
+	}
+
+	for (i = 0; i < CAA_ARRAY_SIZE(ka); i++) {
+		struct ja_test_node *node;
+		uint64_t result_key;
 
 		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",
+		ja_node = cds_ja_lookup_below_equal(test_ja, key, &result_key);
+		if (!ja_node) {
+			fprintf(stderr, "Error lookup below equal. Cannot find expected key %" PRIu64" below or equal to %" PRIu64 ".\n",
+				ka[i], key);
+			assert(0);
+		}
+		node = caa_container_of(ja_node, struct ja_test_node, node);
+		if (node->key != ka[i] || result_key != ka[i]) {
+			fprintf(stderr, "Error lookup below equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 "/%" PRIu64" instead.\n",
+				ka[i], key, node->key, result_key);
+			assert(0);
+		}
+
+		ja_node = cds_ja_lookup_above_equal(test_ja, key, &result_key);
+		if (!ja_node) {
+			fprintf(stderr, "Error lookup above 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);
+		node = caa_container_of(ja_node, struct ja_test_node, node);
+		if (node->key != ka[i] || result_key != ka[i]) {
+			fprintf(stderr, "Error lookup above equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 "/%" PRIu64" instead.\n",
+				ka[i], key, node->key, result_key);
 			assert(0);
 		}
 		rcu_read_unlock();
@@ -357,7 +427,13 @@ int test_8bit_key(void)
 
 	printf("OK\n");
 
-	ret = cds_ja_destroy(test_ja, free_node_cb);
+	ret = test_free_all_nodes(test_ja);
+	if (ret) {
+		fprintf(stderr, "Error freeing all nodes\n");
+		return -1;
+	}
+
+	ret = cds_ja_destroy(test_ja);
 	if (ret) {
 		fprintf(stderr, "Error destroying judy array\n");
 		return -1;
@@ -370,8 +446,9 @@ int test_16bit_key(void)
 {
 	int ret, i;
 	uint64_t key;
-	uint64_t ka[] = { 4, 105, 222, 4000, 4111, 59990, 65435 };
+	uint64_t ka[] = { 105, 206, 4000, 4111, 59990, 65435 };
 	uint64_t ka_test_offset = 100;
+	struct cds_ja_node *ja_node;
 
 	/* Test with 16-bit key */
 	test_ja = cds_ja_new(16);
@@ -401,11 +478,11 @@ int test_16bit_key(void)
 	printf("Test #2: successful key lookup (16-bit).\n");
 	for (key = 0; key < 10000; key++) {
 	//for (key = 0; key < 65536; key+=256) {
-		struct cds_hlist_head head;
+		struct cds_ja_node *ja_node;
 
 		rcu_read_lock();
-		head = cds_ja_lookup(test_ja, key);
-		if (cds_hlist_empty(&head)) {
+		ja_node = cds_ja_lookup(test_ja, key);
+		if (!ja_node) {
 			fprintf(stderr, "Error lookup node %" PRIu64 "\n", key);
 			assert(0);
 		}
@@ -414,11 +491,11 @@ int test_16bit_key(void)
 	printf("OK\n");
 	printf("Test #3: unsuccessful key lookup (16-bit).\n");
 	for (key = 11000; key <= 11002; key++) {
-		struct cds_hlist_head head;
+		struct cds_ja_node *ja_node;
 
 		rcu_read_lock();
-		head = cds_ja_lookup(test_ja, key);
-		if (!cds_hlist_empty(&head)) {
+		ja_node = cds_ja_lookup(test_ja, key);
+		if (ja_node) {
 			fprintf(stderr,
 				"Error unexpected lookup node %" PRIu64 "\n",
 				key);
@@ -430,32 +507,31 @@ int test_16bit_key(void)
 	printf("Test #4: remove keys (16-bit).\n");
 	for (key = 0; key < 10000; key++) {
 	//for (key = 0; key < 65536; key+=256) {
-		struct cds_hlist_head head;
 		struct ja_test_node *node;
 
 		rcu_read_lock();
-		head = cds_ja_lookup(test_ja, key);
-		node = cds_hlist_first_entry_rcu(&head, struct ja_test_node, node.list);
-		if (!node) {
+		ja_node = cds_ja_lookup(test_ja, key);
+		if (!ja_node) {
 			fprintf(stderr, "Error lookup node %" PRIu64 "\n", key);
 			assert(0);
 		}
+		node = caa_container_of(ja_node, struct ja_test_node, node);
 		ret = cds_ja_del(test_ja, key, &node->node);
 		if (ret) {
 			fprintf(stderr, "Error (%d) removing node %" PRIu64 "\n", ret, key);
 			assert(0);
 		}
-		call_rcu(&node->node.head, free_node_cb);
-		head = cds_ja_lookup(test_ja, key);
-		if (!cds_hlist_empty(&head)) {
-			fprintf(stderr, "Error lookup %" PRIu64 ": %p (after delete) failed. Node is not expected.\n", key, head.next);
+		rcu_free_test_node(node);
+		ja_node = cds_ja_lookup(test_ja, key);
+		if (ja_node) {
+			fprintf(stderr, "Error lookup %" PRIu64 ": %p (after delete) failed. Node is not expected.\n", key, ja_node);
 			assert(0);
 		}
 		rcu_read_unlock();
 	}
 	printf("OK\n");
 
-	printf("Test #5: lookup lower equal (16-bit).\n");
+	printf("Test #5: lookup below/above equal (16-bit).\n");
 
 	for (i = 0; i < CAA_ARRAY_SIZE(ka); i++) {
 		struct ja_test_node *node = node_alloc();
@@ -473,42 +549,76 @@ int test_16bit_key(void)
 	}
 
 	for (i = 0; i < CAA_ARRAY_SIZE(ka); i++) {
-		struct cds_hlist_head head;
 		struct ja_test_node *node;
+		uint64_t result_key;
 
 		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",
+		ja_node = cds_ja_lookup_below_equal(test_ja, key, &result_key);
+		if (!ja_node) {
+			fprintf(stderr, "Error lookup below equal. Cannot find expected key %" PRIu64" below or equal to %" PRIu64 ".\n",
+				ka[i], key);
+			assert(0);
+		}
+		node = caa_container_of(ja_node, struct ja_test_node, node);
+		if (node->key != ka[i] || result_key != ka[i]) {
+			fprintf(stderr, "Error lookup below equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 "/%" PRIu64" instead.\n",
+				ka[i], key, node->key, result_key);
+			assert(0);
+		}
+		rcu_read_unlock();
+	}
+
+	for (i = 0; i < CAA_ARRAY_SIZE(ka); i++) {
+		struct ja_test_node *node;
+		uint64_t result_key;
+
+		key = ka[i] - ka_test_offset;
+		rcu_read_lock();
+		ja_node = cds_ja_lookup_above_equal(test_ja, key, &result_key);
+		if (!ja_node) {
+			fprintf(stderr, "Error lookup above equal. Cannot find expected key %" PRIu64" above 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);
+		node = caa_container_of(ja_node, struct ja_test_node, node);
+		if (node->key != ka[i] || result_key != ka[i]) {
+			fprintf(stderr, "Error lookup above equal. Expecting key %" PRIu64 " above or equal to %" PRIu64 ", but found %" PRIu64 "/%" PRIu64" instead.\n",
+				ka[i], key, node->key, result_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;
+		uint64_t result_key;
 
 		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",
+		ja_node = cds_ja_lookup_below_equal(test_ja, key, &result_key);
+		if (!ja_node) {
+			fprintf(stderr, "Error lookup below equal. Cannot find expected key %" PRIu64" below or equal to %" PRIu64 ".\n",
+				ka[i], key);
+			assert(0);
+		}
+		node = caa_container_of(ja_node, struct ja_test_node, node);
+		if (node->key != ka[i] || result_key != ka[i]) {
+			fprintf(stderr, "Error lookup below equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 "/%" PRIu64" instead.\n",
+				ka[i], key, node->key, result_key);
+			assert(0);
+		}
+
+		ja_node = cds_ja_lookup_above_equal(test_ja, key, &result_key);
+		if (!ja_node) {
+			fprintf(stderr, "Error lookup above equal. Cannot find expected key %" PRIu64" above 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);
+		node = caa_container_of(ja_node, struct ja_test_node, node);
+		if (node->key != ka[i] || result_key != ka[i]) {
+			fprintf(stderr, "Error lookup above equal. Expecting key %" PRIu64 " above or equal to %" PRIu64 ", but found %" PRIu64 "/%" PRIu64" instead.\n",
+				ka[i], key, node->key, result_key);
 			assert(0);
 		}
 		rcu_read_unlock();
@@ -516,7 +626,13 @@ int test_16bit_key(void)
 
 	printf("OK\n");
 
-	ret = cds_ja_destroy(test_ja, free_node_cb);
+	ret = test_free_all_nodes(test_ja);
+	if (ret) {
+		fprintf(stderr, "Error freeing all nodes\n");
+		return -1;
+	}
+
+	ret = cds_ja_destroy(test_ja);
 	if (ret) {
 		fprintf(stderr, "Error destroying judy array\n");
 		return -1;
@@ -532,6 +648,7 @@ int test_sparse_key(unsigned int bits, int nr_dup)
 {
 	uint64_t key, max_key;
 	int zerocount, i, ret;
+	struct cds_ja_node *ja_node;
 
 	if (bits == 64)
 		max_key = UINT64_MAX;
@@ -571,18 +688,16 @@ int test_sparse_key(unsigned int bits, int nr_dup)
 	printf("Test #2: successful key lookup (%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;
 		struct ja_test_node *node;
-		struct cds_hlist_node *pos;
 		int count = 0;
 
 		rcu_read_lock();
-		head = cds_ja_lookup(test_ja, key);
-		if (cds_hlist_empty(&head)) {
+		ja_node = cds_ja_lookup(test_ja, key);
+		if (!ja_node) {
 			fprintf(stderr, "Error lookup node %" PRIu64 "\n", key);
 			assert(0);
 		}
-		cds_hlist_for_each_entry_rcu(node, pos, &head, node.list) {
+		cds_ja_for_each_duplicate_rcu(ja_node) {
 			count++;
 		}
 		if (count != nr_dup) {
@@ -597,11 +712,9 @@ int test_sparse_key(unsigned int bits, int nr_dup)
 		printf("Test #3: unsuccessful key lookup (%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;
-
 			rcu_read_lock();
-			head = cds_ja_lookup(test_ja, key + 42);
-			if (!cds_hlist_empty(&head)) {
+			ja_node = cds_ja_lookup(test_ja, key + 42);
+			if (ja_node) {
 				fprintf(stderr,
 					"Error unexpected lookup node %" PRIu64 "\n",
 					key + 42);
@@ -616,38 +729,33 @@ int test_sparse_key(unsigned int bits, int nr_dup)
 	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;
-		struct ja_test_node *node;
-		struct cds_hlist_node *pos;
 		int count = 0;
 
 		rcu_read_lock();
-		head = cds_ja_lookup(test_ja, key);
+		ja_node = cds_ja_lookup(test_ja, key);
 
-
-		cds_hlist_for_each_entry_rcu(node, pos, &head, node.list) {
-			struct cds_hlist_head testhead;
+		cds_ja_for_each_duplicate_rcu(ja_node) {
+			struct cds_ja_node *test_ja_node;
+			struct ja_test_node *node;
 
 			count++;
-			if (!node) {
-				fprintf(stderr, "Error lookup node %" PRIu64 "\n", key);
-				assert(0);
-			}
+			node = caa_container_of(ja_node,
+				struct ja_test_node, node);
 			ret = cds_ja_del(test_ja, key, &node->node);
 			if (ret) {
 				fprintf(stderr, "Error (%d) removing node %" PRIu64 "\n", ret, key);
 				assert(0);
 			}
-			call_rcu(&node->node.head, free_node_cb);
-			testhead = cds_ja_lookup(test_ja, key);
-			if (count < nr_dup && cds_hlist_empty(&testhead)) {
+			rcu_free_test_node(node);
+			test_ja_node = cds_ja_lookup(test_ja, key);
+			if (count < nr_dup && !test_ja_node) {
 				fprintf(stderr, "Error: no node found after deletion of some nodes of a key\n");
 				assert(0);
 			}
 		}
-		head = cds_ja_lookup(test_ja, key);
-		if (!cds_hlist_empty(&head)) {
-			fprintf(stderr, "Error lookup %" PRIu64 ": %p (after delete) failed. Node is not expected.\n", key, head.next);
+		ja_node = cds_ja_lookup(test_ja, key);
+		if (ja_node) {
+			fprintf(stderr, "Error lookup %" PRIu64 ": %p (after delete) failed. Node is not expected.\n", key, ja_node);
 			assert(0);
 		}
 		rcu_read_unlock();
@@ -656,7 +764,13 @@ int test_sparse_key(unsigned int bits, int nr_dup)
 	}
 	printf("OK\n");
 
-	ret = cds_ja_destroy(test_ja, free_node_cb);
+	ret = test_free_all_nodes(test_ja);
+	if (ret) {
+		fprintf(stderr, "Error freeing all nodes\n");
+		return -1;
+	}
+
+	ret = cds_ja_destroy(test_ja);
 	if (ret) {
 		fprintf(stderr, "Error destroying judy array\n");
 		return -1;
@@ -733,12 +847,14 @@ static
 void *test_ja_rw_thr_reader(void *_count)
 {
 	unsigned long long *count = _count;
-	struct cds_hlist_head head;
+	struct cds_ja_node *ja_node;
 	uint64_t key;
 
 	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
 			"reader", pthread_self(), (unsigned long) gettid());
 
+	URCU_TLS(rand_lookup) = urcu_get_thread_id() ^ time(NULL);
+
 	set_affinity();
 
 	rcu_register_thread();
@@ -754,8 +870,8 @@ void *test_ja_rw_thr_reader(void *_count)
 		/* note: only looking up ulong keys */
 		key = ((unsigned long) rand_r(&URCU_TLS(rand_lookup)) % lookup_pool_size) + lookup_pool_offset;
 		key *= key_mul;
-		head = cds_ja_lookup(test_ja, key);
-		if (cds_hlist_empty(&head)) {
+		ja_node = cds_ja_lookup(test_ja, key);
+		if (!ja_node) {
 			if (validate_lookup) {
 				printf("[ERROR] Lookup cannot find initial node.\n");
 				exit(-1);
@@ -796,13 +912,14 @@ static
 void *test_ja_rw_thr_writer(void *_count)
 {
 	struct wr_count *count = _count;
-	struct cds_hlist_head head;
 	uint64_t key;
 	int ret;
 
 	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
 			"writer", pthread_self(), (unsigned long) gettid());
 
+	URCU_TLS(rand_lookup) = urcu_get_thread_id() ^ time(NULL);
+
 	set_affinity();
 
 	rcu_register_thread();
@@ -826,7 +943,7 @@ void *test_ja_rw_thr_writer(void *_count)
 			if (add_unique) {
 				ret_node = cds_ja_add_unique(test_ja, key, &node->node);
 				if (ret_node != &node->node) {
-					free_node(node);
+					free_test_node(node);
 					URCU_TLS(nr_addexist)++;
 				} else {
 					URCU_TLS(nr_add)++;
@@ -837,13 +954,14 @@ void *test_ja_rw_thr_writer(void *_count)
 				ret = cds_ja_add(test_ja, key, &node->node);
 				if (ret) {
 					fprintf(stderr, "Error in cds_ja_add: %d\n", ret);
-					free_node(node);
+					free_test_node(node);
 				} else {
 					URCU_TLS(nr_add)++;
 				}
 			}
 			rcu_read_unlock();
 		} else {
+			struct cds_ja_node *ja_node;
 			struct ja_test_node *node;
 
 			/* May delete */
@@ -853,12 +971,14 @@ void *test_ja_rw_thr_writer(void *_count)
 
 			rcu_read_lock();
 
-			head = cds_ja_lookup(test_ja, key);
-			node = cds_hlist_first_entry_rcu(&head, struct ja_test_node, node.list);
-			if (node) {
+			ja_node = cds_ja_lookup(test_ja, key);
+			/* Remove first entry */
+			if (ja_node) {
+				node = caa_container_of(ja_node,
+					struct ja_test_node, node);
 				ret = cds_ja_del(test_ja, key, &node->node);
 				if (!ret) {
-					call_rcu(&node->node.head, free_node_cb);
+					rcu_free_test_node(node);
 					URCU_TLS(nr_del)++;
 				} else {
 					URCU_TLS(nr_delnoent)++;
@@ -896,7 +1016,6 @@ void *test_ja_rw_thr_writer(void *_count)
 static
 int do_mt_populate_ja(void)
 {
-	struct cds_hlist_head head;
 	uint64_t iter;
 	int ret;
 
@@ -918,6 +1037,9 @@ int do_mt_populate_ja(void)
 		URCU_TLS(nr_add)++;
 		URCU_TLS(nr_writes)++;
 		rcu_read_unlock();
+		/* Hash table resize only occurs in call_rcu thread */
+		if (!(iter % 100))
+			rcu_quiescent_state();
 		if (ret) {
 			fprintf(stderr, "Error (%d) adding node %" PRIu64 "\n",
 				ret, key);
@@ -1001,7 +1123,13 @@ int do_mt_test(void)
 	}
 	rcu_thread_online_qsbr();
 
-	ret = cds_ja_destroy(test_ja, free_node_cb);
+	ret = test_free_all_nodes(test_ja);
+	if (ret) {
+		fprintf(stderr, "Error freeing all nodes\n");
+		return -1;
+	}
+
+	ret = cds_ja_destroy(test_ja);
 	if (ret) {
 		fprintf(stderr, "Error destroying judy array\n");
 		goto end;