X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu.c;h=a620b762b4796712bd05efb862de8cb6c53c41fd;hp=39f5619773ba383b402fb1c536672af990129ed3;hb=999991c6e4600c410181baea65bda9f406464872;hpb=0a1d290b4432036a7c1bf4a1b251ec9086036a87;ds=sidebyside diff --git a/urcu.c b/urcu.c index 39f5619..a620b76 100644 --- a/urcu.c +++ b/urcu.c @@ -3,7 +3,7 @@ * * Userspace RCU library * - * Copyright (c) 2009 Mathieu Desnoyers + * Copyright (c) 2009 Mathieu Desnoyers * Copyright (c) 2009 Paul E. McKenney, IBM Corporation. * * This library is free software; you can redistribute it and/or @@ -23,167 +23,178 @@ * IBM's contributions to this file may be relicensed under LGPLv2 or later. */ +#define _BSD_SOURCE +#define _GNU_SOURCE +#define _LGPL_SOURCE +#define _DEFAULT_SOURCE #include #include #include #include #include +#include #include #include #include -#include "urcu-static.h" +#include "urcu/arch.h" +#include "urcu/wfcqueue.h" +#include "urcu/map/urcu.h" +#include "urcu/static/urcu.h" +#include "urcu-pointer.h" +#include "urcu/tls-compat.h" + +#include "urcu-die.h" +#include "urcu-wait.h" + /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */ +#undef _LGPL_SOURCE #include "urcu.h" +#define _LGPL_SOURCE + +/* + * If a reader is really non-cooperative and refuses to commit its + * rcu_active_readers count to memory (there is no barrier in the reader + * per-se), kick it after 10 loops waiting for it. + */ +#define KICK_READER_LOOPS 10 + +/* + * Active attempts to check for reader Q.S. before calling futex(). + */ +#define RCU_QS_ACTIVE_ATTEMPTS 100 -#ifndef URCU_MB -void __attribute__((constructor)) urcu_init(void); -void __attribute__((destructor)) urcu_exit(void); +/* If the headers do not support membarrier system call, fall back on RCU_MB */ +#ifdef __NR_membarrier +# define membarrier(...) syscall(__NR_membarrier, __VA_ARGS__) #else -void urcu_init(void) +# define membarrier(...) -ENOSYS +#endif + +enum membarrier_cmd { + MEMBARRIER_CMD_QUERY = 0, + MEMBARRIER_CMD_SHARED = (1 << 0), +}; + +#ifdef RCU_MEMBARRIER +static int init_done; +int rcu_has_sys_membarrier; + +void __attribute__((constructor)) rcu_init(void); +#endif + +#ifdef RCU_MB +void rcu_init(void) { } #endif -int init_done; +#ifdef RCU_SIGNAL +static int init_done; -pthread_mutex_t urcu_mutex = PTHREAD_MUTEX_INITIALIZER; +void __attribute__((constructor)) rcu_init(void); +void __attribute__((destructor)) rcu_exit(void); +#endif /* - * Global grace period counter. - * Contains the current RCU_GP_CTR_BIT. - * Also has a RCU_GP_CTR_BIT of 1, to accelerate the reader fast path. - * Written to only by writer with mutex taken. Read by both writer and readers. + * rcu_gp_lock ensures mutual exclusion between threads calling + * synchronize_rcu(). */ -long urcu_gp_ctr = RCU_GP_COUNT; +static pthread_mutex_t rcu_gp_lock = PTHREAD_MUTEX_INITIALIZER; +/* + * rcu_registry_lock ensures mutual exclusion between threads + * registering and unregistering themselves to/from the registry, and + * with threads reading that registry from synchronize_rcu(). However, + * this lock is not held all the way through the completion of awaiting + * for the grace period. It is sporadically released between iterations + * on the registry. + * 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_COUNT }; /* * Written to only by each individual reader. Read by both the reader and the * writers. */ -long __thread urcu_active_readers; - -/* Thread IDs of registered readers */ -#define INIT_NUM_THREADS 4 - -struct reader_registry { - pthread_t tid; - long *urcu_active_readers; - char *need_mb; -}; +DEFINE_URCU_TLS(struct rcu_reader, rcu_reader); -#ifdef DEBUG_YIELD -unsigned int yield_active; -unsigned int __thread rand_yield; -#endif +static CDS_LIST_HEAD(registry); -static struct reader_registry *registry; -static char __thread need_mb; -static int num_readers, alloc_readers; +/* + * Queue keeping threads awaiting to wait for a grace period. Contains + * struct gp_waiters_thread objects. + */ +static DEFINE_URCU_WAIT_QUEUE(gp_waiters); -void internal_urcu_lock(void) +static void mutex_lock(pthread_mutex_t *mutex) { int ret; #ifndef DISTRUST_SIGNALS_EXTREME - ret = pthread_mutex_lock(&urcu_mutex); - if (ret) { - perror("Error in pthread mutex lock"); - exit(-1); - } + ret = pthread_mutex_lock(mutex); + if (ret) + urcu_die(ret); #else /* #ifndef DISTRUST_SIGNALS_EXTREME */ - while ((ret = pthread_mutex_trylock(&urcu_mutex)) != 0) { - if (ret != EBUSY && ret != EINTR) { - printf("ret = %d, errno = %d\n", ret, errno); - perror("Error in pthread mutex lock"); - exit(-1); - } - if (need_mb) { - smp_mb(); - need_mb = 0; - smp_mb(); + while ((ret = pthread_mutex_trylock(mutex)) != 0) { + if (ret != EBUSY && ret != EINTR) + urcu_die(ret); + if (CMM_LOAD_SHARED(URCU_TLS(rcu_reader).need_mb)) { + cmm_smp_mb(); + _CMM_STORE_SHARED(URCU_TLS(rcu_reader).need_mb, 0); + cmm_smp_mb(); } - poll(NULL,0,10); + (void) poll(NULL, 0, 10); } #endif /* #else #ifndef DISTRUST_SIGNALS_EXTREME */ } -void internal_urcu_unlock(void) +static void mutex_unlock(pthread_mutex_t *mutex) { int ret; - ret = pthread_mutex_unlock(&urcu_mutex); - if (ret) { - perror("Error in pthread mutex unlock"); - exit(-1); - } + ret = pthread_mutex_unlock(mutex); + if (ret) + urcu_die(ret); } -/* - * called with urcu_mutex held. - */ -static void switch_next_urcu_qparity(void) +#ifdef RCU_MEMBARRIER +static void smp_mb_master(void) { - STORE_SHARED(urcu_gp_ctr, urcu_gp_ctr ^ RCU_GP_CTR_BIT); + if (caa_likely(rcu_has_sys_membarrier)) + (void) membarrier(MEMBARRIER_CMD_SHARED, 0); + else + cmm_smp_mb(); } +#endif -#ifdef URCU_MB -#ifdef HAS_INCOHERENT_CACHES -static void force_mb_single_thread(struct reader_registry *index) +#ifdef RCU_MB +static void smp_mb_master(void) { - smp_mb(); + cmm_smp_mb(); } -#endif /* #ifdef HAS_INCOHERENT_CACHES */ +#endif -static void force_mb_all_threads(void) -{ - smp_mb(); -} -#else /* #ifdef URCU_MB */ -#ifdef HAS_INCOHERENT_CACHES -static void force_mb_single_thread(struct reader_registry *index) +#ifdef RCU_SIGNAL +static void force_mb_all_readers(void) { - assert(registry); - /* - * pthread_kill has a smp_mb(). But beware, we assume it performs - * a cache flush on architectures with non-coherent cache. Let's play - * safe and don't assume anything : we use smp_mc() to make sure the - * cache flush is enforced. - */ - *index->need_mb = 1; - smp_mc(); /* write ->need_mb before sending the signals */ - pthread_kill(index->tid, SIGURCU); - smp_mb(); - /* - * Wait for sighandler (and thus mb()) to execute on every thread. - * BUSY-LOOP. - */ - while (*index->need_mb) { - poll(NULL, 0, 1); - } - smp_mb(); /* read ->need_mb before ending the barrier */ -} -#endif /* #ifdef HAS_INCOHERENT_CACHES */ + struct rcu_reader *index; -static void force_mb_all_threads(void) -{ - struct reader_registry *index; /* - * Ask for each threads to execute a smp_mb() so we can consider the + * Ask for each threads to execute a cmm_smp_mb() so we can consider the * compiler barriers around rcu read lock as real memory barriers. */ - if (!registry) + if (cds_list_empty(®istry)) return; /* - * pthread_kill has a smp_mb(). But beware, we assume it performs + * pthread_kill has a cmm_smp_mb(). But beware, we assume it performs * a cache flush on architectures with non-coherent cache. Let's play - * safe and don't assume anything : we use smp_mc() to make sure the + * safe and don't assume anything : we use cmm_smp_mc() to make sure the * cache flush is enforced. */ - for (index = registry; index < registry + num_readers; index++) { - *index->need_mb = 1; - smp_mc(); /* write need_mb before sending the signal */ - pthread_kill(index->tid, SIGURCU); + cds_list_for_each_entry(index, ®istry, node) { + CMM_STORE_SHARED(index->need_mb, 1); + pthread_kill(index->tid, SIGRCU); } /* * Wait for sighandler (and thus mb()) to execute on every thread. @@ -198,42 +209,143 @@ static void force_mb_all_threads(void) * relevant bug report. For Linux kernels, we recommend getting * the Linux Test Project (LTP). */ - for (index = registry; index < registry + num_readers; index++) { - while (*index->need_mb) { - pthread_kill(index->tid, SIGURCU); - poll(NULL, 0, 1); + cds_list_for_each_entry(index, ®istry, node) { + while (CMM_LOAD_SHARED(index->need_mb)) { + pthread_kill(index->tid, SIGRCU); + (void) poll(NULL, 0, 1); } } - smp_mb(); /* read ->need_mb before ending the barrier */ + cmm_smp_mb(); /* read ->need_mb before ending the barrier */ } -#endif /* #else #ifdef URCU_MB */ -void wait_for_quiescent_state(void) +static void smp_mb_master(void) { - struct reader_registry *index; + force_mb_all_readers(); +} +#endif /* #ifdef RCU_SIGNAL */ - if (!registry) +/* + * synchronize_rcu() waiting. Single thread. + */ +static void wait_gp(void) +{ + /* Read reader_gp before read futex */ + smp_mb_master(); + if (uatomic_read(&rcu_gp.futex) != -1) return; + while (futex_async(&rcu_gp.futex, FUTEX_WAIT, -1, + NULL, NULL, 0)) { + switch (errno) { + case EWOULDBLOCK: + /* Value already changed. */ + return; + case EINTR: + /* Retry if interrupted by signal. */ + break; /* Get out of switch. */ + default: + /* Unexpected error. */ + urcu_die(errno); + } + } +} + +/* + * Always called with rcu_registry lock held. Releases this lock between + * iterations and grabs it again. Holds the lock when it returns. + */ +static void wait_for_readers(struct cds_list_head *input_readers, + struct cds_list_head *cur_snap_readers, + struct cds_list_head *qsreaders) +{ + unsigned int wait_loops = 0; + struct rcu_reader *index, *tmp; +#ifdef HAS_INCOHERENT_CACHES + unsigned int wait_gp_loops = 0; +#endif /* HAS_INCOHERENT_CACHES */ + /* - * Wait for each thread urcu_active_readers count to become 0. + * Wait for each thread URCU_TLS(rcu_reader).ctr to either + * indicate quiescence (not nested), or observe the current + * rcu_gp.ctr value. */ - for (index = registry; index < registry + num_readers; index++) { + for (;;) { + if (wait_loops < RCU_QS_ACTIVE_ATTEMPTS) + wait_loops++; + if (wait_loops >= RCU_QS_ACTIVE_ATTEMPTS) { + uatomic_dec(&rcu_gp.futex); + /* Write futex before read reader_gp */ + smp_mb_master(); + } + + cds_list_for_each_entry_safe(index, tmp, input_readers, node) { + switch (rcu_reader_state(&index->ctr)) { + case RCU_READER_ACTIVE_CURRENT: + if (cur_snap_readers) { + cds_list_move(&index->node, + cur_snap_readers); + break; + } + /* Fall-through */ + case RCU_READER_INACTIVE: + cds_list_move(&index->node, qsreaders); + break; + case RCU_READER_ACTIVE_OLD: + /* + * Old snapshot. Leaving node in + * input_readers will make us busy-loop + * until the snapshot becomes current or + * the reader becomes inactive. + */ + break; + } + } + #ifndef HAS_INCOHERENT_CACHES - while (rcu_old_gp_ongoing(index->urcu_active_readers)) - cpu_relax(); + if (cds_list_empty(input_readers)) { + if (wait_loops >= RCU_QS_ACTIVE_ATTEMPTS) { + /* Read reader_gp before write futex */ + smp_mb_master(); + uatomic_set(&rcu_gp.futex, 0); + } + break; + } else { + /* Temporarily unlock the registry lock. */ + mutex_unlock(&rcu_registry_lock); + if (wait_loops >= RCU_QS_ACTIVE_ATTEMPTS) + wait_gp(); + else + caa_cpu_relax(); + /* Re-lock the registry lock before the next loop. */ + mutex_lock(&rcu_registry_lock); + } #else /* #ifndef HAS_INCOHERENT_CACHES */ - int wait_loops = 0; /* * BUSY-LOOP. Force the reader thread to commit its - * urcu_active_readers update to memory if we wait for too long. + * URCU_TLS(rcu_reader).ctr update to memory if we wait + * for too long. */ - while (rcu_old_gp_ongoing(index->urcu_active_readers)) { - if (wait_loops++ == KICK_READER_LOOPS) { - force_mb_single_thread(index); - wait_loops = 0; + if (cds_list_empty(input_readers)) { + if (wait_loops >= RCU_QS_ACTIVE_ATTEMPTS) { + /* Read reader_gp before write futex */ + smp_mb_master(); + uatomic_set(&rcu_gp.futex, 0); + } + break; + } else { + if (wait_gp_loops == KICK_READER_LOOPS) { + smp_mb_master(); + wait_gp_loops = 0; + } + /* Temporarily unlock the registry lock. */ + mutex_unlock(&rcu_registry_lock); + if (wait_loops >= RCU_QS_ACTIVE_ATTEMPTS) { + wait_gp(); + wait_gp_loops++; } else { - cpu_relax(); + caa_cpu_relax(); } + /* Re-lock the registry lock before the next loop. */ + mutex_lock(&rcu_registry_lock); } #endif /* #else #ifndef HAS_INCOHERENT_CACHES */ } @@ -241,79 +353,119 @@ void wait_for_quiescent_state(void) void synchronize_rcu(void) { - internal_urcu_lock(); + CDS_LIST_HEAD(cur_snap_readers); + CDS_LIST_HEAD(qsreaders); + DEFINE_URCU_WAIT_NODE(wait, URCU_WAIT_WAITING); + struct urcu_waiters waiters; - /* All threads should read qparity before accessing data structure - * where new ptr points to. Must be done within internal_urcu_lock - * because it iterates on reader threads.*/ - /* Write new ptr before changing the qparity */ - force_mb_all_threads(); + /* + * Add ourself to gp_waiters queue of threads awaiting to wait + * for a grace period. Proceed to perform the grace period only + * if we are the first thread added into the queue. + * The implicit memory barrier before urcu_wait_add() + * orders prior memory accesses of threads put into the wait + * queue before their insertion into the wait queue. + */ + if (urcu_wait_add(&gp_waiters, &wait) != 0) { + /* Not first in queue: will be awakened by another thread. */ + urcu_adaptative_busy_wait(&wait); + /* Order following memory accesses after grace period. */ + cmm_smp_mb(); + return; + } + /* We won't need to wake ourself up */ + urcu_wait_set_state(&wait, URCU_WAIT_RUNNING); - switch_next_urcu_qparity(); /* 0 -> 1 */ + mutex_lock(&rcu_gp_lock); /* - * Must commit qparity update to memory before waiting for parity - * 0 quiescent state. Failure to do so could result in the writer - * waiting forever while new readers are always accessing data (no - * progress). - * Ensured by STORE_SHARED and LOAD_SHARED. + * Move all waiters into our local queue. */ + urcu_move_waiters(&waiters, &gp_waiters); + + mutex_lock(&rcu_registry_lock); + + if (cds_list_empty(®istry)) + goto out; /* - * Adding a smp_mb() which is _not_ formally required, but makes the - * model easier to understand. It does not have a big performance impact - * anyway, given this is the write-side. + * All threads should read qparity before accessing data structure + * where new ptr points to. Must be done within rcu_registry_lock + * because it iterates on reader threads. */ - smp_mb(); + /* Write new ptr before changing the qparity */ + smp_mb_master(); /* - * Wait for previous parity to be empty of readers. + * Wait for readers to observe original parity or be quiescent. + * wait_for_readers() can release and grab again rcu_registry_lock + * interally. */ - wait_for_quiescent_state(); /* Wait readers in parity 0 */ + wait_for_readers(®istry, &cur_snap_readers, &qsreaders); /* - * Must finish waiting for quiescent state for parity 0 before - * committing qparity update to memory. Failure to do so could result in - * the writer waiting forever while new readers are always accessing - * data (no progress). - * Ensured by STORE_SHARED and LOAD_SHARED. + * Must finish waiting for quiescent state for original parity 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 + * URCU_TLS(rcu_reader).ctr before store to rcu_gp.ctr. */ + cmm_barrier(); /* - * Adding a smp_mb() which is _not_ formally required, but makes the + * Adding a cmm_smp_mb() which is _not_ formally required, but makes the * model easier to understand. It does not have a big performance impact * anyway, given this is the write-side. */ - smp_mb(); + cmm_smp_mb(); - switch_next_urcu_qparity(); /* 1 -> 0 */ + /* Switch parity: 0 -> 1, 1 -> 0 */ + CMM_STORE_SHARED(rcu_gp.ctr, rcu_gp.ctr ^ RCU_GP_CTR_PHASE); /* - * Must commit qparity update to memory before waiting for parity - * 1 quiescent state. Failure to do so could result in the writer - * waiting forever while new readers are always accessing data (no - * progress). - * Ensured by STORE_SHARED and LOAD_SHARED. + * 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(); /* - * Adding a smp_mb() which is _not_ formally required, but makes the + * + * Adding a cmm_smp_mb() which is _not_ formally required, but makes the * model easier to understand. It does not have a big performance impact * anyway, given this is the write-side. */ - smp_mb(); + cmm_smp_mb(); + + /* + * Wait for readers to observe new parity or be quiescent. + * wait_for_readers() can release and grab again rcu_registry_lock + * interally. + */ + wait_for_readers(&cur_snap_readers, NULL, &qsreaders); /* - * Wait for previous parity to be empty of readers. + * Put quiescent reader list back into registry. */ - wait_for_quiescent_state(); /* Wait readers in parity 1 */ + cds_list_splice(&qsreaders, ®istry); - /* Finish waiting for reader threads before letting the old ptr being - * freed. Must be done within internal_urcu_lock because it iterates on - * reader threads. */ - force_mb_all_threads(); + /* + * Finish waiting for reader threads before letting the old ptr + * being freed. Must be done within rcu_registry_lock because it + * iterates on reader threads. + */ + smp_mb_master(); +out: + mutex_unlock(&rcu_registry_lock); + mutex_unlock(&rcu_gp_lock); - internal_urcu_unlock(); + /* + * Wakeup waiters only after we have completed the grace period + * and have ensured the memory barriers at the end of the grace + * period have been issued. + */ + urcu_wake_all_waiters(&waiters); } /* @@ -330,118 +482,71 @@ void rcu_read_unlock(void) _rcu_read_unlock(); } -void *rcu_dereference(void *p) +int rcu_read_ongoing(void) { - return _rcu_dereference(p); + return _rcu_read_ongoing(); } -void *rcu_assign_pointer_sym(void **p, void *v) -{ - wmb(); - return STORE_SHARED(p, v); -} - -void *rcu_xchg_pointer_sym(void **p, void *v) +void rcu_register_thread(void) { - wmb(); - return xchg(p, v); + URCU_TLS(rcu_reader).tid = pthread_self(); + assert(URCU_TLS(rcu_reader).need_mb == 0); + assert(!(URCU_TLS(rcu_reader).ctr & RCU_GP_CTR_NEST_MASK)); + + mutex_lock(&rcu_registry_lock); + assert(!URCU_TLS(rcu_reader).registered); + URCU_TLS(rcu_reader).registered = 1; + rcu_init(); /* In case gcc does not support constructor attribute */ + cds_list_add(&URCU_TLS(rcu_reader).node, ®istry); + mutex_unlock(&rcu_registry_lock); } -void *rcu_publish_content_sym(void **p, void *v) +void rcu_unregister_thread(void) { - void *oldptr; - - oldptr = _rcu_xchg_pointer(p, v); - synchronize_rcu(); - return oldptr; + mutex_lock(&rcu_registry_lock); + assert(URCU_TLS(rcu_reader).registered); + URCU_TLS(rcu_reader).registered = 0; + cds_list_del(&URCU_TLS(rcu_reader).node); + mutex_unlock(&rcu_registry_lock); } -static void rcu_add_reader(pthread_t id) +#ifdef RCU_MEMBARRIER +void rcu_init(void) { - struct reader_registry *oldarray; - - if (!registry) { - alloc_readers = INIT_NUM_THREADS; - num_readers = 0; - registry = - malloc(sizeof(struct reader_registry) * alloc_readers); - } - if (alloc_readers < num_readers + 1) { - oldarray = registry; - registry = malloc(sizeof(struct reader_registry) - * (alloc_readers << 1)); - memcpy(registry, oldarray, - sizeof(struct reader_registry) * alloc_readers); - alloc_readers <<= 1; - free(oldarray); - } - registry[num_readers].tid = id; - /* reference to the TLS of _this_ reader thread. */ - registry[num_readers].urcu_active_readers = &urcu_active_readers; - registry[num_readers].need_mb = &need_mb; - num_readers++; -} + int ret; -/* - * Never shrink (implementation limitation). - * This is O(nb threads). Eventually use a hash table. - */ -static void rcu_remove_reader(pthread_t id) -{ - struct reader_registry *index; - - assert(registry != NULL); - for (index = registry; index < registry + num_readers; index++) { - if (pthread_equal(index->tid, id)) { - memcpy(index, ®istry[num_readers - 1], - sizeof(struct reader_registry)); - registry[num_readers - 1].tid = 0; - registry[num_readers - 1].urcu_active_readers = NULL; - num_readers--; - return; - } + if (init_done) + return; + init_done = 1; + ret = membarrier(MEMBARRIER_CMD_QUERY, 0); + if (ret >= 0 && (ret & MEMBARRIER_CMD_SHARED)) { + rcu_has_sys_membarrier = 1; } - /* Hrm not found, forgot to register ? */ - assert(0); -} - -void rcu_register_thread(void) -{ - internal_urcu_lock(); - urcu_init(); /* In case gcc does not support constructor attribute */ - rcu_add_reader(pthread_self()); - internal_urcu_unlock(); -} - -void rcu_unregister_thread(void) -{ - internal_urcu_lock(); - rcu_remove_reader(pthread_self()); - internal_urcu_unlock(); } +#endif -#ifndef URCU_MB -static void sigurcu_handler(int signo, siginfo_t *siginfo, void *context) +#ifdef RCU_SIGNAL +static void sigrcu_handler(int signo, siginfo_t *siginfo, void *context) { /* - * Executing this smp_mb() is the only purpose of this signal handler. - * It punctually promotes barrier() into smp_mb() on every thread it is + * Executing this cmm_smp_mb() is the only purpose of this signal handler. + * It punctually promotes cmm_barrier() into cmm_smp_mb() on every thread it is * executed on. */ - smp_mb(); - need_mb = 0; - smp_mb(); + cmm_smp_mb(); + _CMM_STORE_SHARED(URCU_TLS(rcu_reader).need_mb, 0); + cmm_smp_mb(); } /* - * urcu_init constructor. Called when the library is linked, but also when + * rcu_init constructor. Called when the library is linked, but also when * reader threads are calling rcu_register_thread(). * Should only be called by a single thread at a given time. This is ensured by - * holing the internal_urcu_lock() from rcu_register_thread() or by running at - * library load time, which should not be executed by multiple threads nor - * concurrently with rcu_register_thread() anyway. + * holing the rcu_registry_lock from rcu_register_thread() or by running + * at library load time, which should not be executed by multiple + * threads nor concurrently with rcu_register_thread() anyway. */ -void urcu_init(void) +void rcu_init(void) { struct sigaction act; int ret; @@ -450,27 +555,29 @@ void urcu_init(void) return; init_done = 1; - act.sa_sigaction = sigurcu_handler; + act.sa_sigaction = sigrcu_handler; act.sa_flags = SA_SIGINFO | SA_RESTART; sigemptyset(&act.sa_mask); - ret = sigaction(SIGURCU, &act, NULL); - if (ret) { - perror("Error in sigaction"); - exit(-1); - } + ret = sigaction(SIGRCU, &act, NULL); + if (ret) + urcu_die(errno); } -void urcu_exit(void) +void rcu_exit(void) { - struct sigaction act; - int ret; - - ret = sigaction(SIGURCU, NULL, &act); - if (ret) { - perror("Error in sigaction"); - exit(-1); - } - assert(act.sa_sigaction == sigurcu_handler); - free(registry); + /* + * Don't unregister the SIGRCU signal handler anymore, because + * call_rcu threads could still be using it shortly before the + * application exits. + * Assertion disabled because call_rcu threads are now rcu + * readers, and left running at exit. + * assert(cds_list_empty(®istry)); + */ } -#endif /* #ifndef URCU_MB */ + +#endif /* #ifdef RCU_SIGNAL */ + +DEFINE_RCU_FLAVOR(rcu_flavor); + +#include "urcu-call-rcu-impl.h" +#include "urcu-defer-impl.h"