X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=src%2Furcu-bp.c;fp=src%2Furcu-bp.c;h=66c877a6686f0c4d11dd9157d2d168bbe2954d4d;hp=5d07f040f38c2ef0b33fce285c49de8e14188528;hb=4477a87021ffbfbfdb2a2084d05a084171343d36;hpb=5bbe95bb510534d0a5bab8d7d205b32d6e4a57b2

diff --git a/src/urcu-bp.c b/src/urcu-bp.c
index 5d07f04..66c877a 100644
--- a/src/urcu-bp.c
+++ b/src/urcu-bp.c
@@ -36,18 +36,19 @@
 #include <stdbool.h>
 #include <sys/mman.h>
 
-#include "urcu/arch.h"
-#include "urcu/wfcqueue.h"
-#include "urcu/map/urcu-bp.h"
-#include "urcu/static/urcu-bp.h"
-#include "urcu-pointer.h"
-#include "urcu/tls-compat.h"
+#include <urcu/arch.h>
+#include <urcu/wfcqueue.h>
+#include <urcu/map/urcu-bp.h>
+#include <urcu/static/urcu-bp.h>
+#include <urcu/pointer.h>
+#include <urcu/tls-compat.h>
 
 #include "urcu-die.h"
 
+#define URCU_API_MAP
 /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
 #undef _LGPL_SOURCE
-#include "urcu-bp.h"
+#include <urcu/urcu-bp.h>
 #define _LGPL_SOURCE
 
 #ifndef MAP_ANONYMOUS
