#include <unistd.h>
#include <stdio.h>
#include <assert.h>
-#include <sys/syscall.h>
#include <sched.h>
#include <errno.h>
#include <urcu/arch.h>
+#ifdef __linux__
+#include <syscall.h>
+#endif
+
/* hardcoded number of CPUs */
#define NR_CPUS 16384
#define _LGPL_SOURCE
#endif
#include <urcu.h>
-#include <urcu/rculfstack.h>
+#include <urcu/cds.h>
#include <urcu-defer.h>
static volatile int test_go, test_stop;
static unsigned int nr_enqueuers;
static unsigned int nr_dequeuers;
-static struct rcu_lfs_stack s;
+struct test {
+ struct cds_lfs_node_rcu list;
+ struct rcu_head rcu;
+};
+
+static struct cds_lfs_stack_rcu s;
void *thr_enqueuer(void *_count)
{
cmm_smp_mb();
for (;;) {
- struct rcu_lfs_node *node = malloc(sizeof(*node));
+ struct test *node = malloc(sizeof(*node));
if (!node)
goto fail;
- rcu_lfs_node_init(node);
- rcu_lfs_push(&s, node);
+ cds_lfs_node_init_rcu(&node->list);
+ /* No rcu read-side is needed for push */
+ cds_lfs_push_rcu(&s, &node->list);
nr_successful_enqueues++;
- if (unlikely(wdelay))
+ if (caa_unlikely(wdelay))
loop_sleep(wdelay);
fail:
nr_enqueues++;
- if (unlikely(!test_duration_enqueue()))
+ if (caa_unlikely(!test_duration_enqueue()))
break;
}
}
+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;
+ int ret;
printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
"dequeuer", pthread_self(), (unsigned long)gettid());
set_affinity();
- rcu_defer_register_thread();
+ ret = rcu_defer_register_thread();
+ if (ret) {
+ printf("Error in rcu_defer_register_thread\n");
+ exit(-1);
+ }
rcu_register_thread();
while (!test_go)
cmm_smp_mb();
for (;;) {
- struct rcu_lfs_node *node = rcu_lfs_pop(&s);
+ struct cds_lfs_node_rcu *snode;
+ struct test *node;
+ rcu_read_lock();
+ snode = cds_lfs_pop_rcu(&s);
+ node = caa_container_of(snode, struct test, list);
+ rcu_read_unlock();
if (node) {
- defer_rcu(free, node);
+ call_rcu(&node->rcu, free_node_cb);
nr_successful_dequeues++;
}
-
nr_dequeues++;
- if (unlikely(!test_duration_dequeue()))
+ if (caa_unlikely(!test_duration_dequeue()))
break;
- if (unlikely(rduration))
+ if (caa_unlikely(rduration))
loop_sleep(rduration);
}
return ((void*)2);
}
-void test_end(struct rcu_lfs_stack *s, unsigned long long *nr_dequeues)
+void test_end(struct cds_lfs_stack_rcu *s, unsigned long long *nr_dequeues)
{
- struct rcu_lfs_node *node;
+ struct cds_lfs_node_rcu *snode;
do {
- node = rcu_lfs_pop(s);
- if (node) {
+ snode = cds_lfs_pop_rcu(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)
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);
- rcu_lfs_init(&s);
+ cds_lfs_init_rcu(&s);
+ err = create_all_cpu_call_rcu_data(0);
+ assert(!err);
next_aff = 0;
tot_successful_enqueues,
tot_successful_dequeues + end_dequeues);
+ free_all_cpu_call_rcu_data();
free(count_enqueuer);
free(count_dequeuer);
free(tid_enqueuer);