X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Furcu-bp.c;h=a097d7f00312a1372123f5c61a732f0e8270354d;hb=014775106c60f02818ca755b331f887030bd440f;hp=0653f9dff769b89281d5ec2edf4608d5604edbdf;hpb=ce28e67a534dcf0b68ccad2218e5a2e552e6e469;p=urcu.git diff --git a/src/urcu-bp.c b/src/urcu-bp.c index 0653f9d..a097d7f 100644 --- a/src/urcu-bp.c +++ b/src/urcu-bp.c @@ -23,11 +23,11 @@ * IBM's contributions to this file may be relicensed under LGPLv2 or later. */ +#define URCU_NO_COMPAT_IDENTIFIERS #define _LGPL_SOURCE #include #include #include -#include #include #include #include @@ -36,6 +36,8 @@ #include #include +#include +#include #include #include #include @@ -73,10 +75,12 @@ void *mremap_wrapper(void *old_address, size_t old_size, * This is not generic. */ static -void *mremap_wrapper(void *old_address, size_t old_size, - size_t new_size, int flags) +void *mremap_wrapper(void *old_address __attribute__((unused)), + size_t old_size __attribute__((unused)), + size_t new_size __attribute__((unused)), + int flags) { - assert(!(flags & MREMAP_MAYMOVE)); + urcu_posix_assert(!(flags & MREMAP_MAYMOVE)); return MAP_FAILED; } @@ -144,15 +148,12 @@ static int initialized; static pthread_key_t urcu_bp_key; struct urcu_bp_gp urcu_bp_gp = { .ctr = URCU_BP_GP_COUNT }; -URCU_ATTR_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 urcu_bp_reader *, urcu_bp_reader); -URCU_ATTR_ALIAS("urcu_bp_reader") -extern struct urcu_bp_reader *rcu_reader_bp; static CDS_LIST_HEAD(registry); @@ -276,9 +277,9 @@ void urcu_bp_synchronize_rcu(void) int ret; ret = sigfillset(&newmask); - assert(!ret); + urcu_posix_assert(!ret); ret = pthread_sigmask(SIG_BLOCK, &newmask, &oldmask); - assert(!ret); + urcu_posix_assert(!ret); mutex_lock(&rcu_gp_lock); @@ -295,7 +296,7 @@ void urcu_bp_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(®istry, &cur_snap_readers, &qsreaders); @@ -326,7 +327,7 @@ void urcu_bp_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); @@ -344,9 +345,8 @@ out: mutex_unlock(&rcu_registry_lock); mutex_unlock(&rcu_gp_lock); ret = pthread_sigmask(SIG_SETMASK, &oldmask, NULL); - assert(!ret); + urcu_posix_assert(!ret); } -URCU_ATTR_ALIAS("urcu_bp_synchronize_rcu") void synchronize_rcu_bp(); /* * library wrappers to be used by non-LGPL compatible source code. @@ -356,19 +356,16 @@ void urcu_bp_read_lock(void) { _urcu_bp_read_lock(); } -URCU_ATTR_ALIAS("urcu_bp_read_lock") void rcu_read_lock_bp(); void urcu_bp_read_unlock(void) { _urcu_bp_read_unlock(); } -URCU_ATTR_ALIAS("urcu_bp_read_unlock") void rcu_read_unlock_bp(); int urcu_bp_read_ongoing(void) { return _urcu_bp_read_ongoing(); } -URCU_ATTR_ALIAS("urcu_bp_read_ongoing") int rcu_read_ongoing_bp(); /* * Only grow for now. If empty, allocate a ARENA_INIT_ALLOC sized chunk. @@ -386,7 +383,7 @@ void expand_arena(struct registry_arena *arena) /* No chunk. */ if (cds_list_empty(&arena->chunk_list)) { - assert(ARENA_INIT_ALLOC >= + urcu_posix_assert(ARENA_INIT_ALLOC >= sizeof(struct registry_chunk) + sizeof(struct rcu_reader)); new_chunk_len = ARENA_INIT_ALLOC; @@ -416,7 +413,7 @@ void expand_arena(struct registry_arena *arena) new_chunk_len, 0); if (new_chunk != MAP_FAILED) { /* Should not have moved. */ - assert(new_chunk == last_chunk); + urcu_posix_assert(new_chunk == last_chunk); memset((char *) last_chunk + old_chunk_len, 0, new_chunk_len - old_chunk_len); last_chunk->data_len = @@ -487,7 +484,7 @@ void add_thread(void) /* Add to registry */ rcu_reader_reg->tid = pthread_self(); - assert(rcu_reader_reg->ctr == 0); + urcu_posix_assert(rcu_reader_reg->ctr == 0); cds_list_add(&rcu_reader_reg->node, ®istry); /* * Reader threads are pointing to the reader registry. This is @@ -564,7 +561,12 @@ end: if (ret) abort(); } -URCU_ATTR_ALIAS("urcu_bp_register") void rcu_bp_register(); + +void urcu_bp_register_thread(void) +{ + if (caa_unlikely(!URCU_TLS(urcu_bp_reader))) + urcu_bp_register(); /* If not yet registered. */ +} /* Disable signals, take mutex, remove from registry */ static @@ -683,14 +685,13 @@ void urcu_bp_before_fork(void) int ret; ret = sigfillset(&newmask); - assert(!ret); + urcu_posix_assert(!ret); ret = pthread_sigmask(SIG_BLOCK, &newmask, &oldmask); - assert(!ret); + urcu_posix_assert(!ret); mutex_lock(&rcu_gp_lock); mutex_lock(&rcu_registry_lock); saved_fork_signal_mask = oldmask; } -URCU_ATTR_ALIAS("urcu_bp_before_fork") void rcu_bp_before_fork(); void urcu_bp_after_fork_parent(void) { @@ -701,10 +702,8 @@ void urcu_bp_after_fork_parent(void) mutex_unlock(&rcu_registry_lock); mutex_unlock(&rcu_gp_lock); ret = pthread_sigmask(SIG_SETMASK, &oldmask, NULL); - assert(!ret); + urcu_posix_assert(!ret); } -URCU_ATTR_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 @@ -739,17 +738,13 @@ void urcu_bp_after_fork_child(void) mutex_unlock(&rcu_registry_lock); mutex_unlock(&rcu_gp_lock); ret = pthread_sigmask(SIG_SETMASK, &oldmask, NULL); - assert(!ret); + urcu_posix_assert(!ret); } -URCU_ATTR_ALIAS("urcu_bp_after_fork_child") -void rcu_bp_after_fork_child(void); void *urcu_bp_dereference_sym(void *p) { return _rcu_dereference(p); } -URCU_ATTR_ALIAS("urcu_bp_dereference_sym") -void *rcu_dereference_sym_bp(); void *urcu_bp_set_pointer_sym(void **p, void *v) { @@ -757,27 +752,20 @@ void *urcu_bp_set_pointer_sym(void **p, void *v) uatomic_set(p, v); return v; } -URCU_ATTR_ALIAS("urcu_bp_set_pointer_sym") -void *rcu_set_pointer_sym_bp(); void *urcu_bp_xchg_pointer_sym(void **p, void *v) { cmm_wmb(); return uatomic_xchg(p, v); } -URCU_ATTR_ALIAS("urcu_bp_xchg_pointer_sym") -void *rcu_xchg_pointer_sym_bp(); void *urcu_bp_cmpxchg_pointer_sym(void **p, void *old, void *_new) { cmm_wmb(); return uatomic_cmpxchg(p, old, _new); } -URCU_ATTR_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"