}
#endif
-/* Sleep delay in us */
-#define RCU_SLEEP_DELAY 1000
+/* Sleep delay in ms */
+#define RCU_SLEEP_DELAY_MS 10
#define INIT_NR_THREADS 8
#define ARENA_INIT_ALLOC \
sizeof(struct registry_chunk) \
*/
#define RCU_QS_ACTIVE_ATTEMPTS 100
+static
+int rcu_bp_refcount;
+
static
void __attribute__((constructor)) rcu_bp_init(void);
static
void update_counter_and_wait(void)
{
CDS_LIST_HEAD(qsreaders);
- int wait_loops = 0;
+ unsigned int wait_loops = 0;
struct rcu_reader *index, *tmp;
/* Switch parity: 0 -> 1, 1 -> 0 */
* Wait for each thread rcu_reader.ctr count to become 0.
*/
for (;;) {
- wait_loops++;
+ if (wait_loops < RCU_QS_ACTIVE_ATTEMPTS)
+ wait_loops++;
+
cds_list_for_each_entry_safe(index, tmp, ®istry, node) {
if (!rcu_old_gp_ongoing(&index->ctr))
cds_list_move(&index->node, &qsreaders);
if (cds_list_empty(®istry)) {
break;
} else {
- if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS)
- usleep(RCU_SLEEP_DELAY);
+ if (wait_loops >= RCU_QS_ACTIVE_ATTEMPTS)
+ (void) poll(NULL, 0, RCU_SLEEP_DELAY_MS);
else
caa_cpu_relax();
}
/* Called with signals off and mutex locked */
static
-void remove_thread(void)
+void remove_thread(struct rcu_reader *rcu_reader_reg)
{
- struct rcu_reader *rcu_reader_reg;
-
- rcu_reader_reg = URCU_TLS(rcu_reader);
cleanup_thread(find_chunk(rcu_reader_reg), rcu_reader_reg);
URCU_TLS(rcu_reader) = NULL;
}
/* Disable signals, take mutex, remove from registry */
static
-void rcu_bp_unregister(void)
+void rcu_bp_unregister(struct rcu_reader *rcu_reader_reg)
{
sigset_t newmask, oldmask;
int ret;
abort();
mutex_lock(&rcu_gp_lock);
- remove_thread();
+ remove_thread(rcu_reader_reg);
mutex_unlock(&rcu_gp_lock);
ret = pthread_sigmask(SIG_SETMASK, &oldmask, NULL);
if (ret)
abort();
+ rcu_bp_exit();
}
/*
static
void urcu_bp_thread_exit_notifier(void *rcu_key)
{
- assert(rcu_key == URCU_TLS(rcu_reader));
- rcu_bp_unregister();
+ rcu_bp_unregister(rcu_key);
}
static
void rcu_bp_init(void)
{
mutex_lock(&init_lock);
- if (!initialized) {
+ if (!rcu_bp_refcount++) {
int ret;
ret = pthread_key_create(&urcu_bp_key,
static
void rcu_bp_exit(void)
{
- struct registry_chunk *chunk, *tmp;
- int ret;
+ mutex_lock(&init_lock);
+ if (!--rcu_bp_refcount) {
+ struct registry_chunk *chunk, *tmp;
+ int ret;
- cds_list_for_each_entry_safe(chunk, tmp,
- ®istry_arena.chunk_list, node) {
- munmap(chunk, chunk->data_len + sizeof(struct registry_chunk));
+ cds_list_for_each_entry_safe(chunk, tmp,
+ ®istry_arena.chunk_list, node) {
+ munmap(chunk, chunk->data_len
+ + sizeof(struct registry_chunk));
+ }
+ ret = pthread_key_delete(urcu_bp_key);
+ if (ret)
+ abort();
}
- ret = pthread_key_delete(urcu_bp_key);
- if (ret)
- abort();
+ mutex_unlock(&init_lock);
}
/*