RCU wait-free stack: add _blocking in pop() primitive name

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/tests/test_urcu_wfs.c b/tests/test_urcu_wfs.c
index 4802ee73d7745a73340fa2767f295d605fb10eca..73655c1dcec7c6ffbb8b23f42d2acb544eb54ff0 100644 (file)
--- a/tests/test_urcu_wfs.c
+++ b/tests/test_urcu_wfs.c
@@ -218,7 +218,7 @@ void *thr_dequeuer(void *_count)
        smp_mb();
 
        for (;;) {
-               struct rcu_wfs_node *node = rcu_wfs_pop(&s);
+               struct rcu_wfs_node *node = rcu_wfs_pop_blocking(&s);
 
                if (node) {
                        defer_rcu(free, node);
@@ -249,7 +249,7 @@ void test_end(struct rcu_wfs_stack *s, unsigned long long *nr_dequeues)
        struct rcu_wfs_node *node;
 
        do {
-               node = rcu_wfs_pop(s);
+               node = rcu_wfs_pop_blocking(s);
                if (node) {
                        free(node);
                        (*nr_dequeues)++;

diff --git a/urcu/rcuwfstack.h b/urcu/rcuwfstack.h
index f9a45b2209af131fb80724e8e9fc317b094f5c9f..300c95e3280b47c809b51a433d08844421f79525 100644 (file)
--- a/urcu/rcuwfstack.h
+++ b/urcu/rcuwfstack.h
@@ -29,7 +29,7 @@
 #error "Dynamic loader LGPL wrappers not implemented yet"
 #endif
 
-#define RCU_WF_STACK_END ((void *)0x1UL)
+#define RCU_WF_STACK_END               ((void *)0x1UL)
 
 struct rcu_wfs_node {
        struct rcu_wfs_node *next;
@@ -83,7 +83,7 @@ void rcu_wfs_push(struct rcu_wfs_stack *s, struct rcu_wfs_node *node)
  * loops. Better for UP.
  */
 struct rcu_wfs_node *
-rcu_wfs_pop(struct rcu_wfs_stack *s)
+rcu_wfs_pop_blocking(struct rcu_wfs_stack *s)
 {
        for (;;) {
                struct rcu_wfs_node *head;