ja tests: add printout

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

diff --git a/tests/test_urcu_ja.c b/tests/test_urcu_ja.c
index 50f94cc771b5a0f089af98ca31b733660dcc9bc8..2832650435378569b99ac09254a29e25f24f33f3 100644 (file)
--- a/tests/test_urcu_ja.c
+++ b/tests/test_urcu_ja.c
@@ -74,6 +74,8 @@ unsigned int nr_writers;
 static unsigned int add_ratio = 50;
 static uint64_t key_mul = 1ULL;
 
+static int add_unique, add_replace;
+
 static pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 void set_affinity(void)
@@ -165,6 +167,8 @@ void show_usage(int argc, char **argv)
        printf("        [-c duration] (reader C.S. duration (in loops))\n");
        printf("        [-v] (verbose output)\n");
        printf("        [-a cpu#] [-a cpu#]... (affinity)\n");
+       printf("        [-u] Add unique keys.\n");
+       printf("        [-s] Replace existing keys.\n");
 printf("        [not -u nor -s] Add entries (supports redundant keys).\n");
        printf("        [-r ratio] Add ratio (in %% of add+removal).\n");
        printf("        [-k] Populate init nodes.\n");
@@ -175,7 +179,7 @@ printf("        [not -u nor -s] Add entries (supports redundant keys).\n");
        printf("        [-N size] Write pool size.\n");
        printf("        [-O size] Init pool size.\n");
        printf("        [-V] Validate lookups of init values (use with filled init pool, same lookup range, with different write range).\n");
-       printf("        [-s] Do sanity test.\n");
+       printf("        [-t] Do sanity test.\n");
        printf("        [-B] Key bits for multithread test (default: 32).\n");
        printf("        [-m factor] Key multiplication factor.\n");
        printf("\n\n");
@@ -666,20 +670,33 @@ 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)++;
-                       rcu_read_unlock();
-                       if (ret) {
-                               fprintf(stderr, "Error (%d) adding node %" PRIu64 "\n",
-                                       ret, key);
-                               assert(0);
+                       if (add_unique) {
+                               ret_node = cds_ja_add_unique(test_ja, key, &node->node);
+                               if (ret_node != &node->node) {
+                                       free(node);
+                                       URCU_TLS(nr_addexist)++;
+                               } else {
+                                       URCU_TLS(nr_add)++;
+                               }
+                       } else if (add_replace) {
+                               assert(0);      /* not implemented yet. */
+                       } else {
+                               ret = cds_ja_add(test_ja, key, &node->node);
+                               if (ret) {
+                                       fprintf(stderr, "Error in cds_ja_add: %d\n", ret);
+                                       free(node);
+                               } else {
+                                       URCU_TLS(nr_add)++;
+                               }
                        }
+                       rcu_read_unlock();
                } else {
                        struct ja_test_node *node;
 
@@ -836,13 +853,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);
@@ -948,7 +965,7 @@ int main(int argc, char **argv)
                case 'V':
                        validate_lookup = 1;
                        break;
-               case 's':
+               case 't':
                        sanity_test = 1;
                        break;
                case 'B':
@@ -957,6 +974,12 @@ int main(int argc, char **argv)
                case 'm':
                        key_mul = atoll(argv[++i]);
                        break;
+               case 'u':
+                       add_unique = 1;
+                       break;
+               case 's':
+                       add_replace = 1;
+                       break;
                }
        }
 
@@ -965,6 +988,9 @@ 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("Mode:%s%s.\n",
+               " add/remove",
+               add_unique ? " uniquify" : ( add_replace ? " replace" : " insert"));
        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);
@@ -972,6 +998,8 @@ int main(int argc, char **argv)
                lookup_pool_offset, lookup_pool_size);
        printf_verbose("Update pool size offset %lu size %lu.\n",
                write_pool_offset, write_pool_size);
+       if (validate_lookup)
+               printf_verbose("Validating lookups.\n");
        printf_verbose("thread %-6s, thread id : %lx, tid %lu\n",
                        "main", pthread_self(), (unsigned long)gettid());
 
@@ -998,16 +1026,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
        /*