#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/rculfqueue.h>
+#include <urcu/cds.h>
#include <urcu-defer.h>
static volatile int test_go, test_stop;
static inline void loop_sleep(unsigned long l)
{
while(l-- != 0)
- cpu_relax();
+ caa_cpu_relax();
}
static int verbose_mode;
static unsigned int nr_enqueuers;
static unsigned int nr_dequeuers;
-static struct rcu_lfq_queue q;
+struct test {
+ struct cds_lfq_node_rcu list;
+ struct rcu_head rcu;
+};
+
+static struct cds_lfq_queue_rcu q;
void *thr_enqueuer(void *_count)
{
while (!test_go)
{
}
- smp_mb();
+ cmm_smp_mb();
for (;;) {
- struct rcu_lfq_node *node = malloc(sizeof(*node));
+ struct test *node = malloc(sizeof(*node));
if (!node)
goto fail;
- rcu_lfq_node_init(node);
- rcu_lfq_enqueue(&q, node);
+ cds_lfq_node_init_rcu(&node->list);
+ rcu_read_lock();
+ cds_lfq_enqueue_rcu(&q, &node->list);
+ rcu_read_unlock();
nr_successful_enqueues++;
if (unlikely(wdelay))
}
-static void rcu_release_node(struct urcu_ref *ref)
+static
+void free_node_cb(struct rcu_head *head)
{
- struct rcu_lfq_node *node = container_of(ref, struct rcu_lfq_node, ref);
- defer_rcu(free, node);
- //synchronize_rcu();
- //free(node);
+ 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)
{
}
- smp_mb();
+ cmm_smp_mb();
for (;;) {
- struct rcu_lfq_node *node = rcu_lfq_dequeue(&q,
- rcu_release_node);
+ struct cds_lfq_node_rcu *qnode;
+ struct test *node;
+
+ rcu_read_lock();
+ qnode = cds_lfq_dequeue_rcu(&q);
+ node = caa_container_of(qnode, struct test, list);
+ rcu_read_unlock();
if (node) {
- urcu_ref_put(&node->ref, rcu_release_node);
+ call_rcu(&node->rcu, free_node_cb);
nr_successful_dequeues++;
}
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,
return ((void*)2);
}
-static void release_node(struct urcu_ref *ref)
-{
- struct rcu_lfq_node *node = container_of(ref, struct rcu_lfq_node, ref);
- free(node);
-}
-
-void test_end(struct rcu_lfq_queue *q, unsigned long long *nr_dequeues)
+void test_end(struct cds_lfq_queue_rcu *q, unsigned long long *nr_dequeues)
{
- struct rcu_lfq_node *node;
+ struct cds_lfq_node_rcu *snode;
do {
- node = rcu_lfq_dequeue(q, release_node);
- if (node) {
- urcu_ref_put(&node->ref, release_node);
+ snode = cds_lfq_dequeue_rcu(q);
+ if (snode) {
+ struct test *node;
+
+ node = caa_container_of(snode, struct test, list);
+ free(node); /* no more concurrent access */
(*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_lfq_init(&q);
+ cds_lfq_init_rcu(&q, call_rcu);
+ err = create_all_cpu_call_rcu_data(0);
+ assert(!err);
next_aff = 0;
exit(1);
}
- smp_mb();
+ cmm_smp_mb();
test_go = 1;
}
test_end(&q, &end_dequeues);
+ err = cds_lfq_destroy_rcu(&q);
+ assert(!err);
printf_verbose("total number of enqueues : %llu, dequeues %llu\n",
tot_enqueues, tot_dequeues);
tot_successful_enqueues,
tot_successful_dequeues + end_dequeues);
+ free_all_cpu_call_rcu_data();
free(count_enqueuer);
free(count_dequeuer);
free(tid_enqueuer);