rculfhash tests: make node count RCU aware

[urcu.git] / tests / test_urcu_hash.c

diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index d2dd4889f70d45361a6a88c84efea516f13cece8..a6139c1a2d3c9894e39051ab1b2a08f8d09b0208 100644 (file)
--- a/tests/test_urcu_hash.c
+++ b/tests/test_urcu_hash.c
@@ -397,7 +397,8 @@ void *thr_count(void *arg)
        rcu_register_thread();
 
        for (;;) {
-               unsigned long count, removed, approx_before, approx_after;
+               unsigned long count, removed;
+               long approx_before, approx_after;
                ssize_t len;
                char buf[1];
 
@@ -416,12 +417,12 @@ void *thr_count(void *arg)
                                &approx_after);
                rcu_read_unlock();
                printf("done.\n");
-               printf("Approximation before node accounting: %lu nodes.\n",
+               printf("Approximation before node accounting: %ld nodes.\n",
                        approx_before);
                printf("Accounting of nodes in the hash table: "
                        "%lu nodes + %lu logically removed.\n",
                        count, removed);
-               printf("Approximation after node accounting: %lu nodes.\n",
+               printf("Approximation after node accounting: %ld nodes.\n",
                        approx_after);
        }
        rcu_unregister_thread();
@@ -672,7 +673,8 @@ int main(int argc, char **argv)
        struct wr_count *count_writer;
        unsigned long long tot_reads = 0, tot_writes = 0,
                tot_add = 0, tot_add_exist = 0, tot_remove = 0;
-       unsigned long count, removed, approx_before, approx_after;
+       unsigned long count, removed;
+       long approx_before, approx_after;
        int i, a, ret;
        struct sigaction act;
        unsigned int remain;
@@ -870,7 +872,8 @@ int main(int argc, char **argv)
                        opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0, NULL);
        ret = populate_hash();
        assert(!ret);
-       rcu_unregister_thread();
+
+       rcu_thread_offline();
 
        next_aff = 0;
 
@@ -932,20 +935,23 @@ int main(int argc, char **argv)
 
        printf("Counting nodes... ");
        fflush(stdout);
+       rcu_thread_online();
+       rcu_read_lock();
        cds_lfht_count_nodes(test_ht, &approx_before, &count, &removed,
                &approx_after);
+       rcu_read_unlock();
+       rcu_thread_offline();
        printf("done.\n");
        if (count || removed) {
-               printf("Approximation before node accounting: %lu nodes.\n",
+               printf("Approximation before node accounting: %ld nodes.\n",
                        approx_before);
                printf("WARNING: nodes left in the hash table upon destroy: "
                        "%lu nodes + %lu logically removed.\n",
                        count, removed);
-               printf("Approximation after node accounting: %lu nodes.\n",
+               printf("Approximation after node accounting: %ld nodes.\n",
                        approx_after);
        }
        ret = cds_lfht_destroy(test_ht, NULL);
-
        if (ret)
                printf_verbose("final delete aborted\n");
        else
@@ -960,6 +966,7 @@ int main(int argc, char **argv)
                nr_writers, wdelay, tot_reads, tot_writes,
                tot_reads + tot_writes, tot_add, tot_add_exist, tot_remove,
                (long long) tot_add + init_populate - tot_remove - count);
+       rcu_unregister_thread();
        free_all_cpu_call_rcu_data();
        free(tid_reader);
        free(tid_writer);