rculfhash test: add pool offsets

[urcu.git] / tests / test_urcu_hash.c

diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index 88dd1ae0dfcf4189c2e93101f9b940494662b782..4a5ca552416223c3f4bf0ce6f1ae6baba0565985 100644 (file)
--- a/tests/test_urcu_hash.c
+++ b/tests/test_urcu_hash.c
@@ -46,6 +46,18 @@
 /* hardcoded number of CPUs */
 #define NR_CPUS 16384
 
+#ifdef POISON_FREE
+#define poison_free(ptr)                               \
+       do {                                            \
+               memset(ptr, 0x42, sizeof(*(ptr)));      \
+               free(ptr);                              \
+       } while (0)
+#else
+#define poison_free(ptr)       free(ptr)
+#endif
+
+
+
 #if defined(_syscall0)
 _syscall0(pid_t, gettid)
 #elif defined(__NR_gettid)
@@ -104,8 +116,11 @@ 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 opt_auto_resize;
 static int add_only, add_unique;
 
+static unsigned long init_pool_offset, lookup_pool_offset, write_pool_offset;
+
 static inline void loop_sleep(unsigned long l)
 {
        while(l-- != 0)
@@ -151,6 +166,31 @@ static void set_affinity(void)
        sched_setaffinity(0, sizeof(mask), &mask);
 }
 
+static enum {
+       AR_RANDOM = 0,
+       AR_ADD = 1,
+       AR_REMOVE = -1,
+} addremove;   /* 1: add, -1 remove, 0: random */
+
+static
+void sigusr1_handler(int signo)
+{
+       switch (addremove) {
+       case AR_ADD:
+               printf("Add/Remove: random.\n");
+               addremove = AR_RANDOM;
+               break;
+       case AR_RANDOM:
+               printf("Add/Remove: remove only.\n");
+               addremove = AR_REMOVE;
+               break;
+       case AR_REMOVE:
+               printf("Add/Remove: add only.\n");
+               addremove = AR_ADD;
+               break;
+       }
+}
+
 /*
  * returns 0 if test should end.
  */
@@ -357,7 +397,7 @@ void *thr_reader(void *_count)
        for (;;) {
                rcu_read_lock();
                node = cds_lfht_lookup(test_ht,
-                       (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool),
+                       (void *)(unsigned long)((rand_r(&rand_lookup) % rand_pool) + lookup_pool_offset),
                        sizeof(void *));
                if (node == NULL)
                        lookup_fail++;
@@ -412,11 +452,12 @@ void *thr_writer(void *_count)
        cmm_smp_mb();
 
        for (;;) {
-               if (add_only || rand_r(&rand_lookup) & 1) {
+               if ((addremove == AR_ADD || add_only)
+                               || (addremove == AR_RANDOM && rand_r(&rand_lookup) & 1)) {
                        node = malloc(sizeof(struct cds_lfht_node));
                        rcu_read_lock();
                        cds_lfht_node_init(node,
-                               (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool),
+                               (void *)(unsigned long)((rand_r(&rand_lookup) % rand_pool) + write_pool_offset),
                                sizeof(void *));
                        if (add_unique)
                                ret_node = cds_lfht_add_unique(test_ht, node);
@@ -432,7 +473,7 @@ void *thr_writer(void *_count)
                        /* May delete */
                        rcu_read_lock();
                        node = cds_lfht_lookup(test_ht,
-                               (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool),
+                               (void *)(unsigned long)((rand_r(&rand_lookup) % rand_pool) + write_pool_offset),
                                sizeof(void *));
                        if (node)
                                ret = cds_lfht_remove(test_ht, node);
@@ -497,7 +538,7 @@ static int populate_hash(void)
        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),
+                       (void *)(unsigned long)((rand_r(&rand_lookup) % rand_pool) + init_pool_offset),
                        sizeof(void *));
                if (add_unique)
                        ret_node = cds_lfht_add_unique(test_ht, node);
@@ -528,6 +569,10 @@ void show_usage(int argc, char **argv)
        printf(" [-u] Uniquify add.");
        printf(" [-i] Add only (no removal).");
        printf(" [-k nr_nodes] Number of nodes to insert initially.");
+       printf(" [-A] Automatically resize hash table.");
+       printf(" [-R offset] Lookup pool offset\n");
+       printf(" [-S offset] Write pool offset\n");
+       printf(" [-T offset] Init pool offset\n");
        printf("\n");
 }
 
@@ -542,6 +587,8 @@ int main(int argc, char **argv)
                tot_add = 0, tot_add_exist = 0, tot_remove = 0;
        unsigned long count, removed;
        int i, a, ret;
+       struct sigaction act;
+       unsigned int remain;
 
        if (argc < 4) {
                show_usage(argc, argv);
@@ -628,6 +675,19 @@ int main(int argc, char **argv)
                case 'k':
                        init_populate = atol(argv[++i]);
                        break;
+               case 'A':
+                       opt_auto_resize = 1;
+                       break;
+               case 'R':
+                       lookup_pool_offset = atol(argv[++i]);
+                       break;
+               case 'S':
+                       write_pool_offset = atol(argv[++i]);
+                       break;
+               case 'T':
+                       init_pool_offset = atol(argv[++i]);
+                       break;
+
                }
        }
 
@@ -638,6 +698,20 @@ int main(int argc, char **argv)
                return -1;
        }
 
+       memset(&act, 0, sizeof(act));
+       ret = sigemptyset(&act.sa_mask);
+       if (ret == -1) {
+               perror("sigemptyset");
+               return -1;
+       }
+       act.sa_handler = sigusr1_handler;
+       act.sa_flags = SA_RESTART;
+       ret = sigaction(SIGUSR1, &act, NULL);
+       if (ret == -1) {
+               perror("sigaction");
+               return -1;
+       }
+
        printf_verbose("running test for %lu seconds, %u readers, %u writers.\n",
                duration, nr_readers, nr_writers);
        printf_verbose("Writer delay : %lu loops.\n", wdelay);
@@ -655,7 +729,11 @@ int main(int argc, char **argv)
        count_reader = malloc(sizeof(*count_reader) * nr_readers);
        count_writer = malloc(sizeof(*count_writer) * nr_writers);
        test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL,
-                        init_hash_size, call_rcu);
+                       init_hash_size,
+                       opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0,
+                       call_rcu, synchronize_rcu, rcu_read_lock,
+                       rcu_read_unlock, rcu_thread_offline,
+                       rcu_thread_online);
        ret = populate_hash();
        assert(!ret);
         err = create_all_cpu_call_rcu_data(0);
@@ -680,7 +758,10 @@ int main(int argc, char **argv)
 
        test_go = 1;
 
-       sleep(duration);
+       remain = duration;
+       do {
+               remain = sleep(remain);
+       } while (remain > 0);
 
        test_stop = 1;
 
@@ -722,6 +803,7 @@ int main(int argc, char **argv)
                nr_writers, wdelay, rand_pool, tot_reads, tot_writes,
                tot_reads + tot_writes, tot_add, tot_add_exist, tot_remove,
                (long long) tot_add + init_populate - tot_remove - count);
+       free_all_cpu_call_rcu_data();
        free(tid_reader);
        free(tid_writer);
        free(count_reader);