lfstack: implement empty, pop_all and iterators, document API
[urcu.git] / tests / test_urcu_lfs.c
index 8335f2459f1f05533da21d5f0cc557ef815e28d9..ec0fa13988d6f6525af33bc2dc6b0cf534710899 100644 (file)
@@ -1,9 +1,9 @@
 /*
  * test_urcu_lfs.c
  *
- * Userspace RCU library - example RCU-based lock-free stack
+ * Userspace RCU library - example lock-free stack
  *
- * Copyright February 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright February 2010 - Paolo Bonzini <pbonzini@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
-#include <sys/syscall.h>
 #include <sched.h>
 #include <errno.h>
 
 #include <urcu/arch.h>
+#include <urcu/tls-compat.h>
+
+#ifdef __linux__
+#include <syscall.h>
+#endif
 
 /* hardcoded number of CPUs */
 #define NR_CPUS 16384
@@ -62,8 +66,7 @@ static inline pid_t gettid(void)
 #define _LGPL_SOURCE
 #endif
 #include <urcu.h>
-#include <urcu/rculfstack.h>
-#include <urcu-defer.h>
+#include <urcu/cds.h>
 
 static volatile int test_go, test_stop;
 
@@ -74,9 +77,9 @@ static unsigned long duration;
 /* read-side C.S. duration, in loops */
 static unsigned long wdelay;
 
-static inline void loop_sleep(unsigned long l)
+static inline void loop_sleep(unsigned long loops)
 {
-       while(l-- != 0)
+       while (loops-- != 0)
                caa_cpu_relax();
 }
 
@@ -102,9 +105,10 @@ typedef unsigned long cpu_set_t;
 
 static void set_affinity(void)
 {
+#if HAVE_SCHED_SETAFFINITY
        cpu_set_t mask;
-       int cpu;
-       int ret;
+       int cpu, ret;
+#endif /* HAVE_SCHED_SETAFFINITY */
 
        if (!use_affinity)
                return;
@@ -145,16 +149,21 @@ static int test_duration_enqueue(void)
        return !test_stop;
 }
 
-static unsigned long long __thread nr_dequeues;
-static unsigned long long __thread nr_enqueues;
+static DEFINE_URCU_TLS(unsigned long long, nr_dequeues);
+static DEFINE_URCU_TLS(unsigned long long, nr_enqueues);
 
-static unsigned long long __thread nr_successful_dequeues;
-static unsigned long long __thread nr_successful_enqueues;
+static DEFINE_URCU_TLS(unsigned long long, nr_successful_dequeues);
+static DEFINE_URCU_TLS(unsigned long long, nr_successful_enqueues);
 
 static unsigned int nr_enqueuers;
 static unsigned int nr_dequeuers;
 
-static struct cds_lfs_stack_rcu s;
+struct test {
+       struct cds_lfs_node list;
+       struct rcu_head rcu;
+};
+
+static struct cds_lfs_stack s;
 
 void *thr_enqueuer(void *_count)
 {
@@ -173,33 +182,41 @@ void *thr_enqueuer(void *_count)
        cmm_smp_mb();
 
        for (;;) {
-               struct cds_lfs_node_rcu *node = malloc(sizeof(*node));
+               struct test *node = malloc(sizeof(*node));
                if (!node)
                        goto fail;
-               cds_lfs_node_init_rcu(node);
-               cds_lfs_push_rcu(&s, node);
-               nr_successful_enqueues++;
+               cds_lfs_node_init(&node->list);
+               cds_lfs_push(&s, &node->list);
+               URCU_TLS(nr_successful_enqueues)++;
 
-               if (unlikely(wdelay))
+               if (caa_unlikely(wdelay))
                        loop_sleep(wdelay);
 fail:
-               nr_enqueues++;
-               if (unlikely(!test_duration_enqueue()))
+               URCU_TLS(nr_enqueues)++;
+               if (caa_unlikely(!test_duration_enqueue()))
                        break;
        }
 
        rcu_unregister_thread();
 
-       count[0] = nr_enqueues;
-       count[1] = nr_successful_enqueues;
+       count[0] = URCU_TLS(nr_enqueues);
+       count[1] = URCU_TLS(nr_successful_enqueues);
        printf_verbose("enqueuer thread_end, thread id : %lx, tid %lu, "
                       "enqueues %llu successful_enqueues %llu\n",
-                      pthread_self(), (unsigned long)gettid(), nr_enqueues,
-                      nr_successful_enqueues);
+                      pthread_self(), (unsigned long)gettid(),
+                      URCU_TLS(nr_enqueues), URCU_TLS(nr_successful_enqueues));
        return ((void*)1);
 
 }
 
