X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Furcu-defer-impl.h;h=d25e9b93f4dc17e8f1e6ee986ad04cdca366527f;hb=014775106c60f02818ca755b331f887030bd440f;hp=969231f8b552aa733dc5aedd91c8fd86ece5981c;hpb=70469b43316ecc8d6053550504858ad8a8ef9b16;p=userspace-rcu.git

diff --git a/src/urcu-defer-impl.h b/src/urcu-defer-impl.h
index 969231f..d25e9b9 100644
--- a/src/urcu-defer-impl.h
+++ b/src/urcu-defer-impl.h
@@ -33,7 +33,6 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <signal.h>
-#include <assert.h>
 #include <string.h>
 #include <errno.h>
 #include <poll.h>
@@ -43,6 +42,7 @@
 
 #include "urcu/futex.h"
 
+#include <urcu/assert.h>
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
 #include <urcu/uatomic.h>
@@ -265,8 +265,6 @@ void rcu_defer_barrier_thread(void)
 	_rcu_defer_barrier_thread();
 	mutex_unlock(&rcu_defer_mutex);
 }
-URCU_ATTR_ALIAS(urcu_stringify(rcu_defer_barrier_thread))
-void alias_rcu_defer_barrier_thread();
 
 /*
  * rcu_defer_barrier - Execute all queued rcu callbacks.
@@ -307,8 +305,6 @@ void rcu_defer_barrier(void)
 end:
 	mutex_unlock(&rcu_defer_mutex);
 }
-URCU_ATTR_ALIAS(urcu_stringify(rcu_defer_barrier))
-void alias_rcu_defer_barrier();
 
 /*
  * _defer_rcu - Queue a RCU callback.
@@ -329,9 +325,9 @@ static void _defer_rcu(void (*fct)(void *p), void *p)
 	 * Worse-case: must allow 2 supplementary entries for fct pointer.
 	 */
 	if (caa_unlikely(head - tail >= DEFER_QUEUE_SIZE - 2)) {
-		assert(head - tail <= DEFER_QUEUE_SIZE);
+		urcu_posix_assert(head - tail <= DEFER_QUEUE_SIZE);
 		rcu_defer_barrier_thread();
-		assert(head - CMM_LOAD_SHARED(URCU_TLS(defer_queue).tail) == 0);
+		urcu_posix_assert(head - CMM_LOAD_SHARED(URCU_TLS(defer_queue).tail) == 0);
 	}
 
 	/*
@@ -401,14 +397,13 @@ void defer_rcu(void (*fct)(void *p), void *p)
 {
 	_defer_rcu(fct, p);
 }
-URCU_ATTR_ALIAS(urcu_stringify(defer_rcu)) void alias_defer_rcu();
 
 static void start_defer_thread(void)
 {
 	int ret;
 
 	ret = pthread_create(&tid_defer, NULL, thr_defer, NULL);
-	assert(!ret);
+	urcu_posix_assert(!ret);
 }
 
 static void stop_defer_thread(void)
@@ -422,19 +417,19 @@ static void stop_defer_thread(void)
 	wake_up_defer();
 
 	ret = pthread_join(tid_defer, &tret);
-	assert(!ret);
+	urcu_posix_assert(!ret);
 
 	CMM_STORE_SHARED(defer_thread_stop, 0);
 	/* defer thread should always exit when futex value is 0 */
-	assert(uatomic_read(&defer_thread_futex) == 0);
+	urcu_posix_assert(uatomic_read(&defer_thread_futex) == 0);
 }
 
 int rcu_defer_register_thread(void)
 {
 	int was_empty;
 
-	assert(URCU_TLS(defer_queue).last_head == 0);
-	assert(URCU_TLS(defer_queue).q == NULL);
+	urcu_posix_assert(URCU_TLS(defer_queue).last_head == 0);
+	urcu_posix_assert(URCU_TLS(defer_queue).q == NULL);
 	URCU_TLS(defer_queue).q = malloc(sizeof(void *) * DEFER_QUEUE_SIZE);
 	if (!URCU_TLS(defer_queue).q)
 		return -ENOMEM;
@@ -450,8 +445,6 @@ int rcu_defer_register_thread(void)
 	mutex_unlock(&defer_thread_mutex);
 	return 0;
 }
-URCU_ATTR_ALIAS(urcu_stringify(rcu_defer_register_thread))
-int alias_rcu_defer_register_thread();
 
 void rcu_defer_unregister_thread(void)
 {
@@ -470,14 +463,10 @@ void rcu_defer_unregister_thread(void)
 		stop_defer_thread();
 	mutex_unlock(&defer_thread_mutex);
 }
-URCU_ATTR_ALIAS(urcu_stringify(rcu_defer_unregister_thread))
-void alias_rcu_defer_unregister_thread();
 
 void rcu_defer_exit(void)
 {
-	assert(cds_list_empty(&registry_defer));
+	urcu_posix_assert(cds_list_empty(&registry_defer));
 }
-URCU_ATTR_ALIAS(urcu_stringify(rcu_defer_exit))
-void alias_rcu_defer_exit();
 
 #endif /* _URCU_DEFER_IMPL_H */