X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_lfq.c;h=66ddd410c6d7d80c26bd35bf95e425fbfaf611ae;hp=b61a7d4815788af2bcd9e197dc319a8eb053791a;hb=bd252a04bbbb163aa4d8864b1e1e5a3a4d9d0892;hpb=34b1b9db1cc283c556af5f35f70ea2e4713a440d

diff --git a/tests/test_urcu_lfq.c b/tests/test_urcu_lfq.c
index b61a7d4..66ddd41 100644
--- a/tests/test_urcu_lfq.c
+++ b/tests/test_urcu_lfq.c
@@ -38,6 +38,7 @@
 #include <errno.h>
 
 #include <urcu/arch.h>
+#include <urcu/tls-compat.h>
 
 #ifdef __linux__
 #include <syscall.h>
@@ -148,15 +149,20 @@ 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;
 
+struct test {
+	struct cds_lfq_node_rcu list;
+	struct rcu_head rcu;
+};
+
 static struct cds_lfq_queue_rcu q;
 
 void *thr_enqueuer(void *_count)
@@ -176,35 +182,43 @@ 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_node_init_rcu(&node->list);
 		rcu_read_lock();
-		cds_lfq_enqueue_rcu(&q, node);
+		cds_lfq_enqueue_rcu(&q, &node->list);
 		rcu_read_unlock();
-		nr_successful_enqueues++;
+		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;
@@ -228,21 +242,23 @@ void *thr_dequeuer(void *_count)
 	cmm_smp_mb();
 
 	for (;;) {
-		struct cds_lfq_node_rcu *node;
+		struct cds_lfq_node_rcu *qnode;
+		struct test *node;
 
 		rcu_read_lock();
-		node = cds_lfq_dequeue_rcu(&q);
+		qnode = cds_lfq_dequeue_rcu(&q);
+		node = caa_container_of(qnode, struct test, list);
 		rcu_read_unlock();
 
 		if (node) {
-			defer_rcu(free, 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);
 	}
 
@@ -250,26 +266,27 @@ void *thr_dequeuer(void *_count)
 	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_lfq_queue_rcu *q, unsigned long long *nr_dequeues)
 {
-	struct cds_lfq_node_rcu *node;
+	struct cds_lfq_node_rcu *snode;
 
 	do {
-		rcu_read_lock();
-		node = cds_lfq_dequeue_rcu(q);
-		rcu_read_unlock();
-		if (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)
@@ -364,6 +381,10 @@ int main(int argc, char **argv)
 	count_enqueuer = malloc(2 * sizeof(*count_enqueuer) * nr_enqueuers);
 	count_dequeuer = malloc(2 * sizeof(*count_dequeuer) * nr_dequeuers);
 	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;
 
@@ -432,6 +453,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);