rcuja: API change: move rcu_head to user code

[userspace-rcu.git] / tests / test_urcu_ja.c

diff --git a/tests/test_urcu_ja.c b/tests/test_urcu_ja.c
index 859dc166e48f55d1425204f6696b26cc5ae9d52e..7230ec6d8398e2a44eefc5470b33775a782e4590 100644 (file)
--- a/tests/test_urcu_ja.c
+++ b/tests/test_urcu_ja.c
@@ -156,10 +156,24 @@ static
 void free_node_cb(struct rcu_head *head)
 {
        struct ja_test_node *node =
-               caa_container_of(head, struct ja_test_node, node.head);
+               caa_container_of(head, struct ja_test_node, head);
        free_node(node);
 }
 
+static
+void rcu_free_test_node(struct ja_test_node *test_node)
+{
+       call_rcu(&test_node->head, free_node_cb);
+}
+
+static
+void rcu_free_node(struct cds_ja_node *node)
+{
+       struct ja_test_node *test_node = to_test_node(node);
+
+       rcu_free_test_node(test_node);
+}
+
 #if 0
 static
 void test_delete_all_nodes(struct cds_lfht *ht)
@@ -209,12 +223,13 @@ printf("        [not -u nor -s] Add entries (supports redundant keys).\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);
@@ -285,7 +300,7 @@ int test_8bit_key(void)
                        fprintf(stderr, "Error (%d) removing node %" PRIu64 "\n", ret, key);
                        assert(0);
                }
-               call_rcu(&node->node.head, free_node_cb);
+               rcu_free_test_node(node);
                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);
@@ -295,7 +310,68 @@ int test_8bit_key(void)
        }
        printf("OK\n");
 
-       ret = cds_ja_destroy(test_ja, free_node_cb);
+       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, rcu_free_node);
        if (ret) {
                fprintf(stderr, "Error destroying judy array\n");
                return -1;
@@ -306,8 +382,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);
@@ -381,7 +459,7 @@ int test_16bit_key(void)
                        fprintf(stderr, "Error (%d) removing node %" PRIu64 "\n", ret, key);
                        assert(0);
                }
-               call_rcu(&node->node.head, free_node_cb);
+               rcu_free_test_node(node);
                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);
@@ -391,7 +469,68 @@ int test_16bit_key(void)
        }
        printf("OK\n");
 
-       ret = cds_ja_destroy(test_ja, free_node_cb);
+       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, rcu_free_node);
        if (ret) {
                fprintf(stderr, "Error destroying judy array\n");
                return -1;
@@ -488,7 +627,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;
@@ -513,7 +652,7 @@ int test_sparse_key(unsigned int bits, int nr_dup)
                                fprintf(stderr, "Error (%d) removing node %" PRIu64 "\n", ret, key);
                                assert(0);
                        }
-                       call_rcu(&node->node.head, free_node_cb);
+                       rcu_free_test_node(node);
                        testhead = cds_ja_lookup(test_ja, key);
                        if (count < nr_dup && cds_hlist_empty(&testhead)) {
                                fprintf(stderr, "Error: no node found after deletion of some nodes of a key\n");
@@ -531,7 +670,7 @@ int test_sparse_key(unsigned int bits, int nr_dup)
        }
        printf("OK\n");
 
-       ret = cds_ja_destroy(test_ja, free_node_cb);
+       ret = cds_ja_destroy(test_ja, rcu_free_node);
        if (ret) {
                fprintf(stderr, "Error destroying judy array\n");
                return -1;
@@ -733,7 +872,7 @@ void *test_ja_rw_thr_writer(void *_count)
                        if (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)++;
@@ -876,7 +1015,7 @@ int do_mt_test(void)
        }
        rcu_thread_online_qsbr();
 
-       ret = cds_ja_destroy(test_ja, free_node_cb);
+       ret = cds_ja_destroy(test_ja, rcu_free_node);
        if (ret) {
                fprintf(stderr, "Error destroying judy array\n");
                goto end;