X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-qsbr.c;h=cf8b5cec46d2c10afaff8c53a56e9adfa4e27eb1;hp=2cf73d5d5be30f62771a62152623fb81b5798133;hb=0376e7b2f8d26778ebc4750b34e718c062c92764;hpb=5481ddb381061bda64aebc039900d21cac6a6caf diff --git a/urcu-qsbr.c b/urcu-qsbr.c index 2cf73d5..cf8b5ce 100644 --- a/urcu-qsbr.c +++ b/urcu-qsbr.c @@ -32,6 +32,8 @@ #include #include +#include "urcu-qsbr-map.h" + #define BUILD_QSBR_LIB #include "urcu-qsbr-static.h" /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */ @@ -59,7 +61,7 @@ unsigned int yield_active; unsigned int __thread rand_yield; #endif -static LIST_HEAD(registry); +static CDS_LIST_HEAD(registry); static void mutex_lock(pthread_mutex_t *mutex) { @@ -108,23 +110,24 @@ static void wait_gp(void) static void update_counter_and_wait(void) { - LIST_HEAD(qsreaders); + CDS_LIST_HEAD(qsreaders); int wait_loops = 0; struct rcu_reader *index, *tmp; -#if (BITS_PER_LONG < 64) +#if (CAA_BITS_PER_LONG < 64) /* Switch parity: 0 -> 1, 1 -> 0 */ - STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR); -#else /* !(BITS_PER_LONG < 64) */ + CMM_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR); +#else /* !(CAA_BITS_PER_LONG < 64) */ /* Increment current G.P. */ - STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr + RCU_GP_CTR); -#endif /* !(BITS_PER_LONG < 64) */ + CMM_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr + RCU_GP_CTR); +#endif /* !(CAA_BITS_PER_LONG < 64) */ /* - * Must commit rcu_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 rcu_reader ctr. + * Must commit rcu_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 rcu_reader ctr. */ cmm_barrier(); @@ -146,12 +149,12 @@ static void update_counter_and_wait(void) cmm_smp_mb(); } - list_for_each_entry_safe(index, tmp, ®istry, node) { + cds_list_for_each_entry_safe(index, tmp, ®istry, node) { if (!rcu_gp_ongoing(&index->ctr)) - list_move(&index->node, &qsreaders); + cds_list_move(&index->node, &qsreaders); } - if (list_empty(®istry)) { + if (cds_list_empty(®istry)) { if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS) { /* Read reader_gp before write futex */ cmm_smp_mb(); @@ -163,7 +166,7 @@ static void update_counter_and_wait(void) wait_gp(); } else { #ifndef HAS_INCOHERENT_CACHES - cpu_relax(); + caa_cpu_relax(); #else /* #ifndef HAS_INCOHERENT_CACHES */ cmm_smp_mb(); #endif /* #else #ifndef HAS_INCOHERENT_CACHES */ @@ -171,7 +174,7 @@ static void update_counter_and_wait(void) } } /* put back the reader list in the registry */ - list_splice(&qsreaders, ®istry); + cds_list_splice(&qsreaders, ®istry); } /* @@ -179,7 +182,7 @@ static void update_counter_and_wait(void) * long-size to ensure we do not encounter an overflow bug. */ -#if (BITS_PER_LONG < 64) +#if (CAA_BITS_PER_LONG < 64) void synchronize_rcu(void) { unsigned long was_online; @@ -194,15 +197,15 @@ void synchronize_rcu(void) /* * Mark the writer thread offline to make sure we don't wait for - * our own quiescent state. This allows using synchronize_rcu() in - * threads registered as readers. + * our own quiescent state. This allows using synchronize_rcu() + * in threads registered as readers. */ if (was_online) - STORE_SHARED(rcu_reader.ctr, 0); + CMM_STORE_SHARED(rcu_reader.ctr, 0); mutex_lock(&rcu_gp_lock); - if (list_empty(®istry)) + if (cds_list_empty(®istry)) goto out; /* @@ -212,10 +215,11 @@ void synchronize_rcu(void) /* * Must finish waiting for quiescent state for parity 0 before - * committing next rcu_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 - * rcu_reader ctr before store to rcu_gp_ctr. + * committing next rcu_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 rcu_reader ctr before store to + * rcu_gp_ctr. */ cmm_barrier(); @@ -238,10 +242,11 @@ out: * freed. */ if (was_online) - _STORE_SHARED(rcu_reader.ctr, LOAD_SHARED(rcu_gp_ctr)); + _CMM_STORE_SHARED(rcu_reader.ctr, + CMM_LOAD_SHARED(rcu_gp_ctr)); cmm_smp_mb(); } -#else /* !(BITS_PER_LONG < 64) */ +#else /* !(CAA_BITS_PER_LONG < 64) */ void synchronize_rcu(void) { unsigned long was_online; @@ -250,25 +255,26 @@ void synchronize_rcu(void) /* * Mark the writer thread offline to make sure we don't wait for - * our own quiescent state. This allows using synchronize_rcu() in - * threads registered as readers. + * our own quiescent state. This allows using synchronize_rcu() + * in threads registered as readers. */ cmm_smp_mb(); if (was_online) - STORE_SHARED(rcu_reader.ctr, 0); + CMM_STORE_SHARED(rcu_reader.ctr, 0); mutex_lock(&rcu_gp_lock); - if (list_empty(®istry)) + if (cds_list_empty(®istry)) goto out; update_counter_and_wait(); out: mutex_unlock(&rcu_gp_lock); if (was_online) - _STORE_SHARED(rcu_reader.ctr, LOAD_SHARED(rcu_gp_ctr)); + _CMM_STORE_SHARED(rcu_reader.ctr, + CMM_LOAD_SHARED(rcu_gp_ctr)); cmm_smp_mb(); } -#endif /* !(BITS_PER_LONG < 64) */ +#endif /* !(CAA_BITS_PER_LONG < 64) */ /* * library wrappers to be used by non-LGPL compatible source code. @@ -305,7 +311,7 @@ void rcu_register_thread(void) assert(rcu_reader.ctr == 0); mutex_lock(&rcu_gp_lock); - list_add(&rcu_reader.node, ®istry); + cds_list_add(&rcu_reader.node, ®istry); mutex_unlock(&rcu_gp_lock); _rcu_thread_online(); } @@ -318,11 +324,14 @@ void rcu_unregister_thread(void) */ _rcu_thread_offline(); mutex_lock(&rcu_gp_lock); - list_del(&rcu_reader.node); + cds_list_del(&rcu_reader.node); mutex_unlock(&rcu_gp_lock); } void rcu_exit(void) { - assert(list_empty(®istry)); + assert(cds_list_empty(®istry)); } + +#include "urcu-call-rcu-impl.h" +#include "urcu-defer-impl.h"