@@ -85,7 +86,7 @@ void *mremap_wrapper(void *old_address, size_t old_size,
 #define INIT_NR_THREADS		8
 #define ARENA_INIT_ALLOC		\
 	sizeof(struct registry_chunk)	\
-	+ INIT_NR_THREADS * sizeof(struct rcu_reader)
+	+ INIT_NR_THREADS * sizeof(struct urcu_bp_reader)
 
 /*
  * Active attempts to check for reader Q.S. before calling sleep().
@@ -93,7 +94,7 @@ void *mremap_wrapper(void *old_address, size_t old_size,
 #define RCU_QS_ACTIVE_ATTEMPTS 100
 
 static
-int rcu_bp_refcount;
+int urcu_bp_refcount;
 
 /* If the headers do not support membarrier system call, fall back smp_mb. */
 #ifdef __NR_membarrier
@@ -112,9 +113,9 @@ enum membarrier_cmd {
 };
 
 static
-void __attribute__((constructor)) rcu_bp_init(void);
+void __attribute__((constructor)) _urcu_bp_init(void);
 static
-void __attribute__((destructor)) rcu_bp_exit(void);
+void __attribute__((destructor)) urcu_bp_exit(void);
 
 #ifndef CONFIG_RCU_FORCE_SYS_MEMBARRIER
 int urcu_bp_has_sys_membarrier;
@@ -141,13 +142,16 @@ static int initialized;
 
 static pthread_key_t urcu_bp_key;
 
-struct rcu_gp rcu_gp = { .ctr = RCU_GP_COUNT };
+struct urcu_bp_gp urcu_bp_gp = { .ctr = URCU_BP_GP_COUNT };
+__attribute__((alias("urcu_bp_gp"))) extern struct urcu_bp_gp rcu_gp_bp;
 
 /*
  * Pointer to registry elements. Written to only by each individual reader. Read
  * by both the reader and the writers.
  */
-DEFINE_URCU_TLS(struct rcu_reader *, rcu_reader);
+DEFINE_URCU_TLS(struct urcu_bp_reader *, urcu_bp_reader);
+__attribute__((alias("urcu_bp_reader")))
+extern struct urcu_bp_reader *rcu_reader_bp;
 
 static CDS_LIST_HEAD(registry);
 
@@ -214,10 +218,10 @@ static void wait_for_readers(struct cds_list_head *input_readers,
 			struct cds_list_head *qsreaders)
 {
 	unsigned int wait_loops = 0;
-	struct rcu_reader *index, *tmp;
+	struct urcu_bp_reader *index, *tmp;
 
 	/*
-	 * Wait for each thread URCU_TLS(rcu_reader).ctr to either
+	 * Wait for each thread URCU_TLS(urcu_bp_reader).ctr to either
 	 * indicate quiescence (not nested), or observe the current
 	 * rcu_gp.ctr value.
 	 */
@@ -226,18 +230,18 @@ static void wait_for_readers(struct cds_list_head *input_readers,
 			wait_loops++;
 
 		cds_list_for_each_entry_safe(index, tmp, input_readers, node) {
-			switch (rcu_reader_state(&index->ctr)) {
-			case RCU_READER_ACTIVE_CURRENT:
+			switch (urcu_bp_reader_state(&index->ctr)) {
+			case URCU_BP_READER_ACTIVE_CURRENT:
 				if (cur_snap_readers) {
 					cds_list_move(&index->node,
 						cur_snap_readers);
 					break;
 				}
 				/* Fall-through */
-			case RCU_READER_INACTIVE:
+			case URCU_BP_READER_INACTIVE:
 				cds_list_move(&index->node, qsreaders);
 				break;
-			case RCU_READER_ACTIVE_OLD:
+			case URCU_BP_READER_ACTIVE_OLD:
 				/*
 				 * Old snapshot. Leaving node in
 				 * input_readers will make us busy-loop
@@ -263,7 +267,7 @@ static void wait_for_readers(struct cds_list_head *input_readers,
 	}
 }
 
-void synchronize_rcu(void)
+void urcu_bp_synchronize_rcu(void)
 {
 	CDS_LIST_HEAD(cur_snap_readers);
 	CDS_LIST_HEAD(qsreaders);
@@ -302,7 +306,7 @@ void synchronize_rcu(void)
 	cmm_smp_mb();
 
 	/* Switch parity: 0 -> 1, 1 -> 0 */
-	CMM_STORE_SHARED(rcu_gp.ctr, rcu_gp.ctr ^ RCU_GP_CTR_PHASE);
+	CMM_STORE_SHARED(rcu_gp.ctr, rcu_gp.ctr ^ URCU_BP_GP_CTR_PHASE);
 
 	/*
 	 * Must commit qparity update to memory before waiting for other parity
@@ -341,25 +345,29 @@ out:
 	ret = pthread_sigmask(SIG_SETMASK, &oldmask, NULL);
 	assert(!ret);
 }
+__attribute__((alias("urcu_bp_synchronize_rcu"))) void synchronize_rcu_bp();
 
 /*
  * library wrappers to be used by non-LGPL compatible source code.
  */
 
-void rcu_read_lock(void)
+void urcu_bp_read_lock(void)
 {
-	_rcu_read_lock();
+	_urcu_bp_read_lock();
 }
+__attribute__((alias("urcu_bp_read_lock"))) void rcu_read_lock_bp();
 
-void rcu_read_unlock(void)
+void urcu_bp_read_unlock(void)
 {
-	_rcu_read_unlock();
+	_urcu_bp_read_unlock();
 }
+__attribute__((alias("urcu_bp_read_unlock"))) void rcu_read_unlock_bp();
 
-int rcu_read_ongoing(void)
+int urcu_bp_read_ongoing(void)
 {
-	return _rcu_read_ongoing();
+	return _urcu_bp_read_ongoing();
 }
+__attribute__((alias("urcu_bp_read_ongoing"))) int rcu_read_ongoing_bp();
 
 /*
  * Only grow for now. If empty, allocate a ARENA_INIT_ALLOC sized chunk.
@@ -484,7 +492,7 @@ void add_thread(void)
 	 * Reader threads are pointing to the reader registry. This is
 	 * why its memory should never be relocated.
 	 */
-	URCU_TLS(rcu_reader) = rcu_reader_reg;
+	URCU_TLS(urcu_bp_reader) = rcu_reader_reg;
 }
 
 /* Called with mutex locked */
@@ -519,11 +527,11 @@ static
 void remove_thread(struct rcu_reader *rcu_reader_reg)
 {
 	cleanup_thread(find_chunk(rcu_reader_reg), rcu_reader_reg);
-	URCU_TLS(rcu_reader) = NULL;
+	URCU_TLS(urcu_bp_reader) = NULL;
 }
 
 /* Disable signals, take mutex, add to registry */
-void rcu_bp_register(void)
+void urcu_bp_register(void)
 {
 	sigset_t newmask, oldmask;
 	int ret;
@@ -539,13 +547,13 @@ void rcu_bp_register(void)
 	 * Check if a signal concurrently registered our thread since
 	 * the check in rcu_read_lock().
 	 */
-	if (URCU_TLS(rcu_reader))
+	if (URCU_TLS(urcu_bp_reader))
 		goto end;
 
 	/*
 	 * Take care of early registration before urcu_bp constructor.
 	 */
-	rcu_bp_init();
+	_urcu_bp_init();
 
 	mutex_lock(&rcu_registry_lock);
 	add_thread();
@@ -555,10 +563,11 @@ end:
 	if (ret)
 		abort();
 }
+__attribute__((alias("urcu_bp_register"))) void rcu_bp_register();
 
 /* Disable signals, take mutex, remove from registry */
 static
-void rcu_bp_unregister(struct rcu_reader *rcu_reader_reg)
+void urcu_bp_unregister(struct rcu_reader *rcu_reader_reg)
 {
 	sigset_t newmask, oldmask;
 	int ret;
@@ -576,7 +585,7 @@ void rcu_bp_unregister(struct rcu_reader *rcu_reader_reg)
 	ret = pthread_sigmask(SIG_SETMASK, &oldmask, NULL);
 	if (ret)
 		abort();
-	rcu_bp_exit();
+	urcu_bp_exit();
 }
 
 /*
@@ -586,19 +595,19 @@ void rcu_bp_unregister(struct rcu_reader *rcu_reader_reg)
 static
 void urcu_bp_thread_exit_notifier(void *rcu_key)
 {
-	rcu_bp_unregister(rcu_key);
+	urcu_bp_unregister(rcu_key);
 }
 
 #ifdef CONFIG_RCU_FORCE_SYS_MEMBARRIER
 static
-void rcu_sys_membarrier_status(bool available)
+void urcu_bp_sys_membarrier_status(bool available)
 {
 	if (!available)
 		abort();
 }
 #else
 static
-void rcu_sys_membarrier_status(bool available)
+void urcu_bp_sys_membarrier_status(bool available)
 {
 	if (!available)
 		return;
@@ -607,7 +616,7 @@ void rcu_sys_membarrier_status(bool available)
 #endif
 
 static
-void rcu_sys_membarrier_init(void)
+void urcu_bp_sys_membarrier_init(void)
 {
 	bool available = false;
 	int mask;
@@ -620,31 +629,31 @@ void rcu_sys_membarrier_init(void)
 			available = true;
 		}
 	}
-	rcu_sys_membarrier_status(available);
+	urcu_bp_sys_membarrier_status(available);
 }
 
 static
-void rcu_bp_init(void)
+void _urcu_bp_init(void)
 {
 	mutex_lock(&init_lock);
-	if (!rcu_bp_refcount++) {
+	if (!urcu_bp_refcount++) {
 		int ret;
 
 		ret = pthread_key_create(&urcu_bp_key,
 				urcu_bp_thread_exit_notifier);
 		if (ret)
 			abort();
-		rcu_sys_membarrier_init();
+		urcu_bp_sys_membarrier_init();
 		initialized = 1;
 	}
 	mutex_unlock(&init_lock);
 }
 
 static
-void rcu_bp_exit(void)
+void urcu_bp_exit(void)
 {
 	mutex_lock(&init_lock);
-	if (!--rcu_bp_refcount) {
+	if (!--urcu_bp_refcount) {
 		struct registry_chunk *chunk, *tmp;
 		int ret;
 
@@ -667,7 +676,7 @@ void rcu_bp_exit(void)
  * any of those locks held. This ensures that the registry and data
  * protected by rcu_gp_lock are in a coherent state in the child.
  */
-void rcu_bp_before_fork(void)
+void urcu_bp_before_fork(void)
 {
 	sigset_t newmask, oldmask;
 	int ret;
@@ -680,8 +689,9 @@ void rcu_bp_before_fork(void)
 	mutex_lock(&rcu_registry_lock);
 	saved_fork_signal_mask = oldmask;
 }
+__attribute__((alias("urcu_bp_before_fork"))) void rcu_bp_before_fork();
 
-void rcu_bp_after_fork_parent(void)
+void urcu_bp_after_fork_parent(void)
 {
 	sigset_t oldmask;
 	int ret;
@@ -692,6 +702,8 @@ void rcu_bp_after_fork_parent(void)
 	ret = pthread_sigmask(SIG_SETMASK, &oldmask, NULL);
 	assert(!ret);
 }
+__attribute__((alias("urcu_bp_after_fork_parent")))
+void rcu_bp_after_fork_parent(void);
 
 /*
  * Prune all entries from registry except our own thread. Fits the Linux
@@ -701,11 +713,11 @@ static
 void urcu_bp_prune_registry(void)
 {
 	struct registry_chunk *chunk;
-	struct rcu_reader *rcu_reader_reg;
+	struct urcu_bp_reader *rcu_reader_reg;
 
 	cds_list_for_each_entry(chunk, &registry_arena.chunk_list, node) {
-		for (rcu_reader_reg = (struct rcu_reader *) &chunk->data[0];
-				rcu_reader_reg < (struct rcu_reader *) &chunk->data[chunk->data_len];
+		for (rcu_reader_reg = (struct urcu_bp_reader *) &chunk->data[0];
+				rcu_reader_reg < (struct urcu_bp_reader *) &chunk->data[chunk->data_len];
 				rcu_reader_reg++) {
 			if (!rcu_reader_reg->alloc)
 				continue;
@@ -716,7 +728,7 @@ void urcu_bp_prune_registry(void)
 	}
 }
 
-void rcu_bp_after_fork_child(void)
+void urcu_bp_after_fork_child(void)
 {
 	sigset_t oldmask;
 	int ret;
@@ -728,32 +740,43 @@ void rcu_bp_after_fork_child(void)
 	ret = pthread_sigmask(SIG_SETMASK, &oldmask, NULL);
 	assert(!ret);
 }
+__attribute__((alias("urcu_bp_after_fork_child")))
+void rcu_bp_after_fork_child(void);
 
-void *rcu_dereference_sym_bp(void *p)
+void *urcu_bp_dereference_sym(void *p)
 {
 	return _rcu_dereference(p);
 }
+__attribute__((alias("urcu_bp_dereference_sym")))
+void *rcu_dereference_sym_bp();
 
-void *rcu_set_pointer_sym_bp(void **p, void *v)
+void *urcu_bp_set_pointer_sym(void **p, void *v)
 {
 	cmm_wmb();
 	uatomic_set(p, v);
 	return v;
 }
+__attribute__((alias("urcu_bp_set_pointer_sym")))
+void *rcu_set_pointer_sym_bp();
 
-void *rcu_xchg_pointer_sym_bp(void **p, void *v)
+void *urcu_bp_xchg_pointer_sym(void **p, void *v)
 {
 	cmm_wmb();
 	return uatomic_xchg(p, v);
 }
+__attribute__((alias("urcu_bp_xchg_pointer_sym")))
+void *rcu_xchg_pointer_sym_bp();
 
-void *rcu_cmpxchg_pointer_sym_bp(void **p, void *old, void *_new)
+void *urcu_bp_cmpxchg_pointer_sym(void **p, void *old, void *_new)
 {
 	cmm_wmb();
 	return uatomic_cmpxchg(p, old, _new);
 }
+__attribute__((alias("urcu_bp_cmpxchg_pointer_sym")))
+void *rcu_cmpxchg_pointer_sym_bp();
 
 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"