X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=doc%2Fexamples%2Furcu-flavors%2Fmembarrier.c;h=f9523d5d16dbea16021f86a4b92e170abc71ad52;hb=b9050d917ab84db192b5609ba6dd9973a82d215a;hp=0c5be4c0aeae946dbd9c645273d318b8dfdf1231;hpb=56e47f8d20864a908c6111d38da150a71eaba354;p=urcu.git

diff --git a/doc/examples/urcu-flavors/membarrier.c b/doc/examples/urcu-flavors/membarrier.c
index 0c5be4c..f9523d5 100644
--- a/doc/examples/urcu-flavors/membarrier.c
+++ b/doc/examples/urcu-flavors/membarrier.c
@@ -22,7 +22,7 @@
 #include <stdint.h>
 #include <inttypes.h>
 
-#include <urcu.h>		/* Default: sys_membarrier() RCU flavor */
+#include <urcu/urcu-memb.h>	/* sys_membarrier() RCU flavor */
 #include <urcu/rculist.h>	/* List example */
 #include <urcu/compiler.h>	/* For CAA_ARRAY_SIZE */
 
@@ -74,7 +74,7 @@ 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();
 
 	/*
 	 * Adding nodes to the linked-list. Safe against concurrent
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
 	 * with rcu_read_lock() and rcu_read_unlock(). They can be
 	 * nested. Those are no-ops for the QSBR flavor.
 	 */
-	rcu_read_lock();
+	urcu_memb_read_lock();
 
 	/*
 	 * RCU traversal of the linked list.
@@ -99,7 +99,7 @@ int main(int argc, char **argv)
 	cds_list_for_each_entry_rcu(node, &mylist, node) {
 		printf("Value: %" PRIu64 "\n", node->value);
 	}
-	rcu_read_unlock();
+	urcu_memb_read_unlock();
 
 	/*
 	 * Removing nodes from linked list. Safe against concurrent RCU
@@ -113,9 +113,18 @@ int main(int argc, char **argv)
 		 * call_rcu() can be called from RCU read-side critical
 		 * sections.
 		 */
-		call_rcu(&node->rcu_head, rcu_free_node);
+		urcu_memb_call_rcu(&node->rcu_head, rcu_free_node);
 	}
 
+	/*
+	 * We can also wait for a quiescent state by calling
+	 * synchronize_rcu() rather than using call_rcu(). It is usually
+	 * a slower approach than call_rcu(), because the latter can
+	 * batch work. Moreover, call_rcu() can be called from a RCU
+	 * read-side critical section, but synchronize_rcu() should not.
+	 */
+	urcu_memb_synchronize_rcu();
+
 	sleep(1);
 
 	/*
@@ -123,9 +132,9 @@ int main(int argc, char **argv)
 	 * before program exits, or in library destructors, is a good
 	 * practice.
 	 */
-	rcu_barrier();
+	urcu_memb_barrier();
 
 end:
-	rcu_unregister_thread();
+	urcu_memb_unregister_thread();
 	return ret;
 }