Add `urcu_posix_assert()` as `assert()` replacement

[urcu.git] / src / urcu-wait.h

diff --git a/src/urcu-wait.h b/src/urcu-wait.h
index 94f3e3559ba8c32492234f911911db7faa1337a9..c586ec9da8a007519cc7d6a793a9b6598cea46be 100644 (file)
--- a/src/urcu-wait.h
+++ b/src/urcu-wait.h
@@ -23,6 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <urcu/assert.h>
 #include <urcu/uatomic.h>
 #include <urcu/wfstack.h>
 #include "urcu-die.h"
@@ -60,8 +61,13 @@ struct urcu_wait_queue {
        struct cds_wfs_stack stack;
 };
 
-#define URCU_WAIT_QUEUE_HEAD_INIT(name)                        \
-       { .stack.head = CDS_WFS_END, .stack.lock = PTHREAD_MUTEX_INITIALIZER }
+#define URCU_WAIT_QUEUE_HEAD_INIT(name)                                \
+       {                                                       \
+                .stack = {                                     \
+                       .head = CDS_WFS_END,                    \
+                       .lock = PTHREAD_MUTEX_INITIALIZER,      \
+               },                                              \
+       }
 
 #define DECLARE_URCU_WAIT_QUEUE(name)                  \
        struct urcu_wait_queue name
@@ -121,7 +127,7 @@ static inline
 void urcu_adaptative_wake_up(struct urcu_wait_node *wait)
 {
        cmm_smp_mb();
-       assert(uatomic_read(&wait->state) == URCU_WAIT_WAITING);
+       urcu_posix_assert(uatomic_read(&wait->state) == URCU_WAIT_WAITING);
        uatomic_set(&wait->state, URCU_WAIT_WAKEUP);
        if (!(uatomic_read(&wait->state) & URCU_WAIT_RUNNING)) {
                if (futex_noasync(&wait->state, FUTEX_WAKE, 1,
@@ -178,7 +184,7 @@ skip_futex_wait:
        }
        while (!(uatomic_read(&wait->state) & URCU_WAIT_TEARDOWN))
                poll(NULL, 0, 10);
-       assert(uatomic_read(&wait->state) & URCU_WAIT_TEARDOWN);
+       urcu_posix_assert(uatomic_read(&wait->state) & URCU_WAIT_TEARDOWN);
 }
 
 static inline