+static
+void free_node_cb(struct rcu_head *head)
+{
+       struct test *node =
+               caa_container_of(head, struct test, rcu);
+       free(node);
+}
+
 void *thr_dequeuer(void *_count)
 {
        unsigned long long *count = _count;
@@ -209,7 +226,6 @@ void *thr_dequeuer(void *_count)
 
        set_affinity();
 
-       rcu_defer_register_thread();
        rcu_register_thread();
 
        while (!test_go)
@@ -218,43 +234,50 @@ void *thr_dequeuer(void *_count)
        cmm_smp_mb();
 
        for (;;) {
-               struct cds_lfs_node_rcu *node = cds_lfs_pop_rcu(&s);
+               struct cds_lfs_node *snode;
 
-               if (node) {
-                       defer_rcu(free, node);
-                       nr_successful_dequeues++;
-               }
+               rcu_read_lock();
+               snode = __cds_lfs_pop(&s);
+               rcu_read_unlock();
+               if (snode) {
+                       struct test *node;
 
-               nr_dequeues++;
-               if (unlikely(!test_duration_dequeue()))
+                       node = caa_container_of(snode, struct test, list);
+                       call_rcu(&node->rcu, free_node_cb);
+                       URCU_TLS(nr_successful_dequeues)++;
+               }
+               URCU_TLS(nr_dequeues)++;
+               if (caa_unlikely(!test_duration_dequeue()))
                        break;
-               if (unlikely(rduration))
+               if (caa_unlikely(rduration))
                        loop_sleep(rduration);
        }
 
        rcu_unregister_thread();
-       rcu_defer_unregister_thread();
 
        printf_verbose("dequeuer thread_end, thread id : %lx, tid %lu, "
                       "dequeues %llu, successful_dequeues %llu\n",
-                      pthread_self(), (unsigned long)gettid(), nr_dequeues,
-                      nr_successful_dequeues);
-       count[0] = nr_dequeues;
-       count[1] = nr_successful_dequeues;
+                      pthread_self(), (unsigned long)gettid(),
+                      URCU_TLS(nr_dequeues), URCU_TLS(nr_successful_dequeues));
+       count[0] = URCU_TLS(nr_dequeues);
+       count[1] = URCU_TLS(nr_successful_dequeues);
        return ((void*)2);
 }
 
-void test_end(struct cds_lfs_stack_rcu *s, unsigned long long *nr_dequeues)
+void test_end(struct cds_lfs_stack *s, unsigned long long *nr_dequeues)
 {
-       struct cds_lfs_node_rcu *node;
+       struct cds_lfs_node *snode;
 
        do {
-               node = cds_lfs_pop_rcu(s);
-               if (node) {
+               snode = __cds_lfs_pop(s);
+               if (snode) {
+                       struct test *node;
+
+                       node = caa_container_of(snode, struct test, list);
                        free(node);
                        (*nr_dequeues)++;
                }
-       } while (node);
+       } while (snode);
 }
 
 void show_usage(int argc, char **argv)
@@ -348,7 +371,11 @@ int main(int argc, char **argv)
        tid_dequeuer = malloc(sizeof(*tid_dequeuer) * nr_dequeuers);
        count_enqueuer = malloc(2 * sizeof(*count_enqueuer) * nr_enqueuers);
        count_dequeuer = malloc(2 * sizeof(*count_dequeuer) * nr_dequeuers);
-       cds_lfs_init_rcu(&s);
+       cds_lfs_init(&s);
+       err = create_all_cpu_call_rcu_data(0);
+       if (err) {
+               printf("Per-CPU call_rcu() worker threads unavailable. Using default global worker thread.\n");
+       }
 
        next_aff = 0;
 
@@ -415,6 +442,7 @@ int main(int argc, char **argv)
                       tot_successful_enqueues,
                       tot_successful_dequeues + end_dequeues);
 
+       free_all_cpu_call_rcu_data();
        free(count_enqueuer);
        free(count_dequeuer);
        free(tid_enqueuer);
This page took 0.028681 seconds and 4 git commands to generate.