projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rcu torture and api.h: remove duplicated atomic primitives
[urcu.git]
/
urcu.c
diff --git
a/urcu.c
b/urcu.c
index c210a1341ade8a189752417249bb47bca73a03aa..32f74880492ce40527c8b5b40560249eac485b90 100644
(file)
--- a/
urcu.c
+++ b/
urcu.c
@@
-36,7
+36,9
@@
/* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
#include "urcu.h"
/* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
#include "urcu.h"
-#ifndef CONFIG_URCU_AVOID_SIGNALS
+#ifndef URCU_MB
+static int init_done;
+
void __attribute__((constructor)) urcu_init(void);
void __attribute__((destructor)) urcu_exit(void);
#else
void __attribute__((constructor)) urcu_init(void);
void __attribute__((destructor)) urcu_exit(void);
#else
@@
-45,14
+47,12
@@
void urcu_init(void)
}
#endif
}
#endif
-int init_done;
-
-pthread_mutex_t urcu_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t urcu_mutex = PTHREAD_MUTEX_INITIALIZER;
/*
* Global grace period counter.
* Contains the current RCU_GP_CTR_BIT.
/*
* Global grace period counter.
* Contains the current RCU_GP_CTR_BIT.
- * Also has a RCU_GP_C
TR_BI
T of 1, to accelerate the reader fast path.
+ * Also has a RCU_GP_C
OUN
T of 1, to accelerate the reader fast path.
* Written to only by writer with mutex taken. Read by both writer and readers.
*/
long urcu_gp_ctr = RCU_GP_COUNT;
* Written to only by writer with mutex taken. Read by both writer and readers.
*/
long urcu_gp_ctr = RCU_GP_COUNT;
@@
-81,7
+81,7
@@
static struct reader_registry *registry;
static char __thread need_mb;
static int num_readers, alloc_readers;
static char __thread need_mb;
static int num_readers, alloc_readers;
-void internal_urcu_lock(void)
+
static
void internal_urcu_lock(void)
{
int ret;
{
int ret;
@@
-108,7
+108,7
@@
void internal_urcu_lock(void)
#endif /* #else #ifndef DISTRUST_SIGNALS_EXTREME */
}
#endif /* #else #ifndef DISTRUST_SIGNALS_EXTREME */
}
-void internal_urcu_unlock(void)
+
static
void internal_urcu_unlock(void)
{
int ret;
{
int ret;
@@
-127,7
+127,7
@@
static void switch_next_urcu_qparity(void)
STORE_SHARED(urcu_gp_ctr, urcu_gp_ctr ^ RCU_GP_CTR_BIT);
}
STORE_SHARED(urcu_gp_ctr, urcu_gp_ctr ^ RCU_GP_CTR_BIT);
}
-#ifdef
CONFIG_URCU_AVOID_SIGNALS
+#ifdef
URCU_MB
#ifdef HAS_INCOHERENT_CACHES
static void force_mb_single_thread(struct reader_registry *index)
{
#ifdef HAS_INCOHERENT_CACHES
static void force_mb_single_thread(struct reader_registry *index)
{
@@
-139,7
+139,7
@@
static void force_mb_all_threads(void)
{
smp_mb();
}
{
smp_mb();
}
-#else /* #ifdef
CONFIG_URCU_AVOID_SIGNALS
*/
+#else /* #ifdef
URCU_MB
*/
#ifdef HAS_INCOHERENT_CACHES
static void force_mb_single_thread(struct reader_registry *index)
{
#ifdef HAS_INCOHERENT_CACHES
static void force_mb_single_thread(struct reader_registry *index)
{
@@
-206,7
+206,7
@@
static void force_mb_all_threads(void)
}
smp_mb(); /* read ->need_mb before ending the barrier */
}
}
smp_mb(); /* read ->need_mb before ending the barrier */
}
-#endif /* #else #ifdef
CONFIG_URCU_AVOID_SIGNALS
*/
+#endif /* #else #ifdef
URCU_MB
*/
void wait_for_quiescent_state(void)
{
void wait_for_quiescent_state(void)
{
@@
-347,6
+347,12
@@
void *rcu_xchg_pointer_sym(void **p, void *v)
return xchg(p, v);
}
return xchg(p, v);
}
+void *rcu_cmpxchg_pointer_sym(void **p, void *old, void *_new)
+{
+ wmb();
+ return cmpxchg(p, old, _new);
+}
+
void *rcu_publish_content_sym(void **p, void *v)
{
void *oldptr;
void *rcu_publish_content_sym(void **p, void *v)
{
void *oldptr;
@@
-420,7
+426,7
@@
void rcu_unregister_thread(void)
internal_urcu_unlock();
}
internal_urcu_unlock();
}
-#ifndef
CONFIG_URCU_AVOID_SIGNALS
+#ifndef
URCU_MB
static void sigurcu_handler(int signo, siginfo_t *siginfo, void *context)
{
/*
static void sigurcu_handler(int signo, siginfo_t *siginfo, void *context)
{
/*
@@
-473,4
+479,4
@@
void urcu_exit(void)
assert(act.sa_sigaction == sigurcu_handler);
free(registry);
}
assert(act.sa_sigaction == sigurcu_handler);
free(registry);
}
-#endif /* #ifndef
CONFIG_URCU_AVOID_SIGNALS
*/
+#endif /* #ifndef
URCU_MB
*/
This page took
0.054152 seconds
and
4
git commands to generate.