Remove rcu_publish_content()

API phased-out. Cannot use call_rcu anyway.

Use rcu_xchg_pointer and synchronize_rcu or
rcu_xchg_pointer and call_rcu instead.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

diff --git a/urcu-pointer-static.h b/urcu-pointer-static.h
index c2ba80025a2703b7edd69ac017ecc5cb9b57d1bc..06b8881a5ad3d1549f93f48ee977d1efde4a93d6 100644 (file)
--- a/urcu-pointer-static.h
+++ b/urcu-pointer-static.h
@@ -102,19 +102,6 @@
                STORE_SHARED(*(p), v);                  \
        })
 
-/*
- * _rcu_publish_content - Exchanges the pointer and waits for quiescent state.
- *
- * The pointer returned can be freed.
- */
-#define _rcu_publish_content(p, v)                     \
-       ({                                              \
-               void *oldptr;                           \
-               oldptr = _rcu_xchg_pointer(p, v);       \
-               synchronize_rcu();                      \
-               oldptr;                                 \
-       })
-
 /**
  * _rcu_assign_pointer - assign (publicize) a pointer to a new data structure
  * meant to be read by RCU read-side critical sections. Returns the assigned

diff --git a/urcu-pointer.c b/urcu-pointer.c
index 1461c60f367b032276db9b301bf57e93488a063b..93d49875d6226fcaf18ec4aba147c28994ad6f0d 100644 (file)
--- a/urcu-pointer.c
+++ b/urcu-pointer.c
@@ -52,12 +52,3 @@ void *rcu_cmpxchg_pointer_sym(void **p, void *old, void *_new)
        wmb();
        return uatomic_cmpxchg(p, old, _new);
 }
-
-void *rcu_publish_content_sym(void **p, void *v)
-{
-       void *oldptr;
-
-       oldptr = _rcu_xchg_pointer(p, v);
-       synchronize_rcu();
-       return oldptr;
-}

diff --git a/urcu-pointer.h b/urcu-pointer.h
index 748a37a0e7fe3e2f7d493a7b0276602ef1efbc99..0a3524fa1e0b7b65cd6ec8154c9a45b2bf36abb5 100644 (file)
--- a/urcu-pointer.h
+++ b/urcu-pointer.h
@@ -58,18 +58,6 @@
 #define rcu_xchg_pointer       _rcu_xchg_pointer
 #define rcu_set_pointer                _rcu_set_pointer
 
-/*
- * type *rcu_publish_content(type **ptr, type *new)
- *
- * Exchanges the pointer and waits for quiescent state. The pointer returned
- * can be freed. You are encouraged to use either
- * - rcu_cmpxchg_pointer
- * - rcu_xchg_pointer
- * - rcu_set_pointer
- * with call_rcu(free, ptr) instead to deal with reclamation more efficiently.
- */
-#define rcu_publish_content    _rcu_publish_content
-
 #else /* !_LGPL_SOURCE */
 
 extern void *rcu_dereference(void *p);
@@ -86,10 +74,6 @@ extern void *rcu_set_pointer_sym(void **p, void *v);
 #define rcu_set_pointer(p, v)                          \
        rcu_set_pointer_sym((void **)(p), (v))
 
-extern void *rcu_publish_content_sym(void **p, void *v);
-#define rcu_publish_content(p, v)                      \
-       rcu_publish_content_sym((void **)(p), (v))
-
 extern void *rcu_assign_pointer_sym(void **p, void *v);
 
 #endif /* !_LGPL_SOURCE */