X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=doc%2Fexamples%2Frculfqueue%2Fcds_lfq_dequeue.c;h=67d766a6c6a16f2b1ec0e4816e834057c4b006f7;hb=9fbbb7de38bf42ea2fcc9da5dcb220fcf3eca580;hp=d1375c8f2c65eea93b72afbb7dd5aa9016b850e8;hpb=d4b7140809acb8a9429fa97a4620c96674bd0c3c;p=userspace-rcu.git

diff --git a/doc/examples/rculfqueue/cds_lfq_dequeue.c b/doc/examples/rculfqueue/cds_lfq_dequeue.c
index d1375c8..67d766a 100644
--- a/doc/examples/rculfqueue/cds_lfq_dequeue.c
+++ b/doc/examples/rculfqueue/cds_lfq_dequeue.c
@@ -1,15 +1,8 @@
+// SPDX-FileCopyrightText: 2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+//
+// SPDX-License-Identifier: MIT
+
 /*
- * Copyright (C) 2013  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program for any
- * purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is
- * granted, provided the above notices are retained, and a notice that
- * the code was modified is included with the above copyright notice.
- *
  * This example shows how to dequeue nodes from a RCU lock-free queue.
  * This queue requires using a RCU scheme.
  */
@@ -17,7 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <urcu.h>		/* RCU flavor */
+#include <urcu/urcu-memb.h>	/* RCU flavor */
 #include <urcu/rculfqueue.h>	/* RCU Lock-free queue */
 #include <urcu/compiler.h>	/* For CAA_ARRAY_SIZE */
 
@@ -39,7 +32,7 @@ void free_node(struct rcu_head *head)
 	free(node);
 }
 
-int main(int argc, char **argv)
+int main(void)
 {
 	int values[] = { -5, 42, 36, 24, };
 	struct cds_lfq_queue_rcu myqueue;	/* Queue */
@@ -50,9 +43,9 @@ int main(int argc, char **argv)
 	 * Each thread need using RCU read-side need to be explicitly
 	 * registered.
 	 */
-	rcu_register_thread();
+	urcu_memb_register_thread();
 
-	cds_lfq_init_rcu(&myqueue, call_rcu);
+	cds_lfq_init_rcu(&myqueue, urcu_memb_call_rcu);
 
 	/*
 	 * Enqueue nodes.
@@ -72,9 +65,9 @@ int main(int argc, char **argv)
 		 * Both enqueue and dequeue need to be called within RCU
 		 * read-side critical section.
 		 */
-		rcu_read_lock();
+		urcu_memb_read_lock();
 		cds_lfq_enqueue_rcu(&myqueue, &node->node);
-		rcu_read_unlock();
+		urcu_memb_read_unlock();
 	}
 
 	/*
@@ -90,16 +83,16 @@ int main(int argc, char **argv)
 		 * Both enqueue and dequeue need to be called within RCU
 		 * read-side critical section.
 		 */
-		rcu_read_lock();
+		urcu_memb_read_lock();
 		qnode = cds_lfq_dequeue_rcu(&myqueue);
-		rcu_read_unlock();
+		urcu_memb_read_unlock();
 		if (!qnode) {
 			break;	/* Queue is empty. */
 		}
 		/* Getting the container structure from the node */
 		node = caa_container_of(qnode, struct mynode, node);
 		printf(" %d", node->value);
-		call_rcu(&node->rcu_head, free_node);
+		urcu_memb_call_rcu(&node->rcu_head, free_node);
 	}
 	printf("\n");
 	/*
@@ -110,6 +103,6 @@ int main(int argc, char **argv)
 		printf("Error destroying queue (non-empty)\n");
 	}
 end:
-	rcu_unregister_thread();
+	urcu_memb_unregister_thread();
 	return ret;
 }