rculfhash: Add initial hash population

[urcu.git] / tests / test_urcu_hash.c

diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index c3ea83f2b62ec68f269e0d51ab38bd55c338fffc..b13b1bd6f125d18dfbf4d6c6e603d21a49c33bd3 100644 (file)
--- a/tests/test_urcu_hash.c
+++ b/tests/test_urcu_hash.c
@@ -1,5 +1,5 @@
 /*
- * test_ht.c
+ * test_urcu_hash.c
  *
  * Userspace RCU library - test program
  *
@@ -66,13 +66,14 @@ static inline pid_t gettid(void)
 #else
 #define debug_yield_read()
 #endif
-#include <urcu.h>
+#include <urcu-qsbr.h>
 #include <urcu/rculfhash.h>
 #include <urcu-call-rcu.h>
 
 struct wr_count {
        unsigned long update_ops;
        unsigned long add;
+       unsigned long add_exist;
        unsigned long remove;
 };
 
@@ -101,6 +102,7 @@ static unsigned long duration;
 static unsigned long rduration;
 
 static unsigned long init_hash_size = DEFAULT_HASH_SIZE;
+static unsigned long init_populate;
 static unsigned long rand_pool = DEFAULT_RAND_POOL;
 static int add_only, add_unique;
 
@@ -368,6 +370,8 @@ void *thr_reader(void *_count)
                nr_reads++;
                if (unlikely(!test_duration_read()))
                        break;
+               if (unlikely((nr_reads & ((1 << 10) - 1)) == 0))
+                       rcu_quiescent_state();
        }
 
        rcu_unregister_thread();
@@ -458,6 +462,8 @@ void *thr_writer(void *_count)
                        break;
                if (unlikely(wdelay))
                        loop_sleep(wdelay);
+               if (unlikely((nr_writes & ((1 << 10) - 1)) == 0))
+                       rcu_quiescent_state();
        }
 
        rcu_unregister_thread();
@@ -469,10 +475,36 @@ void *thr_writer(void *_count)
                        nr_addexist, nr_del, nr_delnoent);
        count->update_ops = nr_writes;
        count->add = nr_add;
+       count->add_exist = nr_addexist;
        count->remove = nr_del;
        return ((void*)2);
 }
 
+static void populate_hash(void)
+{
+       struct cds_lfht_node *node, *ret_node;
+
+       if (!init_populate)
+               return;
+
+       while (nr_add < init_populate) {
+               node = malloc(sizeof(struct cds_lfht_node));
+               cds_lfht_node_init(node,
+                       (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool),
+                       sizeof(void *));
+               if (add_unique)
+                       ret_node = cds_lfht_add_unique(test_ht, node);
+               else
+                       cds_lfht_add(test_ht, node);
+               if (add_unique && ret_node != node) {
+                       free(node);
+                       nr_addexist++;
+               } else
+                       nr_add++;
+               nr_writes++;
+       }
+}
+
 void show_usage(int argc, char **argv)
 {
        printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]);
@@ -487,6 +519,7 @@ void show_usage(int argc, char **argv)
        printf(" [-h size] (initial hash table size)");
        printf(" [-u] Uniquify add.");
        printf(" [-i] Add only (no removal).");
+       printf(" [-k nr_nodes] Number of nodes to insert initially.");
        printf("\n");
 }
 
@@ -498,7 +531,7 @@ int main(int argc, char **argv)
        unsigned long long *count_reader;
        struct wr_count *count_writer;
        unsigned long long tot_reads = 0, tot_writes = 0,
-               tot_add = 0, tot_remove = 0;
+               tot_add = 0, tot_add_exist = 0, tot_remove = 0;
        unsigned long count, removed;
        int i, a, ret;
 
@@ -584,6 +617,9 @@ int main(int argc, char **argv)
                case 'i':
                        add_only = 1;
                        break;
+               case 'k':
+                       init_populate = atol(argv[++i]);
+                       break;
                }
        }
 
@@ -612,7 +648,7 @@ int main(int argc, char **argv)
        count_writer = malloc(sizeof(*count_writer) * nr_writers);
        test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL,
                         init_hash_size, call_rcu);
-
+       populate_hash();
         err = create_all_cpu_call_rcu_data(0);
         assert(!err);
 
@@ -651,6 +687,7 @@ int main(int argc, char **argv)
                        exit(1);
                tot_writes += count_writer[i].update_ops;
                tot_add += count_writer[i].add;
+               tot_add_exist += count_writer[i].add_exist;
                tot_remove += count_writer[i].remove;
        }
        printf("Counting nodes... ");
@@ -671,11 +708,11 @@ int main(int argc, char **argv)
        printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu "
                "nr_writers %3u "
                "wdelay %6lu rand_pool %12llu nr_reads %12llu nr_writes %12llu nr_ops %12llu "
-               "nr_add %12llu nr_remove %12llu nr_leaked %12llu\n",
+               "nr_add %12llu nr_add_fail %12llu nr_remove %12llu nr_leaked %12lld\n",
                argv[0], duration, nr_readers, rduration,
                nr_writers, wdelay, rand_pool, tot_reads, tot_writes,
-               tot_reads + tot_writes, tot_add, tot_remove,
-               tot_add - tot_remove - count);
+               tot_reads + tot_writes, tot_add, tot_add_exist, tot_remove,
+               (long long) tot_add + init_populate - tot_remove - count);
        free(tid_reader);
        free(tid_writer);
        free(count_reader);