X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Furcu-qsbr.c;h=d69d93b1018e2740a0bf9f6fec877a012820f1e8;hb=799d344f0b89f0c3565f54ad740e7964eb75b7d2;hp=346748b2176dfe9fb2917a1769cdc28483da9b19;hpb=4477a87021ffbfbfdb2a2084d05a084171343d36;p=urcu.git

diff --git a/src/urcu-qsbr.c b/src/urcu-qsbr.c
index 346748b..d69d93b 100644
--- a/src/urcu-qsbr.c
+++ b/src/urcu-qsbr.c
@@ -23,17 +23,18 @@
  * IBM's contributions to this file may be relicensed under LGPLv2 or later.
  */
 
+#define URCU_NO_COMPAT_IDENTIFIERS
 #define _LGPL_SOURCE
 #include <stdio.h>
 #include <pthread.h>
 #include <signal.h>
-#include <assert.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
 #include <poll.h>
 
+#include <urcu/assert.h>
 #include <urcu/wfcqueue.h>
 #include <urcu/map/urcu-qsbr.h>
 #define BUILD_QSBR_LIB
@@ -43,6 +44,7 @@
 
 #include "urcu-die.h"
 #include "urcu-wait.h"
+#include "urcu-utils.h"
 
 #define URCU_API_MAP
 /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
@@ -68,7 +70,6 @@ static pthread_mutex_t rcu_gp_lock = PTHREAD_MUTEX_INITIALIZER;
  */
 static pthread_mutex_t rcu_registry_lock = PTHREAD_MUTEX_INITIALIZER;
 struct urcu_gp urcu_qsbr_gp = { .ctr = URCU_QSBR_GP_ONLINE };
-__attribute__((alias("urcu_qsbr_gp"))) extern struct urcu_gp rcu_gp_qsbr;
 
 /*
  * Active attempts to check for reader Q.S. before calling futex().
@@ -80,8 +81,6 @@ __attribute__((alias("urcu_qsbr_gp"))) extern struct urcu_gp rcu_gp_qsbr;
  * writers.
  */
 DEFINE_URCU_TLS(struct urcu_qsbr_reader, urcu_qsbr_reader);
-__attribute__((alias("urcu_qsbr_reader")))
-extern struct urcu_qsbr_reader rcu_reader_qsbr;
 
 static CDS_LIST_HEAD(registry);
 
@@ -279,7 +278,7 @@ void urcu_qsbr_synchronize_rcu(void)
 	/*
 	 * Wait for readers to observe original parity or be quiescent.
 	 * wait_for_readers() can release and grab again rcu_registry_lock
-	 * interally.
+	 * internally.
 	 */
 	wait_for_readers(&registry, &cur_snap_readers, &qsreaders);
 
@@ -322,7 +321,7 @@ void urcu_qsbr_synchronize_rcu(void)
 	/*
 	 * Wait for readers to observe new parity or be quiescent.
 	 * wait_for_readers() can release and grab again rcu_registry_lock
-	 * interally.
+	 * internally.
 	 */
 	wait_for_readers(&cur_snap_readers, NULL, &qsreaders);
 
@@ -411,7 +410,7 @@ void urcu_qsbr_synchronize_rcu(void)
 	/*
 	 * Wait for readers to observe new count of be quiescent.
 	 * wait_for_readers() can release and grab again rcu_registry_lock
-	 * interally.
+	 * internally.
 	 */
 	wait_for_readers(&registry, NULL, &qsreaders);
 
@@ -430,8 +429,6 @@ gp_end:
 		cmm_smp_mb();
 }
 #endif  /* !(CAA_BITS_PER_LONG < 64) */
-__attribute__((alias("urcu_qsbr_synchronize_rcu")))
-void synchronize_rcu_qsbr();
 
 /*
  * library wrappers to be used by non-LGPL compatible source code.
@@ -441,56 +438,47 @@ void urcu_qsbr_read_lock(void)
 {
 	_urcu_qsbr_read_lock();
 }
-__attribute__((alias("urcu_qsbr_read_lock"))) void rcu_read_lock_qsbr();
 
 void urcu_qsbr_read_unlock(void)
 {
 	_urcu_qsbr_read_unlock();
 }
-__attribute__((alias("urcu_qsbr_read_unlock"))) void rcu_read_unlock_qsbr();
 
 int urcu_qsbr_read_ongoing(void)
 {
 	return _urcu_qsbr_read_ongoing();
 }
-__attribute__((alias("urcu_qsbr_read_ongoing")))
 void rcu_read_ongoing_qsbr();
 
 void urcu_qsbr_quiescent_state(void)
 {
 	_urcu_qsbr_quiescent_state();
 }
-__attribute__((alias("urcu_qsbr_quiescent_state")))
 void rcu_quiescent_state_qsbr();
 
 void urcu_qsbr_thread_offline(void)
 {
 	_urcu_qsbr_thread_offline();
 }
-__attribute__((alias("urcu_qsbr_thread_offline")))
 void rcu_thread_offline_qsbr();
 
 void urcu_qsbr_thread_online(void)
 {
 	_urcu_qsbr_thread_online();
 }
-__attribute__((alias("urcu_qsbr_thread_online")))
-void rcu_thread_online_qsbr();
 
 void urcu_qsbr_register_thread(void)
 {
 	URCU_TLS(urcu_qsbr_reader).tid = pthread_self();
-	assert(URCU_TLS(urcu_qsbr_reader).ctr == 0);
+	urcu_posix_assert(URCU_TLS(urcu_qsbr_reader).ctr == 0);
 
 	mutex_lock(&rcu_registry_lock);
-	assert(!URCU_TLS(urcu_qsbr_reader).registered);
+	urcu_posix_assert(!URCU_TLS(urcu_qsbr_reader).registered);
 	URCU_TLS(urcu_qsbr_reader).registered = 1;
 	cds_list_add(&URCU_TLS(urcu_qsbr_reader).node, &registry);
 	mutex_unlock(&rcu_registry_lock);
 	_urcu_qsbr_thread_online();
 }
-__attribute__((alias("urcu_qsbr_register_thread")))
-void rcu_register_thread_qsbr();
 
 void urcu_qsbr_unregister_thread(void)
 {
@@ -499,27 +487,23 @@ void urcu_qsbr_unregister_thread(void)
 	 * with a waiting writer.
 	 */
 	_urcu_qsbr_thread_offline();
-	assert(URCU_TLS(urcu_qsbr_reader).registered);
+	urcu_posix_assert(URCU_TLS(urcu_qsbr_reader).registered);
 	URCU_TLS(urcu_qsbr_reader).registered = 0;
 	mutex_lock(&rcu_registry_lock);
 	cds_list_del(&URCU_TLS(urcu_qsbr_reader).node);
 	mutex_unlock(&rcu_registry_lock);
 }
-__attribute__((alias("urcu_qsbr_unregister_thread")))
-void rcu_unregister_thread_qsbr();
 
 void urcu_qsbr_exit(void)
 {
 	/*
 	 * Assertion disabled because call_rcu threads are now rcu
 	 * readers, and left running at exit.
-	 * assert(cds_list_empty(&registry));
+	 * urcu_posix_assert(cds_list_empty(&registry));
 	 */
 }
-__attribute__((alias("urcu_qsbr_exit"))) void rcu_exit_qsbr();
 
 DEFINE_RCU_FLAVOR(rcu_flavor);
-DEFINE_RCU_FLAVOR_ALIAS(rcu_flavor, alias_rcu_flavor);
 
 #include "urcu-call-rcu-impl.h"
 #include "urcu-defer-impl.h"