projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: header comments coding style
[userspace-rcu.git]
/
urcu-bp.c
diff --git
a/urcu-bp.c
b/urcu-bp.c
index 912e9b2ea31ad7c42d46a8f9d31f88f6d46a4361..7c91e0a9ce8bb40b3ef688011cc0cc9cf933b536 100644
(file)
--- a/
urcu-bp.c
+++ b/
urcu-bp.c
@@
-40,6
+40,7
@@
#include "urcu/map/urcu-bp.h"
#include "urcu/static/urcu-bp.h"
#include "urcu-pointer.h"
#include "urcu/map/urcu-bp.h"
#include "urcu/static/urcu-bp.h"
#include "urcu-pointer.h"
+#include "urcu/tls-compat.h"
/* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
#undef _LGPL_SOURCE
/* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
#undef _LGPL_SOURCE
@@
-50,7
+51,14
@@
#define MAP_ANONYMOUS MAP_ANON
#endif
#define MAP_ANONYMOUS MAP_ANON
#endif
-#ifndef __linux__
+#ifdef __linux__
+static
+void *mremap_wrapper(void *old_address, size_t old_size,
+ size_t new_size, int flags)
+{
+ return mremap(old_address, old_size, new_size, flags);
+}
+#else
#define MREMAP_MAYMOVE 1
#define MREMAP_FIXED 2
#define MREMAP_MAYMOVE 1
#define MREMAP_FIXED 2
@@
-59,7
+67,9
@@
* mremap wrapper for non-Linux systems. Maps a RW, anonymous private mapping.
* This is not generic.
*/
* mremap wrapper for non-Linux systems. Maps a RW, anonymous private mapping.
* This is not generic.
*/
-void *mremap(void *old_address, size_t old_size, size_t new_size, int flags)
+static
+void *mremap_wrapper(void *old_address, size_t old_size,
+ size_t new_size, int flags)
{
void *new_address;
{
void *new_address;
@@
-94,7
+104,7
@@
static pthread_mutex_t rcu_gp_lock = PTHREAD_MUTEX_INITIALIZER;
#ifdef DEBUG_YIELD
unsigned int yield_active;
#ifdef DEBUG_YIELD
unsigned int yield_active;
-
unsigned int __thread rand_yield
;
+
DEFINE_URCU_TLS(unsigned int, rand_yield)
;
#endif
/*
#endif
/*
@@
-109,7
+119,7
@@
long rcu_gp_ctr = RCU_GP_COUNT;
* Pointer to registry elements. Written to only by each individual reader. Read
* by both the reader and the writers.
*/
* Pointer to registry elements. Written to only by each individual reader. Read
* by both the reader and the writers.
*/
-
struct rcu_reader __thread *rcu_reader
;
+
DEFINE_URCU_TLS(struct rcu_reader *, rcu_reader)
;
static CDS_LIST_HEAD(registry);
static CDS_LIST_HEAD(registry);
@@
-283,8
+293,8
@@
static void resize_arena(struct registry_arena *arena, size_t len)
MAP_ANONYMOUS | MAP_PRIVATE,
-1, 0);
else
MAP_ANONYMOUS | MAP_PRIVATE,
-1, 0);
else
- new_arena = mremap(arena->p, arena->len,
- len, MREMAP_MAYMOVE);
+ new_arena = mremap
_wrapper
(arena->p, arena->len,
+
len, MREMAP_MAYMOVE);
assert(new_arena != MAP_FAILED);
/*
assert(new_arena != MAP_FAILED);
/*
@@
-322,7
+332,7
@@
static void add_thread(void)
rcu_reader_reg->tid = pthread_self();
assert(rcu_reader_reg->ctr == 0);
cds_list_add(&rcu_reader_reg->node, ®istry);
rcu_reader_reg->tid = pthread_self();
assert(rcu_reader_reg->ctr == 0);
cds_list_add(&rcu_reader_reg->node, ®istry);
-
rcu_reader
= rcu_reader_reg;
+
URCU_TLS(rcu_reader)
= rcu_reader_reg;
}
/* Called with signals off and mutex locked */
}
/* Called with signals off and mutex locked */
@@
-363,7
+373,7
@@
void rcu_bp_register(void)
/*
* Check if a signal concurrently registered our thread since
* the check in rcu_read_lock(). */
/*
* Check if a signal concurrently registered our thread since
* the check in rcu_read_lock(). */
- if (
rcu_reader
)
+ if (
URCU_TLS(rcu_reader)
)
goto end;
mutex_lock(&rcu_gp_lock);
goto end;
mutex_lock(&rcu_gp_lock);
@@
-444,7
+454,7
@@
void *rcu_cmpxchg_pointer_sym_bp(void **p, void *old, void *_new)
return uatomic_cmpxchg(p, old, _new);
}
return uatomic_cmpxchg(p, old, _new);
}
-DEFINE_RCU_FLAVOR(
)
+DEFINE_RCU_FLAVOR(
rcu_flavor);
#include "urcu-call-rcu-impl.h"
#include "urcu-defer-impl.h"
#include "urcu-call-rcu-impl.h"
#include "urcu-defer-impl.h"
This page took
0.024733 seconds
and
4
git commands to generate.