rcuja test: destroy should be done online

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

diff --git a/tests/test_urcu_ja.c b/tests/test_urcu_ja.c
index c3467443506f9d1105e9e291d9a4fe34a88c6150..bad6784a446db3ecb1857de5c459dc93ffd66d13 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");
@@ -836,13 +836,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 +925,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 +965,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",