X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_lfq.c;h=de7c8a39a209d30e54fd652c69e4f6fc72db0819;hb=16aa9ee87cf4364921c36025359be01390338d87;hp=87c53b6c25460b89b1837dddf5cfe3ce1fa80471;hpb=453629a9317adef5b96c3d55e4dcd98db680997a;p=urcu.git

diff --git a/tests/test_urcu_lfq.c b/tests/test_urcu_lfq.c
index 87c53b6..de7c8a3 100644
--- a/tests/test_urcu_lfq.c
+++ b/tests/test_urcu_lfq.c
@@ -77,7 +77,7 @@ static unsigned long wdelay;
 static inline void loop_sleep(unsigned long l)
 {
 	while(l-- != 0)
-		cpu_relax();
+		caa_cpu_relax();
 }
 
 static int verbose_mode;
@@ -154,7 +154,7 @@ static unsigned long long __thread nr_successful_enqueues;
 static unsigned int nr_enqueuers;
 static unsigned int nr_dequeuers;
 
-static struct rcu_lfq_queue q;
+static struct cds_lfq_queue_rcu q;
 
 void *thr_enqueuer(void *_count)
 {
@@ -170,14 +170,14 @@ void *thr_enqueuer(void *_count)
 	while (!test_go)
 	{
 	}
-	smp_mb();
+	cmm_smp_mb();
 
 	for (;;) {
-		struct rcu_lfq_node *node = malloc(sizeof(*node));
+		struct cds_lfq_node_rcu *node = malloc(sizeof(*node));
 		if (!node)
 			goto fail;
-		rcu_lfq_node_init(node);
-		rcu_lfq_enqueue(&q, node);
+		cds_lfq_node_init_rcu(node);
+		cds_lfq_enqueue_rcu(&q, node);
 		nr_successful_enqueues++;
 
 		if (unlikely(wdelay))
@@ -202,7 +202,7 @@ fail:
 
 static void rcu_release_node(struct urcu_ref *ref)
 {
-	struct rcu_lfq_node *node = container_of(ref, struct rcu_lfq_node, ref);
+	struct cds_lfq_node_rcu *node = caa_container_of(ref, struct cds_lfq_node_rcu, ref);
 	defer_rcu(free, node);
 	//synchronize_rcu();
 	//free(node);
@@ -223,10 +223,10 @@ void *thr_dequeuer(void *_count)
 	while (!test_go)
 	{
 	}
-	smp_mb();
+	cmm_smp_mb();
 
 	for (;;) {
-		struct rcu_lfq_node *node = rcu_lfq_dequeue(&q,
+		struct cds_lfq_node_rcu *node = cds_lfq_dequeue_rcu(&q,
 							    rcu_release_node);
 
 		if (node) {
@@ -255,16 +255,16 @@ void *thr_dequeuer(void *_count)
 
 static void release_node(struct urcu_ref *ref)
 {
-	struct rcu_lfq_node *node = container_of(ref, struct rcu_lfq_node, ref);
+	struct cds_lfq_node_rcu *node = caa_container_of(ref, struct cds_lfq_node_rcu, 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 *node;
 
 	do {
-		node = rcu_lfq_dequeue(q, release_node);
+		node = cds_lfq_dequeue_rcu(q, release_node);
 		if (node) {
 			urcu_ref_put(&node->ref, release_node);
 			(*nr_dequeues)++;
@@ -363,7 +363,7 @@ 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);
-	rcu_lfq_init(&q);
+	cds_lfq_init_rcu(&q);
 
 	next_aff = 0;
 
@@ -380,7 +380,7 @@ int main(int argc, char **argv)
 			exit(1);
 	}
 
-	smp_mb();
+	cmm_smp_mb();
 
 	test_go = 1;