projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
"make check" runs the test suite
[urcu.git]
/
urcu-static.h
diff --git
a/urcu-static.h
b/urcu-static.h
index f2c452a64edd4c2aa781e5dd867276f8e2f46525..857d30cd729ca7b47accc94e0654807a299719a0 100644
(file)
--- a/
urcu-static.h
+++ b/
urcu-static.h
@@
-59,7
+59,7
@@
extern "C" {
# define MEMBARRIER_EXPEDITED (1 << 0)
# define MEMBARRIER_DELAYED (1 << 1)
# define MEMBARRIER_QUERY (1 << 16)
# define MEMBARRIER_EXPEDITED (1 << 0)
# define MEMBARRIER_DELAYED (1 << 1)
# define MEMBARRIER_QUERY (1 << 16)
-# define membarrier(...) syscall(
__NR
_membarrier, __VA_ARGS__)
+# define membarrier(...) syscall(
SYS
_membarrier, __VA_ARGS__)
#else
# undef RCU_MEMBARRIER
# define RCU_MB
#else
# undef RCU_MEMBARRIER
# define RCU_MB
@@
-207,7
+207,7
@@
static inline void smp_mb_slave(int group)
*/
#define RCU_GP_COUNT (1UL << 0)
/* Use the amount of bits equal to half of the architecture long size */
*/
#define RCU_GP_COUNT (1UL << 0)
/* Use the amount of bits equal to half of the architecture long size */
-#define RCU_GP_CTR_PHASE (1UL << (sizeof(long) << 2))
+#define RCU_GP_CTR_PHASE (1UL << (sizeof(
unsigned
long) << 2))
#define RCU_GP_CTR_NEST_MASK (RCU_GP_CTR_PHASE - 1)
/*
#define RCU_GP_CTR_NEST_MASK (RCU_GP_CTR_PHASE - 1)
/*
@@
-215,14
+215,14
@@
static inline void smp_mb_slave(int group)
* Using a int rather than a char to eliminate false register dependencies
* causing stalls on some architectures.
*/
* Using a int rather than a char to eliminate false register dependencies
* causing stalls on some architectures.
*/
-extern long rcu_gp_ctr;
+extern
unsigned
long rcu_gp_ctr;
struct rcu_reader {
/* Data used by both reader and synchronize_rcu() */
struct rcu_reader {
/* Data used by both reader and synchronize_rcu() */
- long ctr;
+
unsigned
long ctr;
char need_mb;
/* Data used for registry */
char need_mb;
/* Data used for registry */
- struct list_head
head
__attribute__((aligned(CACHE_LINE_SIZE)));
+ struct list_head
node
__attribute__((aligned(CACHE_LINE_SIZE)));
pthread_t tid;
};
pthread_t tid;
};
@@
-242,24
+242,22
@@
static inline void wake_up_gp(void)
}
}
}
}
-static inline int rcu_
old_gp_ongoing(long *value
)
+static inline int rcu_
gp_ongoing(unsigned long *ctr
)
{
{
- long v;
+
unsigned
long v;
- if (value == NULL)
- return 0;
/*
* Make sure both tests below are done on the same version of *value
* to insure consistency.
*/
/*
* Make sure both tests below are done on the same version of *value
* to insure consistency.
*/
- v = LOAD_SHARED(*
value
);
+ v = LOAD_SHARED(*
ctr
);
return (v & RCU_GP_CTR_NEST_MASK) &&
((v ^ rcu_gp_ctr) & RCU_GP_CTR_PHASE);
}
static inline void _rcu_read_lock(void)
{
return (v & RCU_GP_CTR_NEST_MASK) &&
((v ^ rcu_gp_ctr) & RCU_GP_CTR_PHASE);
}
static inline void _rcu_read_lock(void)
{
- long tmp;
+
unsigned
long tmp;
tmp = rcu_reader.ctr;
/*
tmp = rcu_reader.ctr;
/*
@@
-280,7
+278,7
@@
static inline void _rcu_read_lock(void)
static inline void _rcu_read_unlock(void)
{
static inline void _rcu_read_unlock(void)
{
- long tmp;
+
unsigned
long tmp;
tmp = rcu_reader.ctr;
/*
tmp = rcu_reader.ctr;
/*
This page took
0.024099 seconds
and
4
git commands to generate.