Add back uatomic_arch.h for slow deprecation process

[urcu.git] / urcu / wfqueue.h

diff --git a/urcu/wfqueue.h b/urcu/wfqueue.h
index 3d32b05c580c4634fd98a373cf86514228d3adba..03a73f19fa567dfae0c8f5aba97cec9b4212f414 100644 (file)
--- a/urcu/wfqueue.h
+++ b/urcu/wfqueue.h
@@ -40,31 +40,34 @@ extern "C" {
  * Paul E. McKenney.
  */
 
-struct wfq_node {
-       struct wfq_node *next;
+struct cds_wfq_node {
+       struct cds_wfq_node *next;
 };
 
-struct wfq_queue {
-       struct wfq_node *head, **tail;
-       struct wfq_node dummy;  /* Dummy node */
+struct cds_wfq_queue {
+       struct cds_wfq_node *head, **tail;
+       struct cds_wfq_node dummy;      /* Dummy node */
        pthread_mutex_t lock;
 };
 
 #ifdef _LGPL_SOURCE
 
-#include <urcu/wfqueue-static.h>
+#include <urcu/static/wfqueue.h>
 
-#define wfq_node_init          _wfq_node_init
-#define wfq_init               _wfq_init
-#define wfq_enqueue            _wfq_enqueue
-#define wfq_dequeue_blocking   _wfq_dequeue_blocking
+#define cds_wfq_node_init              _cds_wfq_node_init
+#define cds_wfq_init           _cds_wfq_init
+#define cds_wfq_enqueue                _cds_wfq_enqueue
+#define __cds_wfq_dequeue_blocking     ___cds_wfq_dequeue_blocking
+#define cds_wfq_dequeue_blocking       _cds_wfq_dequeue_blocking
 
 #else /* !_LGPL_SOURCE */
 
-extern void wfq_node_init(struct wfq_node *node);
-extern void wfq_init(struct wfq_queue *q);
-extern void wfq_enqueue(struct wfq_queue *q, struct wfq_node *node);
-extern struct wfq_node *wfq_dequeue_blocking(struct wfq_queue *q);
+extern void cds_wfq_node_init(struct cds_wfq_node *node);
+extern void cds_wfq_init(struct cds_wfq_queue *q);
+extern void cds_wfq_enqueue(struct cds_wfq_queue *q, struct cds_wfq_node *node);
+/* __cds_wfq_dequeue_blocking: caller ensures mutual exclusion between dequeues */
+extern struct cds_wfq_node *__cds_wfq_dequeue_blocking(struct cds_wfq_queue *q);
+extern struct cds_wfq_node *cds_wfq_dequeue_blocking(struct cds_wfq_queue *q);
 
 #endif /* !_LGPL_SOURCE */