projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a wrong format
[userspace-rcu.git]
/
src
/
urcu-bp.c
diff --git
a/src/urcu-bp.c
b/src/urcu-bp.c
index 671becb0e14644c6eeb37270ab154f1b95877549..a097d7f00312a1372123f5c61a732f0e8270354d 100644
(file)
--- a/
src/urcu-bp.c
+++ b/
src/urcu-bp.c
@@
-28,7
+28,6
@@
#include <stdio.h>
#include <pthread.h>
#include <signal.h>
#include <stdio.h>
#include <pthread.h>
#include <signal.h>
-#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
@@
-37,6
+36,7
@@
#include <stdbool.h>
#include <sys/mman.h>
#include <stdbool.h>
#include <sys/mman.h>
+#include <urcu/assert.h>
#include <urcu/config.h>
#include <urcu/arch.h>
#include <urcu/wfcqueue.h>
#include <urcu/config.h>
#include <urcu/arch.h>
#include <urcu/wfcqueue.h>
@@
-80,7
+80,7
@@
void *mremap_wrapper(void *old_address __attribute__((unused)),
size_t new_size __attribute__((unused)),
int flags)
{
size_t new_size __attribute__((unused)),
int flags)
{
- assert(!(flags & MREMAP_MAYMOVE));
+
urcu_posix_
assert(!(flags & MREMAP_MAYMOVE));
return MAP_FAILED;
}
return MAP_FAILED;
}
@@
-148,14
+148,12
@@
static int initialized;
static pthread_key_t urcu_bp_key;
struct urcu_bp_gp urcu_bp_gp = { .ctr = URCU_BP_GP_COUNT };
static pthread_key_t urcu_bp_key;
struct urcu_bp_gp urcu_bp_gp = { .ctr = URCU_BP_GP_COUNT };
-URCU_ATTR_ALIAS("urcu_bp_gp") extern struct urcu_bp_gp rcu_gp_bp;
/*
* Pointer to registry elements. Written to only by each individual reader. Read
* by both the reader and the writers.
*/
DEFINE_URCU_TLS(struct urcu_bp_reader *, urcu_bp_reader);
/*
* Pointer to registry elements. Written to only by each individual reader. Read
* by both the reader and the writers.
*/
DEFINE_URCU_TLS(struct urcu_bp_reader *, urcu_bp_reader);
-DEFINE_URCU_TLS_ALIAS(struct urcu_bp_reader *, urcu_bp_reader, rcu_reader_bp);
static CDS_LIST_HEAD(registry);
static CDS_LIST_HEAD(registry);
@@
-279,9
+277,9
@@
void urcu_bp_synchronize_rcu(void)
int ret;
ret = sigfillset(&newmask);
int ret;
ret = sigfillset(&newmask);
- assert(!ret);
+
urcu_posix_
assert(!ret);
ret = pthread_sigmask(SIG_BLOCK, &newmask, &oldmask);
ret = pthread_sigmask(SIG_BLOCK, &newmask, &oldmask);
- assert(!ret);
+
urcu_posix_
assert(!ret);
mutex_lock(&rcu_gp_lock);
mutex_lock(&rcu_gp_lock);
@@
-298,7
+296,7
@@
void urcu_bp_synchronize_rcu(void)
/*
* Wait for readers to observe original parity or be quiescent.
* wait_for_readers() can release and grab again rcu_registry_lock
/*
* Wait for readers to observe original parity or be quiescent.
* wait_for_readers() can release and grab again rcu_registry_lock
- * interally.
+ * inter
n
ally.
*/
wait_for_readers(®istry, &cur_snap_readers, &qsreaders);
*/
wait_for_readers(®istry, &cur_snap_readers, &qsreaders);
@@
-329,7
+327,7
@@
void urcu_bp_synchronize_rcu(void)
/*
* Wait for readers to observe new parity or be quiescent.
* wait_for_readers() can release and grab again rcu_registry_lock
/*
* Wait for readers to observe new parity or be quiescent.
* wait_for_readers() can release and grab again rcu_registry_lock
- * interally.
+ * inter
n
ally.
*/
wait_for_readers(&cur_snap_readers, NULL, &qsreaders);
*/
wait_for_readers(&cur_snap_readers, NULL, &qsreaders);
@@
-347,9
+345,8
@@
out:
mutex_unlock(&rcu_registry_lock);
mutex_unlock(&rcu_gp_lock);
ret = pthread_sigmask(SIG_SETMASK, &oldmask, NULL);
mutex_unlock(&rcu_registry_lock);
mutex_unlock(&rcu_gp_lock);
ret = pthread_sigmask(SIG_SETMASK, &oldmask, NULL);
- assert(!ret);
+
urcu_posix_
assert(!ret);
}
}
-URCU_ATTR_ALIAS("urcu_bp_synchronize_rcu") void synchronize_rcu_bp();
/*
* library wrappers to be used by non-LGPL compatible source code.
/*
* library wrappers to be used by non-LGPL compatible source code.
@@
-359,19
+356,16
@@
void urcu_bp_read_lock(void)
{
_urcu_bp_read_lock();
}
{
_urcu_bp_read_lock();
}
-URCU_ATTR_ALIAS("urcu_bp_read_lock") void rcu_read_lock_bp();
void urcu_bp_read_unlock(void)
{
_urcu_bp_read_unlock();
}
void urcu_bp_read_unlock(void)
{
_urcu_bp_read_unlock();
}
-URCU_ATTR_ALIAS("urcu_bp_read_unlock") void rcu_read_unlock_bp();
int urcu_bp_read_ongoing(void)
{
return _urcu_bp_read_ongoing();
}
int urcu_bp_read_ongoing(void)
{
return _urcu_bp_read_ongoing();
}
-URCU_ATTR_ALIAS("urcu_bp_read_ongoing") int rcu_read_ongoing_bp();
/*
* Only grow for now. If empty, allocate a ARENA_INIT_ALLOC sized chunk.
/*
* Only grow for now. If empty, allocate a ARENA_INIT_ALLOC sized chunk.
@@
-389,7
+383,7
@@
void expand_arena(struct registry_arena *arena)
/* No chunk. */
if (cds_list_empty(&arena->chunk_list)) {
/* No chunk. */
if (cds_list_empty(&arena->chunk_list)) {
- assert(ARENA_INIT_ALLOC >=
+
urcu_posix_
assert(ARENA_INIT_ALLOC >=
sizeof(struct registry_chunk)
+ sizeof(struct rcu_reader));
new_chunk_len = ARENA_INIT_ALLOC;
sizeof(struct registry_chunk)
+ sizeof(struct rcu_reader));
new_chunk_len = ARENA_INIT_ALLOC;
@@
-419,7
+413,7
@@
void expand_arena(struct registry_arena *arena)
new_chunk_len, 0);
if (new_chunk != MAP_FAILED) {
/* Should not have moved. */
new_chunk_len, 0);
if (new_chunk != MAP_FAILED) {
/* Should not have moved. */
- assert(new_chunk == last_chunk);
+
urcu_posix_
assert(new_chunk == last_chunk);
memset((char *) last_chunk + old_chunk_len, 0,
new_chunk_len - old_chunk_len);
last_chunk->data_len =
memset((char *) last_chunk + old_chunk_len, 0,
new_chunk_len - old_chunk_len);
last_chunk->data_len =
@@
-490,7
+484,7
@@
void add_thread(void)
/* Add to registry */
rcu_reader_reg->tid = pthread_self();
/* Add to registry */
rcu_reader_reg->tid = pthread_self();
- assert(rcu_reader_reg->ctr == 0);
+
urcu_posix_
assert(rcu_reader_reg->ctr == 0);
cds_list_add(&rcu_reader_reg->node, ®istry);
/*
* Reader threads are pointing to the reader registry. This is
cds_list_add(&rcu_reader_reg->node, ®istry);
/*
* Reader threads are pointing to the reader registry. This is
@@
-567,7
+561,6
@@
end:
if (ret)
abort();
}
if (ret)
abort();
}
-URCU_ATTR_ALIAS("urcu_bp_register") void rcu_bp_register();
void urcu_bp_register_thread(void)
{
void urcu_bp_register_thread(void)
{
@@
-692,14
+685,13
@@
void urcu_bp_before_fork(void)
int ret;
ret = sigfillset(&newmask);
int ret;
ret = sigfillset(&newmask);
- assert(!ret);
+
urcu_posix_
assert(!ret);
ret = pthread_sigmask(SIG_BLOCK, &newmask, &oldmask);
ret = pthread_sigmask(SIG_BLOCK, &newmask, &oldmask);
- assert(!ret);
+
urcu_posix_
assert(!ret);
mutex_lock(&rcu_gp_lock);
mutex_lock(&rcu_registry_lock);
saved_fork_signal_mask = oldmask;
}
mutex_lock(&rcu_gp_lock);
mutex_lock(&rcu_registry_lock);
saved_fork_signal_mask = oldmask;
}
-URCU_ATTR_ALIAS("urcu_bp_before_fork") void rcu_bp_before_fork();
void urcu_bp_after_fork_parent(void)
{
void urcu_bp_after_fork_parent(void)
{
@@
-710,10
+702,8
@@
void urcu_bp_after_fork_parent(void)
mutex_unlock(&rcu_registry_lock);
mutex_unlock(&rcu_gp_lock);
ret = pthread_sigmask(SIG_SETMASK, &oldmask, NULL);
mutex_unlock(&rcu_registry_lock);
mutex_unlock(&rcu_gp_lock);
ret = pthread_sigmask(SIG_SETMASK, &oldmask, NULL);
- assert(!ret);
+
urcu_posix_
assert(!ret);
}
}
-URCU_ATTR_ALIAS("urcu_bp_after_fork_parent")
-void rcu_bp_after_fork_parent(void);
/*
* Prune all entries from registry except our own thread. Fits the Linux
/*
* Prune all entries from registry except our own thread. Fits the Linux
@@
-748,17
+738,13
@@
void urcu_bp_after_fork_child(void)
mutex_unlock(&rcu_registry_lock);
mutex_unlock(&rcu_gp_lock);
ret = pthread_sigmask(SIG_SETMASK, &oldmask, NULL);
mutex_unlock(&rcu_registry_lock);
mutex_unlock(&rcu_gp_lock);
ret = pthread_sigmask(SIG_SETMASK, &oldmask, NULL);
- assert(!ret);
+
urcu_posix_
assert(!ret);
}
}
-URCU_ATTR_ALIAS("urcu_bp_after_fork_child")
-void rcu_bp_after_fork_child(void);
void *urcu_bp_dereference_sym(void *p)
{
return _rcu_dereference(p);
}
void *urcu_bp_dereference_sym(void *p)
{
return _rcu_dereference(p);
}
-URCU_ATTR_ALIAS("urcu_bp_dereference_sym")
-void *rcu_dereference_sym_bp();
void *urcu_bp_set_pointer_sym(void **p, void *v)
{
void *urcu_bp_set_pointer_sym(void **p, void *v)
{
@@
-766,27
+752,20
@@
void *urcu_bp_set_pointer_sym(void **p, void *v)
uatomic_set(p, v);
return v;
}
uatomic_set(p, v);
return v;
}
-URCU_ATTR_ALIAS("urcu_bp_set_pointer_sym")
-void *rcu_set_pointer_sym_bp();
void *urcu_bp_xchg_pointer_sym(void **p, void *v)
{
cmm_wmb();
return uatomic_xchg(p, v);
}
void *urcu_bp_xchg_pointer_sym(void **p, void *v)
{
cmm_wmb();
return uatomic_xchg(p, v);
}
-URCU_ATTR_ALIAS("urcu_bp_xchg_pointer_sym")
-void *rcu_xchg_pointer_sym_bp();
void *urcu_bp_cmpxchg_pointer_sym(void **p, void *old, void *_new)
{
cmm_wmb();
return uatomic_cmpxchg(p, old, _new);
}
void *urcu_bp_cmpxchg_pointer_sym(void **p, void *old, void *_new)
{
cmm_wmb();
return uatomic_cmpxchg(p, old, _new);
}
-URCU_ATTR_ALIAS("urcu_bp_cmpxchg_pointer_sym")
-void *rcu_cmpxchg_pointer_sym_bp();
DEFINE_RCU_FLAVOR(rcu_flavor);
DEFINE_RCU_FLAVOR(rcu_flavor);
-DEFINE_RCU_FLAVOR_ALIAS(rcu_flavor, alias_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.028444 seconds
and
4
git commands to generate.