X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fwaiter.c;h=aca88eb4db75ade4fa28b971d4616be68bd92742;hb=3afa94aeca5a0daae40fd7b6cc96b7e4c150c7d8;hp=779754e1ba168cd2d3e115bfc39e82d81109728d;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;p=lttng-tools.git

diff --git a/src/common/waiter.c b/src/common/waiter.c
index 779754e1b..aca88eb4d 100644
--- a/src/common/waiter.c
+++ b/src/common/waiter.c
@@ -9,7 +9,6 @@
 #include "waiter.h"
 #include <urcu/uatomic.h>
 #include <urcu/futex.h>
-#include <assert.h>
 #include "error.h"
 #include <poll.h>
 
@@ -27,7 +26,6 @@ enum waiter_state {
 	WAITER_TEARDOWN =	(1 << 2),
 };
 
-LTTNG_HIDDEN
 void lttng_waiter_init(struct lttng_waiter *waiter)
 {
 	cds_wfs_node_init(&waiter->wait_queue_node);
@@ -38,7 +36,6 @@ void lttng_waiter_init(struct lttng_waiter *waiter)
 /*
  * User must init "waiter" before passing its memory to waker thread.
  */
-LTTNG_HIDDEN
 void lttng_waiter_wait(struct lttng_waiter *waiter)
 {
 	unsigned int i;
@@ -85,7 +82,7 @@ skip_futex_wait:
 	while (!(uatomic_read(&waiter->state) & WAITER_TEARDOWN)) {
 		poll(NULL, 0, 10);
 	}
-	assert(uatomic_read(&waiter->state) & WAITER_TEARDOWN);
+	LTTNG_ASSERT(uatomic_read(&waiter->state) & WAITER_TEARDOWN);
 	DBG("End of waiter wait period");
 }
 
@@ -94,11 +91,10 @@ skip_futex_wait:
  * execution. In this scheme, the waiter owns the node memory, and we only allow
  * it to free this memory when it sees the WAITER_TEARDOWN flag.
  */
-LTTNG_HIDDEN
 void lttng_waiter_wake_up(struct lttng_waiter *waiter)
 {
 	cmm_smp_mb();
-	assert(uatomic_read(&waiter->state) == WAITER_WAITING);
+	LTTNG_ASSERT(uatomic_read(&waiter->state) == WAITER_WAITING);
 	uatomic_set(&waiter->state, WAITER_WOKEN_UP);
 	if (!(uatomic_read(&waiter->state) & WAITER_RUNNING)) {
 		if (futex_noasync(&waiter->state, FUTEX_WAKE, 1,