projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wfcqueue: combine C++ API cds_wfcq_head_cast with overloading
[userspace-rcu.git]
/
src
/
urcu-bp.c
diff --git
a/src/urcu-bp.c
b/src/urcu-bp.c
index 0d6ff4b0071965a6897b5904c86ce1851ecb1e6b..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;
}
@@
-277,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);
@@
-296,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);
@@
-327,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);
@@
-345,7
+345,7
@@
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);
}
/*
}
/*
@@
-383,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;
@@
-413,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 =
@@
-484,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
@@
-685,9
+685,9
@@
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;
@@
-702,7
+702,7
@@
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);
}
/*
}
/*
@@
-738,7
+738,7
@@
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);
}
void *urcu_bp_dereference_sym(void *p)
}
void *urcu_bp_dereference_sym(void *p)
This page took
0.028035 seconds
and
4
git commands to generate.