X-Git-Url: http://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=src%2Furcu-qsbr.c;h=346748b2176dfe9fb2917a1769cdc28483da9b19;hp=e029ace86a383b22256e2bf6da61cdb0fa526e1c;hb=4477a87021ffbfbfdb2a2084d05a084171343d36;hpb=5bbe95bb510534d0a5bab8d7d205b32d6e4a57b2 diff --git a/src/urcu-qsbr.c b/src/urcu-qsbr.c index e029ace..346748b 100644 --- a/src/urcu-qsbr.c +++ b/src/urcu-qsbr.c @@ -34,22 +34,23 @@ #include #include -#include "urcu/wfcqueue.h" -#include "urcu/map/urcu-qsbr.h" +#include +#include #define BUILD_QSBR_LIB -#include "urcu/static/urcu-qsbr.h" -#include "urcu-pointer.h" -#include "urcu/tls-compat.h" +#include +#include +#include #include "urcu-die.h" #include "urcu-wait.h" +#define URCU_API_MAP /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */ #undef _LGPL_SOURCE -#include "urcu-qsbr.h" +#include #define _LGPL_SOURCE -void __attribute__((destructor)) rcu_exit(void); +void __attribute__((destructor)) urcu_qsbr_exit(void); /* * rcu_gp_lock ensures mutual exclusion between threads calling @@ -66,7 +67,8 @@ static pthread_mutex_t rcu_gp_lock = PTHREAD_MUTEX_INITIALIZER; * rcu_registry_lock may nest inside rcu_gp_lock. */ static pthread_mutex_t rcu_registry_lock = PTHREAD_MUTEX_INITIALIZER; -struct rcu_gp rcu_gp = { .ctr = RCU_GP_ONLINE }; +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(). @@ -77,7 +79,9 @@ struct rcu_gp rcu_gp = { .ctr = RCU_GP_ONLINE }; * 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_qsbr_reader, urcu_qsbr_reader); +__attribute__((alias("urcu_qsbr_reader"))) +extern struct urcu_qsbr_reader rcu_reader_qsbr; static CDS_LIST_HEAD(registry); @@ -120,9 +124,9 @@ static void wait_gp(void) { /* Read reader_gp before read futex */ cmm_smp_rmb(); - if (uatomic_read(&rcu_gp.futex) != -1) + if (uatomic_read(&urcu_qsbr_gp.futex) != -1) return; - while (futex_noasync(&rcu_gp.futex, FUTEX_WAIT, -1, + while (futex_noasync(&urcu_qsbr_gp.futex, FUTEX_WAIT, -1, NULL, NULL, 0)) { switch (errno) { case EWOULDBLOCK: @@ -147,18 +151,18 @@ 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_qsbr_reader *index, *tmp; /* - * Wait for each thread URCU_TLS(rcu_reader).ctr to either + * Wait for each thread URCU_TLS(urcu_qsbr_reader).ctr to either * indicate quiescence (offline), or for them to observe the - * current rcu_gp.ctr value. + * current urcu_qsbr_gp.ctr value. */ for (;;) { if (wait_loops < RCU_QS_ACTIVE_ATTEMPTS) wait_loops++; if (wait_loops >= RCU_QS_ACTIVE_ATTEMPTS) { - uatomic_set(&rcu_gp.futex, -1); + uatomic_set(&urcu_qsbr_gp.futex, -1); /* * Write futex before write waiting (the other side * reads them in the opposite order). @@ -171,18 +175,18 @@ static void wait_for_readers(struct cds_list_head *input_readers, cmm_smp_mb(); } cds_list_for_each_entry_safe(index, tmp, input_readers, node) { - switch (rcu_reader_state(&index->ctr)) { - case RCU_READER_ACTIVE_CURRENT: + switch (urcu_qsbr_reader_state(&index->ctr)) { + case URCU_READER_ACTIVE_CURRENT: if (cur_snap_readers) { cds_list_move(&index->node, cur_snap_readers); break; } /* Fall-through */ - case RCU_READER_INACTIVE: + case URCU_READER_INACTIVE: cds_list_move(&index->node, qsreaders); break; - case RCU_READER_ACTIVE_OLD: + case URCU_READER_ACTIVE_OLD: /* * Old snapshot. Leaving node in * input_readers will make us busy-loop @@ -197,7 +201,7 @@ static void wait_for_readers(struct cds_list_head *input_readers, if (wait_loops >= RCU_QS_ACTIVE_ATTEMPTS) { /* Read reader_gp before write futex */ cmm_smp_mb(); - uatomic_set(&rcu_gp.futex, 0); + uatomic_set(&urcu_qsbr_gp.futex, 0); } break; } else { @@ -224,7 +228,7 @@ static void wait_for_readers(struct cds_list_head *input_readers, */ #if (CAA_BITS_PER_LONG < 64) -void synchronize_rcu(void) +void urcu_qsbr_synchronize_rcu(void) { CDS_LIST_HEAD(cur_snap_readers); CDS_LIST_HEAD(qsreaders); @@ -232,7 +236,7 @@ void synchronize_rcu(void) DEFINE_URCU_WAIT_NODE(wait, URCU_WAIT_WAITING); struct urcu_waiters waiters; - was_online = rcu_read_ongoing(); + was_online = urcu_qsbr_read_ongoing(); /* All threads should read qparity before accessing data structure * where new ptr points to. In the "then" case, rcu_thread_offline @@ -243,7 +247,7 @@ void synchronize_rcu(void) * in threads registered as readers. */ if (was_online) - rcu_thread_offline(); + urcu_qsbr_thread_offline(); else cmm_smp_mb(); @@ -281,11 +285,11 @@ void synchronize_rcu(void) /* * Must finish waiting for quiescent state for original parity - * before committing next rcu_gp.ctr update to memory. Failure + * before committing next urcu_qsbr_gp.ctr update to memory. Failure * to do so could result in the writer waiting forever while new * readers are always accessing data (no progress). Enforce - * compiler-order of load URCU_TLS(rcu_reader).ctr before store - * to rcu_gp.ctr. + * compiler-order of load URCU_TLS(urcu_qsbr_reader).ctr before store + * to urcu_qsbr_gp.ctr. */ cmm_barrier(); @@ -297,14 +301,14 @@ 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); + CMM_STORE_SHARED(urcu_qsbr_gp.ctr, urcu_qsbr_gp.ctr ^ URCU_QSBR_GP_CTR); /* - * Must commit rcu_gp.ctr update to memory before waiting for + * Must commit urcu_qsbr_gp.ctr update to memory before waiting for * quiescent state. Failure to do so could result in the writer * waiting forever while new readers are always accessing data - * (no progress). Enforce compiler-order of store to rcu_gp.ctr - * before load URCU_TLS(rcu_reader).ctr. + * (no progress). Enforce compiler-order of store to urcu_qsbr_gp.ctr + * before load URCU_TLS(urcu_qsbr_reader).ctr. */ cmm_barrier(); @@ -336,19 +340,19 @@ gp_end: * freed. */ if (was_online) - rcu_thread_online(); + urcu_qsbr_thread_online(); else cmm_smp_mb(); } #else /* !(CAA_BITS_PER_LONG < 64) */ -void synchronize_rcu(void) +void urcu_qsbr_synchronize_rcu(void) { CDS_LIST_HEAD(qsreaders); unsigned long was_online; DEFINE_URCU_WAIT_NODE(wait, URCU_WAIT_WAITING); struct urcu_waiters waiters; - was_online = rcu_read_ongoing(); + was_online = urcu_qsbr_read_ongoing(); /* * Mark the writer thread offline to make sure we don't wait for @@ -356,7 +360,7 @@ void synchronize_rcu(void) * in threads registered as readers. */ if (was_online) - rcu_thread_offline(); + urcu_qsbr_thread_offline(); else cmm_smp_mb(); @@ -386,14 +390,14 @@ void synchronize_rcu(void) goto out; /* Increment current G.P. */ - CMM_STORE_SHARED(rcu_gp.ctr, rcu_gp.ctr + RCU_GP_CTR); + CMM_STORE_SHARED(urcu_qsbr_gp.ctr, urcu_qsbr_gp.ctr + URCU_QSBR_GP_CTR); /* - * Must commit rcu_gp.ctr update to memory before waiting for + * Must commit urcu_qsbr_gp.ctr update to memory before waiting for * quiescent state. Failure to do so could result in the writer * waiting forever while new readers are always accessing data - * (no progress). Enforce compiler-order of store to rcu_gp.ctr - * before load URCU_TLS(rcu_reader).ctr. + * (no progress). Enforce compiler-order of store to urcu_qsbr_gp.ctr + * before load URCU_TLS(urcu_qsbr_reader).ctr. */ cmm_barrier(); @@ -421,74 +425,90 @@ out: urcu_wake_all_waiters(&waiters); gp_end: if (was_online) - rcu_thread_online(); + urcu_qsbr_thread_online(); else 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. */ -void rcu_read_lock(void) +void urcu_qsbr_read_lock(void) { - _rcu_read_lock(); + _urcu_qsbr_read_lock(); } +__attribute__((alias("urcu_qsbr_read_lock"))) void rcu_read_lock_qsbr(); -void rcu_read_unlock(void) +void urcu_qsbr_read_unlock(void) { - _rcu_read_unlock(); + _urcu_qsbr_read_unlock(); } +__attribute__((alias("urcu_qsbr_read_unlock"))) void rcu_read_unlock_qsbr(); -int rcu_read_ongoing(void) +int urcu_qsbr_read_ongoing(void) { - return _rcu_read_ongoing(); + return _urcu_qsbr_read_ongoing(); } +__attribute__((alias("urcu_qsbr_read_ongoing"))) +void rcu_read_ongoing_qsbr(); -void rcu_quiescent_state(void) +void urcu_qsbr_quiescent_state(void) { - _rcu_quiescent_state(); + _urcu_qsbr_quiescent_state(); } +__attribute__((alias("urcu_qsbr_quiescent_state"))) +void rcu_quiescent_state_qsbr(); -void rcu_thread_offline(void) +void urcu_qsbr_thread_offline(void) { - _rcu_thread_offline(); + _urcu_qsbr_thread_offline(); } +__attribute__((alias("urcu_qsbr_thread_offline"))) +void rcu_thread_offline_qsbr(); -void rcu_thread_online(void) +void urcu_qsbr_thread_online(void) { - _rcu_thread_online(); + _urcu_qsbr_thread_online(); } +__attribute__((alias("urcu_qsbr_thread_online"))) +void rcu_thread_online_qsbr(); -void rcu_register_thread(void) +void urcu_qsbr_register_thread(void) { - URCU_TLS(rcu_reader).tid = pthread_self(); - assert(URCU_TLS(rcu_reader).ctr == 0); + URCU_TLS(urcu_qsbr_reader).tid = pthread_self(); + assert(URCU_TLS(urcu_qsbr_reader).ctr == 0); mutex_lock(&rcu_registry_lock); - assert(!URCU_TLS(rcu_reader).registered); - URCU_TLS(rcu_reader).registered = 1; - cds_list_add(&URCU_TLS(rcu_reader).node, ®istry); + assert(!URCU_TLS(urcu_qsbr_reader).registered); + URCU_TLS(urcu_qsbr_reader).registered = 1; + cds_list_add(&URCU_TLS(urcu_qsbr_reader).node, ®istry); mutex_unlock(&rcu_registry_lock); - _rcu_thread_online(); + _urcu_qsbr_thread_online(); } +__attribute__((alias("urcu_qsbr_register_thread"))) +void rcu_register_thread_qsbr(); -void rcu_unregister_thread(void) +void urcu_qsbr_unregister_thread(void) { /* * We have to make the thread offline otherwise we end up dealocking * with a waiting writer. */ - _rcu_thread_offline(); - assert(URCU_TLS(rcu_reader).registered); - URCU_TLS(rcu_reader).registered = 0; + _urcu_qsbr_thread_offline(); + assert(URCU_TLS(urcu_qsbr_reader).registered); + URCU_TLS(urcu_qsbr_reader).registered = 0; mutex_lock(&rcu_registry_lock); - cds_list_del(&URCU_TLS(rcu_reader).node); + 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 rcu_exit(void) +void urcu_qsbr_exit(void) { /* * Assertion disabled because call_rcu threads are now rcu @@ -496,8 +516,10 @@ void rcu_exit(void) * assert(cds_list_empty(®istry)); */ } +__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"