X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=urcu-bp.c;h=603cdf0f1b72f03701098ef76a5937d66bf047df;hb=refs%2Fheads%2Fstable-0.6;hp=80eaefe7ea78a35cd20d138bcb9ac6ebd08c31b4;hpb=71c811bf8db75c9502b295edb1e190f978682b65;p=urcu.git diff --git a/urcu-bp.c b/urcu-bp.c index 80eaefe..603cdf0 100644 --- a/urcu-bp.c +++ b/urcu-bp.c @@ -39,6 +39,7 @@ #include "urcu/wfqueue.h" #include "urcu/map/urcu-bp.h" #include "urcu/static/urcu-bp.h" +#include "urcu-pointer.h" /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */ #undef _LGPL_SOURCE @@ -209,9 +210,9 @@ void synchronize_rcu(void) sigset_t newmask, oldmask; int ret; - ret = sigemptyset(&newmask); + ret = sigfillset(&newmask); assert(!ret); - ret = pthread_sigmask(SIG_SETMASK, &newmask, &oldmask); + ret = pthread_sigmask(SIG_BLOCK, &newmask, &oldmask); assert(!ret); mutex_lock(&rcu_gp_lock); @@ -354,9 +355,9 @@ void rcu_bp_register(void) sigset_t newmask, oldmask; int ret; - ret = sigemptyset(&newmask); + ret = sigfillset(&newmask); assert(!ret); - ret = pthread_sigmask(SIG_SETMASK, &newmask, &oldmask); + ret = pthread_sigmask(SIG_BLOCK, &newmask, &oldmask); assert(!ret); /* @@ -373,9 +374,10 @@ end: assert(!ret); } -void rcu_bp_exit() +void rcu_bp_exit(void) { - munmap(registry_arena.p, registry_arena.len); + if (registry_arena.p) + munmap(registry_arena.p, registry_arena.len); } /* @@ -388,9 +390,9 @@ void rcu_bp_before_fork(void) sigset_t newmask, oldmask; int ret; - ret = sigemptyset(&newmask); + ret = sigfillset(&newmask); assert(!ret); - ret = pthread_sigmask(SIG_SETMASK, &newmask, &oldmask); + ret = pthread_sigmask(SIG_BLOCK, &newmask, &oldmask); assert(!ret); mutex_lock(&rcu_gp_lock); saved_fork_signal_mask = oldmask; @@ -419,5 +421,28 @@ void rcu_bp_after_fork_child(void) assert(!ret); } +void *rcu_dereference_sym_bp(void *p) +{ + return _rcu_dereference(p); +} + +void *rcu_set_pointer_sym_bp(void **p, void *v) +{ + cmm_wmb(); + return uatomic_set(p, v); +} + +void *rcu_xchg_pointer_sym_bp(void **p, void *v) +{ + cmm_wmb(); + return uatomic_xchg(p, v); +} + +void *rcu_cmpxchg_pointer_sym_bp(void **p, void *old, void *_new) +{ + cmm_wmb(); + return uatomic_cmpxchg(p, old, _new); +} + #include "urcu-call-rcu-impl.h" #include "urcu-defer-impl.h"