X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=src%2Furcu-call-rcu-impl.h;h=9f2ed7dd709263f3eaa8418d7562a7ec91c993b6;hp=bfa53f8e09f920a833559ba7b334a04bf3cfcf47;hb=a142df4e35dcf835439bf6714e49e95a2a68f7a6;hpb=6893800a4d1cc14dff0395ddcd660a5138db183d

diff --git a/src/urcu-call-rcu-impl.h b/src/urcu-call-rcu-impl.h
index bfa53f8..9f2ed7d 100644
--- a/src/urcu-call-rcu-impl.h
+++ b/src/urcu-call-rcu-impl.h
@@ -35,14 +35,15 @@
 #include <sched.h>
 
 #include "compat-getcpu.h"
-#include "urcu/wfcqueue.h"
-#include "urcu-call-rcu.h"
-#include "urcu-pointer.h"
-#include "urcu/list.h"
-#include "urcu/futex.h"
-#include "urcu/tls-compat.h"
-#include "urcu/ref.h"
+#include <urcu/wfcqueue.h>
+#include <urcu/call-rcu.h>
+#include <urcu/pointer.h>
+#include <urcu/list.h>
+#include <urcu/futex.h>
+#include <urcu/tls-compat.h>
+#include <urcu/ref.h>
 #include "urcu-die.h"
+#include "urcu-utils.h"
 
 #define SET_AFFINITY_CHECK_PERIOD		(1U << 8)	/* 256 */
 #define SET_AFFINITY_CHECK_PERIOD_MASK		(SET_AFFINITY_CHECK_PERIOD - 1)
@@ -99,6 +100,9 @@ static pthread_mutex_t call_rcu_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 static struct call_rcu_data *default_call_rcu_data;
 
