#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
#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;
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;
+struct test {
+ struct cds_lfq_node_rcu list;
+ struct rcu_head rcu;
+};
+
static struct cds_lfq_queue_rcu q;
void *thr_enqueuer(void *_count)
cmm_smp_mb();
for (;;) {
- struct cds_lfq_node_rcu *node = malloc(sizeof(*node));
+ struct test *node = malloc(sizeof(*node));
if (!node)
goto fail;
- cds_lfq_node_init_rcu(node);
- cds_lfq_enqueue_rcu(&q, node);
- nr_successful_enqueues++;
+ cds_lfq_node_init_rcu(&node->list);
+ rcu_read_lock();
+ cds_lfq_enqueue_rcu(&q, &node->list);
+ rcu_read_unlock();
+ 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 rcu_release_node(struct urcu_ref *ref)
+static
+void free_node_cb(struct rcu_head *head)
{
- struct cds_lfq_node_rcu *node = caa_container_of(ref, struct cds_lfq_node_rcu, 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)
cmm_smp_mb();
for (;;) {
- struct cds_lfq_node_rcu *node = cds_lfq_dequeue_rcu(&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);
- nr_successful_dequeues++;
+ call_rcu(&node->rcu, free_node_cb);
+ URCU_TLS(nr_successful_dequeues)++;
}
- nr_dequeues++;
- if (unlikely(!test_duration_dequeue()))
+ 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);
}
-static void release_node(struct urcu_ref *ref)
-{
- struct cds_lfq_node_rcu *node = caa_container_of(ref, struct cds_lfq_node_rcu, ref);
- free(node);
-}
-
void test_end(struct cds_lfq_queue_rcu *q, unsigned long long *nr_dequeues)
{
- struct cds_lfq_node_rcu *node;
+ struct cds_lfq_node_rcu *snode;
do {
- node = cds_lfq_dequeue_rcu(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);
- cds_lfq_init_rcu(&q);
+ cds_lfq_init_rcu(&q, call_rcu);
+ 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;
}
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);
projects / urcu.git / blobdiff