rculfhash: put thread offline before taking mutex (fix G.P. deadlock)

[urcu.git] / tests / test_urcu_hash.c

diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index 80169127dcd3121b59cd9d6b082ec2a0eaa30960..d7c2fc2da4098ea37de585590564e403032fadbe 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,6 +116,7 @@ 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 inline void loop_sleep(unsigned long l)
@@ -554,6 +567,7 @@ 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("\n");
 }
 
@@ -656,6 +670,9 @@ int main(int argc, char **argv)
                case 'k':
                        init_populate = atol(argv[++i]);
                        break;
+               case 'A':
+                       opt_auto_resize = 1;
+                       break;
                }
        }
 
@@ -697,7 +714,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);
@@ -767,6 +788,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);