+static struct urcu_atfork *registered_rculfhash_atfork;
+static unsigned long registered_rculfhash_atfork_refcount;
+
 /*
  * If the sched_getcpu() and sysconf(_SC_NPROCESSORS_CONF) calls are
  * available, then we can have call_rcu threads assigned to individual
@@ -195,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)
 {
@@ -211,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
@@ -229,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;
 }
@@ -461,6 +462,8 @@ struct call_rcu_data *get_cpu_call_rcu_data(int cpu)
 		return NULL;
 	return rcu_dereference(pcpu_crdp[cpu]);
 }
+URCU_ATTR_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
@@ -471,6 +474,8 @@ pthread_t get_call_rcu_thread(struct call_rcu_data *crdp)
 {
 	return crdp->tid;
 }
+URCU_ATTR_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.
@@ -485,6 +490,8 @@ static struct call_rcu_data *__create_call_rcu_data(unsigned long flags,
 	return crdp;
 }
 
+URCU_ATTR_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)
 {
@@ -541,6 +548,8 @@ int set_cpu_call_rcu_data(int cpu, struct call_rcu_data *crdp)
 	call_rcu_unlock(&call_rcu_mutex);
 	return 0;
 }
+URCU_ATTR_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
@@ -561,6 +570,8 @@ struct call_rcu_data *get_default_call_rcu_data(void)
 	call_rcu_unlock(&call_rcu_mutex);
 	return default_call_rcu_data;
 }
+URCU_ATTR_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
@@ -588,6 +599,8 @@ struct call_rcu_data *get_call_rcu_data(void)
 
 	return get_default_call_rcu_data();
 }
+URCU_ATTR_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.
@@ -597,6 +610,8 @@ struct call_rcu_data *get_thread_call_rcu_data(void)
 {
 	return URCU_TLS(thread_call_rcu_data);
 }
+URCU_ATTR_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
@@ -613,6 +628,8 @@ void set_thread_call_rcu_data(struct call_rcu_data *crdp)
 {
 	URCU_TLS(thread_call_rcu_data) = crdp;
 }
+URCU_ATTR_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
@@ -664,6 +681,8 @@ int create_all_cpu_call_rcu_data(unsigned long flags)
 	}
 	return 0;
 }
+URCU_ATTR_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
@@ -711,6 +730,7 @@ void call_rcu(struct rcu_head *head,
 	_call_rcu(head, func, crdp);
 	_rcu_read_unlock();
 }
+URCU_ATTR_ALIAS(urcu_stringify(call_rcu)) void alias_call_rcu();
 
 /*
  * Free up the specified call_rcu_data structure, terminating the
@@ -749,9 +769,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);
@@ -760,12 +784,13 @@ 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);
 }
+URCU_ATTR_ALIAS(urcu_stringify(call_rcu_data_free))
+void alias_call_rcu_data_free();
 
 /*
  * Clean up all the per-CPU call_rcu threads.
@@ -806,6 +831,16 @@ 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
+URCU_ATTR_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
+URCU_ATTR_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)
@@ -897,6 +932,8 @@ online:
 	if (was_online)
 		rcu_thread_online();
 }
+URCU_ATTR_ALIAS(urcu_stringify(rcu_barrier))
+void alias_rcu_barrier();
 
 /*
  * Acquire the call_rcu_mutex in order to ensure that the child sees
@@ -907,9 +944,14 @@ online:
 void call_rcu_before_fork(void)
 {
 	struct call_rcu_data *crdp;
+	struct urcu_atfork *atfork;
 
 	call_rcu_lock(&call_rcu_mutex);
 
+	atfork = registered_rculfhash_atfork;
+	if (atfork)
+		atfork->before_fork(atfork->priv);
+
 	cds_list_for_each_entry(crdp, &call_rcu_data_list, list) {
 		uatomic_or(&crdp->flags, URCU_CALL_RCU_PAUSE);
 		cmm_smp_mb__after_uatomic_or();
@@ -920,6 +962,8 @@ void call_rcu_before_fork(void)
 			(void) poll(NULL, 0, 1);
 	}
 }
+URCU_ATTR_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()
@@ -929,6 +973,7 @@ void call_rcu_before_fork(void)
 void call_rcu_after_fork_parent(void)
 {
 	struct call_rcu_data *crdp;
+	struct urcu_atfork *atfork;
 
 	cds_list_for_each_entry(crdp, &call_rcu_data_list, list)
 		uatomic_and(&crdp->flags, ~URCU_CALL_RCU_PAUSE);
@@ -936,8 +981,13 @@ void call_rcu_after_fork_parent(void)
 		while ((uatomic_read(&crdp->flags) & URCU_CALL_RCU_PAUSED) != 0)
 			(void) poll(NULL, 0, 1);
 	}
+	atfork = registered_rculfhash_atfork;
+	if (atfork)
+		atfork->after_fork_parent(atfork->priv);
 	call_rcu_unlock(&call_rcu_mutex);
 }
+URCU_ATTR_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()
@@ -947,10 +997,15 @@ void call_rcu_after_fork_parent(void)
 void call_rcu_after_fork_child(void)
 {
 	struct call_rcu_data *crdp, *next;
+	struct urcu_atfork *atfork;
 
 	/* Release the mutex. */
 	call_rcu_unlock(&call_rcu_mutex);
 
+	atfork = registered_rculfhash_atfork;
+	if (atfork)
+		atfork->after_fork_child(atfork->priv);
+
 	/* Do nothing when call_rcu() has not been used */
 	if (cds_list_empty(&call_rcu_data_list))
 		return;
@@ -980,3 +1035,29 @@ void call_rcu_after_fork_child(void)
 		call_rcu_data_free(crdp);
 	}
 }
+URCU_ATTR_ALIAS(urcu_stringify(call_rcu_after_fork_child))
+void alias_call_rcu_after_fork_child();
+
+void urcu_register_rculfhash_atfork(struct urcu_atfork *atfork)
+{
+	call_rcu_lock(&call_rcu_mutex);
+	if (registered_rculfhash_atfork_refcount++)
+		goto end;
+	registered_rculfhash_atfork = atfork;
+end:
+	call_rcu_unlock(&call_rcu_mutex);
+}
+URCU_ATTR_ALIAS(urcu_stringify(urcu_register_rculfhash_atfork))
+void alias_urcu_register_rculfhash_atfork();
+
+void urcu_unregister_rculfhash_atfork(struct urcu_atfork *atfork __attribute__((unused)))
+{
+	call_rcu_lock(&call_rcu_mutex);
+	if (--registered_rculfhash_atfork_refcount)
+		goto end;
+	registered_rculfhash_atfork = NULL;
+end:
+	call_rcu_unlock(&call_rcu_mutex);
+}
+URCU_ATTR_ALIAS(urcu_stringify(urcu_unregister_rculfhash_atfork))
+void alias_urcu_unregister_rculfhash_atfork();