rcuja tests: test above or equal

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

diff --git a/tests/test_urcu_ja.c b/tests/test_urcu_ja.c
index c25229094a846db81d39a7e11ad4e2419cdde3ad..001d631f498f8b364b7a266ed99891845ee271b4 100644 (file)
--- 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,25 +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, head);
-       free_node(node);
+       free_test_node(node);
 }
 
 static
 void rcu_free_test_node(struct ja_test_node *test_node)
 {
-       call_rcu(&test_node->head, free_node_cb);
+       call_rcu(&test_node->head, free_test_node_cb);
 }
 
 static
-void rcu_free_node(struct cds_ja_node *node)
+void free_node(struct cds_ja_node *node)
 {
        struct ja_test_node *test_node = to_test_node(node);
 
-       rcu_free_test_node(test_node);
+       free_test_node(test_node);
 }
 
 #if 0
@@ -228,7 +228,7 @@ 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;
 
        /* Test with 8-bit key */
@@ -310,7 +310,7 @@ int test_8bit_key(void)
        }
        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();
@@ -333,15 +333,36 @@ int test_8bit_key(void)
 
                key = ka[i] + ka_test_offset;
                rcu_read_lock();
-               ja_node = cds_ja_lookup_lower_equal(test_ja, key);
+               ja_node = cds_ja_lookup_below_equal(test_ja, key);
                if (!ja_node) {
-                       fprintf(stderr, "Error lookup lower equal. Cannot find expected key %" PRIu64" below or equal to %" PRIu64 ".\n",
+                       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]) {
-                       fprintf(stderr, "Error lookup lower equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 " instead.\n",
+                       fprintf(stderr, "Error lookup below 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_ja_node *ja_node;
+               struct ja_test_node *node;
+
+               key = ka[i] - ka_test_offset;
+               rcu_read_lock();
+               ja_node = cds_ja_lookup_above_equal(test_ja, 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]) {
+                       fprintf(stderr, "Error lookup above equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 " instead.\n",
                                ka[i], key, node->key);
                        assert(0);
                }
@@ -354,15 +375,28 @@ int test_8bit_key(void)
 
                key = ka[i];    /* without offset */
                rcu_read_lock();
-               ja_node = cds_ja_lookup_lower_equal(test_ja, key);
+               ja_node = cds_ja_lookup_below_equal(test_ja, 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]) {
+                       fprintf(stderr, "Error lookup below equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 " instead.\n",
+                               ka[i], key, node->key);
+                       assert(0);
+               }
+
+               ja_node = cds_ja_lookup_above_equal(test_ja, key);
                if (!ja_node) {
-                       fprintf(stderr, "Error lookup lower equal. Cannot find expected key %" PRIu64" below or equal to %" PRIu64 ".\n",
+                       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]) {
-                       fprintf(stderr, "Error lookup lower equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 " instead.\n",
+                       fprintf(stderr, "Error lookup above equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 " instead.\n",
                                ka[i], key, node->key);
                        assert(0);
                }
@@ -371,7 +405,7 @@ int test_8bit_key(void)
 
        printf("OK\n");
 
-       ret = cds_ja_destroy(test_ja, rcu_free_node);
+       ret = cds_ja_destroy(test_ja, free_node);
        if (ret) {
                fprintf(stderr, "Error destroying judy array\n");
                return -1;
@@ -384,7 +418,7 @@ 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;
 
        /* Test with 16-bit key */
@@ -469,7 +503,7 @@ int test_16bit_key(void)
        }
        printf("OK\n");
 
-       printf("Test #5: lookup lower equal (16-bit).\n");
+       printf("Test #5: lookup below equal (16-bit).\n");
 
        for (i = 0; i < CAA_ARRAY_SIZE(ka); i++) {
                struct ja_test_node *node = node_alloc();
@@ -492,15 +526,36 @@ int test_16bit_key(void)
 
                key = ka[i] + ka_test_offset;
                rcu_read_lock();
-               ja_node = cds_ja_lookup_lower_equal(test_ja, key);
+               ja_node = cds_ja_lookup_below_equal(test_ja, key);
                if (!ja_node) {
-                       fprintf(stderr, "Error lookup lower equal. Cannot find expected key %" PRIu64" below or equal to %" PRIu64 ".\n",
+                       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]) {
-                       fprintf(stderr, "Error lookup lower equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 " instead.\n",
+                       fprintf(stderr, "Error lookup below 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_ja_node *ja_node;
+               struct ja_test_node *node;
+
+               key = ka[i] - ka_test_offset;
+               rcu_read_lock();
+               ja_node = cds_ja_lookup_above_equal(test_ja, 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 = caa_container_of(ja_node, struct ja_test_node, node);
+               if (node->key != ka[i]) {
+                       fprintf(stderr, "Error lookup above equal. Expecting key %" PRIu64 " above or equal to %" PRIu64 ", but found %" PRIu64 " instead.\n",
                                ka[i], key, node->key);
                        assert(0);
                }
@@ -513,15 +568,28 @@ int test_16bit_key(void)
 
                key = ka[i];    /* without offset */
                rcu_read_lock();
-               ja_node = cds_ja_lookup_lower_equal(test_ja, key);
+               ja_node = cds_ja_lookup_below_equal(test_ja, 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]) {
+                       fprintf(stderr, "Error lookup below equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 " instead.\n",
+                               ka[i], key, node->key);
+                       assert(0);
+               }
+
+               ja_node = cds_ja_lookup_above_equal(test_ja, key);
                if (!ja_node) {
-                       fprintf(stderr, "Error lookup lower equal. Cannot find expected key %" PRIu64" below or equal to %" PRIu64 ".\n",
+                       fprintf(stderr, "Error lookup above equal. Cannot find expected key %" PRIu64" above 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]) {
-                       fprintf(stderr, "Error lookup lower equal. Expecting key %" PRIu64 " below or equal to %" PRIu64 ", but found %" PRIu64 " instead.\n",
+                       fprintf(stderr, "Error lookup above equal. Expecting key %" PRIu64 " above or equal to %" PRIu64 ", but found %" PRIu64 " instead.\n",
                                ka[i], key, node->key);
                        assert(0);
                }
@@ -530,7 +598,7 @@ int test_16bit_key(void)
 
        printf("OK\n");
 
-       ret = cds_ja_destroy(test_ja, rcu_free_node);
+       ret = cds_ja_destroy(test_ja, free_node);
        if (ret) {
                fprintf(stderr, "Error destroying judy array\n");
                return -1;
@@ -665,7 +733,7 @@ int test_sparse_key(unsigned int bits, int nr_dup)
        }
        printf("OK\n");
 
-       ret = cds_ja_destroy(test_ja, rcu_free_node);
+       ret = cds_ja_destroy(test_ja, free_node);
        if (ret) {
                fprintf(stderr, "Error destroying judy array\n");
                return -1;
@@ -834,7 +902,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)++;
@@ -845,7 +913,7 @@ 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)++;
                                }
@@ -1011,7 +1079,7 @@ int do_mt_test(void)
        }
        rcu_thread_online_qsbr();
 
-       ret = cds_ja_destroy(test_ja, rcu_free_node);
+       ret = cds_ja_destroy(test_ja, free_node);
        if (ret) {
                fprintf(stderr, "Error destroying judy array\n");
                goto end;