X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=doc%2Fexamples%2Furcu-flavors%2Fmembarrier.c;h=2e8473421a6aa16f902013e6e542100c59b6a2f6;hb=HEAD;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..73b9bd8 100644
--- a/doc/examples/urcu-flavors/membarrier.c
+++ b/doc/examples/urcu-flavors/membarrier.c
@@ -1,20 +1,6 @@
-/*
- * Copyright (C) 2013  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
+// SPDX-FileCopyrightText: 2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -22,7 +8,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 */
 
@@ -47,7 +33,7 @@ int add_node(uint64_t v)
 {
 	struct mynode *node;
 
-	node = calloc(sizeof(*node), 1);
+	node = calloc(1, sizeof(*node));
 	if (!node)
 		return -1;
 	node->value = v;
@@ -63,7 +49,7 @@ void rcu_free_node(struct rcu_head *rh)
 	free(node);
 }
 
-int main(int argc, char **argv)
+int main(void)
 {
 	uint64_t values[] = { 42, 36, 24, };
 	unsigned int i;
@@ -74,7 +60,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 +77,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 +85,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 +99,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 +118,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;
 }