Fix: add missing destroy functions to queues/stack APIs

[urcu.git] / urcu / static / wfstack.h

diff --git a/urcu/static/wfstack.h b/urcu/static/wfstack.h
index eb12f377d1e1d974c43b2705bd6eab73d5634550..e96c8876a2b916dcd5bde1e1ba2ad3f8b5ff4ec8 100644 (file)
--- a/urcu/static/wfstack.h
+++ b/urcu/static/wfstack.h
@@ -77,7 +77,8 @@ void _cds_wfs_node_init(struct cds_wfs_node *node)
 }
 
 /*
- * __cds_wfs_init: initialize wait-free stack.
+ * __cds_wfs_init: initialize wait-free stack. Don't pair with
+ * any destroy function.
  */
 static inline void ___cds_wfs_init(struct __cds_wfs_stack *s)
 {
@@ -85,7 +86,8 @@ static inline void ___cds_wfs_init(struct __cds_wfs_stack *s)
 }
 
 /*
- * cds_wfs_init: initialize wait-free stack.
+ * cds_wfs_init: initialize wait-free stack. Pair with
+ * cds_wfs_destroy().
  */
 static inline
 void _cds_wfs_init(struct cds_wfs_stack *s)
@@ -97,6 +99,17 @@ void _cds_wfs_init(struct cds_wfs_stack *s)
        assert(!ret);
 }
 
+/*
+ * cds_wfs_destroy: destroy wait-free stack. Pair with
+ * cds_wfs_init().
+ */
+static inline
+void _cds_wfs_destroy(struct cds_wfs_stack *s)
+{
+       int ret = pthread_mutex_destroy(&s->lock);
+       assert(!ret);
+}
+
 static inline bool ___cds_wfs_end(void *node)
 {
        return node == CDS_WFS_END;
@@ -160,7 +173,7 @@ ___cds_wfs_node_sync_next(struct cds_wfs_node *node, int blocking)
                if (!blocking)
                        return CDS_WFS_WOULDBLOCK;
                if (++attempt >= CDS_WFS_ADAPT_ATTEMPTS) {
-                       poll(NULL, 0, CDS_WFS_WAIT);    /* Wait for 10ms */
+                       (void) poll(NULL, 0, CDS_WFS_WAIT);     /* Wait for 10ms */
                        attempt = 0;
                } else {
                        caa_cpu_relax();
@@ -172,10 +185,11 @@ ___cds_wfs_node_sync_next(struct cds_wfs_node *node, int blocking)
 
 static inline
 struct cds_wfs_node *
-___cds_wfs_pop(struct cds_wfs_stack *s, int *state, int blocking)
+___cds_wfs_pop(cds_wfs_stack_ptr_t u_stack, int *state, int blocking)
 {
        struct cds_wfs_head *head, *new_head;
        struct cds_wfs_node *next;
+       struct __cds_wfs_stack *s = u_stack._s;
 
        if (state)
                *state = 0;
@@ -221,16 +235,16 @@ ___cds_wfs_pop(struct cds_wfs_stack *s, int *state, int blocking)
  */
 static inline
 struct cds_wfs_node *
-___cds_wfs_pop_with_state_blocking(struct cds_wfs_stack *s, int *state)
+___cds_wfs_pop_with_state_blocking(cds_wfs_stack_ptr_t u_stack, int *state)
 {
-       return ___cds_wfs_pop(s, state, 1);
+       return ___cds_wfs_pop(u_stack, state, 1);
 }
 
 static inline
 struct cds_wfs_node *
-___cds_wfs_pop_blocking(struct cds_wfs_stack *s)
+___cds_wfs_pop_blocking(cds_wfs_stack_ptr_t u_stack)
 {
-       return ___cds_wfs_pop_with_state_blocking(s, NULL);
+       return ___cds_wfs_pop_with_state_blocking(u_stack, NULL);
 }
 
 /*
@@ -243,9 +257,9 @@ ___cds_wfs_pop_blocking(struct cds_wfs_stack *s)
  */
 static inline
 struct cds_wfs_node *
-___cds_wfs_pop_with_state_nonblocking(struct cds_wfs_stack *s, int *state)
+___cds_wfs_pop_with_state_nonblocking(cds_wfs_stack_ptr_t u_stack, int *state)
 {
-       return ___cds_wfs_pop(s, state, 0);
+       return ___cds_wfs_pop(u_stack, state, 0);
 }
 
 /*
@@ -256,9 +270,9 @@ ___cds_wfs_pop_with_state_nonblocking(struct cds_wfs_stack *s, int *state)
  */
 static inline
 struct cds_wfs_node *
-___cds_wfs_pop_nonblocking(struct cds_wfs_stack *s)
+___cds_wfs_pop_nonblocking(cds_wfs_stack_ptr_t u_stack)
 {
-       return ___cds_wfs_pop_with_state_nonblocking(s, NULL);
+       return ___cds_wfs_pop_with_state_nonblocking(u_stack, NULL);
 }
 
 /*