X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=src%2Furcu-call-rcu-impl.h;h=4392bc6b87ad53d290847ab246ff824fc0f244ea;hp=f7844cc17f6dc49f774650cba20bbdc8ecf825b0;hb=014775106c60f02818ca755b331f887030bd440f;hpb=4477a87021ffbfbfdb2a2084d05a084171343d36 diff --git a/src/urcu-call-rcu-impl.h b/src/urcu-call-rcu-impl.h index f7844cc..4392bc6 100644 --- a/src/urcu-call-rcu-impl.h +++ b/src/urcu-call-rcu-impl.h @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -35,6 +34,7 @@ #include #include "compat-getcpu.h" +#include #include #include #include @@ -199,7 +199,7 @@ static void call_rcu_unlock(pthread_mutex_t *pmp) * Losing affinity can be caused by CPU hotunplug/hotplug, or by * cpuset(7). */ -#if HAVE_SCHED_SETAFFINITY +#ifdef HAVE_SCHED_SETAFFINITY static int set_thread_cpu_affinity(struct call_rcu_data *crdp) { @@ -215,11 +215,8 @@ int set_thread_cpu_affinity(struct call_rcu_data *crdp) CPU_ZERO(&mask); CPU_SET(crdp->cpu_affinity, &mask); -#if SCHED_SETAFFINITY_ARGS == 2 - ret = sched_setaffinity(0, &mask); -#else ret = sched_setaffinity(0, sizeof(mask), &mask); -#endif + /* * EINVAL is fine: can be caused by hotunplugged CPUs, or by * cpuset(7). This is why we should always retry if we detect @@ -233,7 +230,7 @@ int set_thread_cpu_affinity(struct call_rcu_data *crdp) } #else static -int set_thread_cpu_affinity(struct call_rcu_data *crdp) +int set_thread_cpu_affinity(struct call_rcu_data *crdp __attribute__((unused))) { return 0; } @@ -358,8 +355,8 @@ static void *call_rcu_thread(void *arg) cds_wfcq_init(&cbs_tmp_head, &cbs_tmp_tail); splice_ret = __cds_wfcq_splice_blocking(&cbs_tmp_head, &cbs_tmp_tail, &crdp->cbs_head, &crdp->cbs_tail); - assert(splice_ret != CDS_WFCQ_RET_WOULDBLOCK); - assert(splice_ret != CDS_WFCQ_RET_DEST_NON_EMPTY); + urcu_posix_assert(splice_ret != CDS_WFCQ_RET_WOULDBLOCK); + urcu_posix_assert(splice_ret != CDS_WFCQ_RET_DEST_NON_EMPTY); if (splice_ret != CDS_WFCQ_RET_SRC_EMPTY) { synchronize_rcu(); cbcount = 0; @@ -465,8 +462,6 @@ struct call_rcu_data *get_cpu_call_rcu_data(int cpu) return NULL; return rcu_dereference(pcpu_crdp[cpu]); } -__attribute__((alias(urcu_stringify(get_cpu_call_rcu_data)))) -struct call_rcu_data *alias_get_cpu_call_rcu_data(); /* * Return the tid corresponding to the call_rcu thread whose @@ -477,8 +472,6 @@ pthread_t get_call_rcu_thread(struct call_rcu_data *crdp) { return crdp->tid; } -__attribute__((alias(urcu_stringify(get_call_rcu_thread)))) -pthread_t alias_get_call_rcu_thread(); /* * Create a call_rcu_data structure (with thread) and return a pointer. @@ -493,8 +486,6 @@ static struct call_rcu_data *__create_call_rcu_data(unsigned long flags, return crdp; } -__attribute__((alias(urcu_stringify(create_call_rcu_data)))) -struct call_rcu_data *alias_create_call_rcu_data(); struct call_rcu_data *create_call_rcu_data(unsigned long flags, int cpu_affinity) { @@ -551,8 +542,6 @@ int set_cpu_call_rcu_data(int cpu, struct call_rcu_data *crdp) call_rcu_unlock(&call_rcu_mutex); return 0; } -__attribute__((alias(urcu_stringify(set_cpu_call_rcu_data)))) -int alias_set_cpu_call_rcu_data(); /* * Return a pointer to the default call_rcu_data structure, creating @@ -573,8 +562,6 @@ struct call_rcu_data *get_default_call_rcu_data(void) call_rcu_unlock(&call_rcu_mutex); return default_call_rcu_data; } -__attribute__((alias(urcu_stringify(get_default_call_rcu_data)))) -struct call_rcu_data *alias_get_default_call_rcu_data(); /* * Return the call_rcu_data structure that applies to the currently @@ -602,8 +589,6 @@ struct call_rcu_data *get_call_rcu_data(void) return get_default_call_rcu_data(); } -__attribute__((alias(urcu_stringify(get_call_rcu_data)))) -struct call_rcu_data *alias_get_call_rcu_data(); /* * Return a pointer to this task's call_rcu_data if there is one. @@ -613,8 +598,6 @@ struct call_rcu_data *get_thread_call_rcu_data(void) { return URCU_TLS(thread_call_rcu_data); } -__attribute__((alias(urcu_stringify(get_thread_call_rcu_data)))) -struct call_rcu_data *alias_get_thread_call_rcu_data(); /* * Set this task's call_rcu_data structure as specified, regardless @@ -631,8 +614,6 @@ void set_thread_call_rcu_data(struct call_rcu_data *crdp) { URCU_TLS(thread_call_rcu_data) = crdp; } -__attribute__((alias(urcu_stringify(set_thread_call_rcu_data)))) -void alias_set_thread_call_rcu_data(); /* * Create a separate call_rcu thread for each CPU. This does not @@ -684,8 +665,6 @@ int create_all_cpu_call_rcu_data(unsigned long flags) } return 0; } -__attribute__((alias(urcu_stringify(create_all_cpu_call_rcu_data)))) -int alias_create_all_cpu_call_rcu_data(); /* * Wake up the call_rcu thread corresponding to the specified @@ -733,7 +712,6 @@ void call_rcu(struct rcu_head *head, _call_rcu(head, func, crdp); _rcu_read_unlock(); } -__attribute__((alias(urcu_stringify(call_rcu)))) void alias_call_rcu(); /* * Free up the specified call_rcu_data structure, terminating the @@ -772,9 +750,13 @@ void call_rcu_data_free(struct call_rcu_data *crdp) while ((uatomic_read(&crdp->flags) & URCU_CALL_RCU_STOPPED) == 0) (void) poll(NULL, 0, 1); } + call_rcu_lock(&call_rcu_mutex); if (!cds_wfcq_empty(&crdp->cbs_head, &crdp->cbs_tail)) { - /* Create default call rcu data if need be */ + call_rcu_unlock(&call_rcu_mutex); + /* Create default call rcu data if need be. */ + /* CBs queued here will be handed to the default list. */ (void) get_default_call_rcu_data(); + call_rcu_lock(&call_rcu_mutex); __cds_wfcq_splice_blocking(&default_call_rcu_data->cbs_head, &default_call_rcu_data->cbs_tail, &crdp->cbs_head, &crdp->cbs_tail); @@ -783,14 +765,11 @@ void call_rcu_data_free(struct call_rcu_data *crdp) wake_call_rcu_thread(default_call_rcu_data); } - call_rcu_lock(&call_rcu_mutex); cds_list_del(&crdp->list); call_rcu_unlock(&call_rcu_mutex); free(crdp); } -__attribute__((alias(urcu_stringify(call_rcu_data_free)))) -void alias_call_rcu_data_free(); /* * Clean up all the per-CPU call_rcu threads. @@ -831,16 +810,6 @@ void free_all_cpu_call_rcu_data(void) } free(crdp); } -#ifdef RCU_QSBR -/* ABI6 has a non-namespaced free_all_cpu_call_rcu_data for qsbr */ -#undef free_all_cpu_call_rcu_data -__attribute__((alias("urcu_qsbr_free_all_cpu_call_rcu_data"))) -void free_all_cpu_call_rcu_data(); -#define free_all_cpu_call_rcu_data urcu_qsbr_free_all_cpu_call_rcu_data -#else -__attribute__((alias(urcu_stringify(free_all_cpu_call_rcu_data)))) -void alias_free_all_cpu_call_rcu_data(); -#endif static void free_completion(struct urcu_ref *ref) @@ -932,8 +901,6 @@ online: if (was_online) rcu_thread_online(); } -__attribute__((alias(urcu_stringify(rcu_barrier)))) -void alias_rcu_barrier(); /* * Acquire the call_rcu_mutex in order to ensure that the child sees @@ -962,8 +929,6 @@ void call_rcu_before_fork(void) (void) poll(NULL, 0, 1); } } -__attribute__((alias(urcu_stringify(call_rcu_before_fork)))) -void alias_call_rcu_before_fork(); /* * Clean up call_rcu data structures in the parent of a successful fork() @@ -986,8 +951,6 @@ void call_rcu_after_fork_parent(void) atfork->after_fork_parent(atfork->priv); call_rcu_unlock(&call_rcu_mutex); } -__attribute__((alias(urcu_stringify(call_rcu_after_fork_parent)))) -void alias_call_rcu_after_fork_parent(); /* * Clean up call_rcu data structures in the child of a successful fork() @@ -1035,8 +998,6 @@ void call_rcu_after_fork_child(void) call_rcu_data_free(crdp); } } -__attribute__((alias(urcu_stringify(call_rcu_after_fork_child)))) -void alias_call_rcu_after_fork_child(); void urcu_register_rculfhash_atfork(struct urcu_atfork *atfork) { @@ -1047,10 +1008,8 @@ void urcu_register_rculfhash_atfork(struct urcu_atfork *atfork) end: call_rcu_unlock(&call_rcu_mutex); } -__attribute__((alias(urcu_stringify(urcu_register_rculfhash_atfork)))) -void alias_urcu_register_rculfhash_atfork(); -void urcu_unregister_rculfhash_atfork(struct urcu_atfork *atfork) +void urcu_unregister_rculfhash_atfork(struct urcu_atfork *atfork __attribute__((unused))) { call_rcu_lock(&call_rcu_mutex); if (--registered_rculfhash_atfork_refcount) @@ -1059,5 +1018,3 @@ void urcu_unregister_rculfhash_atfork(struct urcu_atfork *atfork) end: call_rcu_unlock(&call_rcu_mutex); } -__attribute__((alias(urcu_stringify(urcu_unregister_rculfhash_atfork)))) -void alias_urcu_unregister_rculfhash_atfork();