rcuja tests: return errors

[urcu.git] / tests / test_urcu_ja.c

diff --git a/tests/test_urcu_ja.c b/tests/test_urcu_ja.c
index c3467443506f9d1105e9e291d9a4fe34a88c6150..85404845800ff8e47458b85728f5303cedda9fd8 100644 (file)
--- a/tests/test_urcu_ja.c
+++ b/tests/test_urcu_ja.c
@@ -167,7 +167,7 @@ void show_usage(int argc, char **argv)
        printf("        [-a cpu#] [-a cpu#]... (affinity)\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");
@@ -666,19 +666,20 @@ void *test_ja_rw_thr_writer(void *_count)
                if ((addremove == AR_ADD)
                                || (addremove == AR_RANDOM && is_add())) {
                        struct ja_test_node *node = malloc(sizeof(*node));
+                       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)++;
+                       ret_node = cds_ja_add_unique(test_ja, key, &node->node);
                        rcu_read_unlock();
-                       if (ret) {
-                               fprintf(stderr, "Error (%d) adding node %" PRIu64 "\n",
-                                       ret, key);
-                               assert(0);
+                       if (ret_node != &node->node) {
+                               free(node);
+                               URCU_TLS(nr_addexist)++;
+                       } else {
+                               URCU_TLS(nr_add)++;
                        }
                } else {
                        struct ja_test_node *node;
@@ -836,13 +837,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);
@@ -925,7 +926,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]);
@@ -965,6 +966,7 @@ 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("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",
@@ -997,16 +999,17 @@ 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;
+
+       if (ret) {
+               printf("Test ended with error: %d\n", ret);
+       }
+       return ret;
 
 #if 0
        /*