X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Furcu-call-rcu-impl.h;h=15c1ae60a0eb035e8479a1c1e805e28366f9ec6b;hb=457eeeee4e2694bdd284a186405088f5ccdc6fa9;hp=e34faee68c3c642e96cba3bfb06f242ab55228a8;hpb=232cf6ac1955d43d6feb5d571a64bf04dd380dd2;p=urcu.git

diff --git a/src/urcu-call-rcu-impl.h b/src/urcu-call-rcu-impl.h
index e34faee..15c1ae6 100644
--- a/src/urcu-call-rcu-impl.h
+++ b/src/urcu-call-rcu-impl.h
@@ -452,8 +452,8 @@ static void call_rcu_data_init(struct call_rcu_data **crdpp,
 	cds_list_add(&crdp->list, &call_rcu_data_list);
 	crdp->cpu_affinity = cpu_affinity;
 	crdp->gp_count = 0;
-	cmm_smp_mb();  /* Structure initialized before pointer is planted. */
-	*crdpp = crdp;
+	rcu_set_pointer(crdpp, crdp);
+
 	ret = pthread_create(&crdp->tid, NULL, call_rcu_thread, crdp);
 	if (ret)
 		urcu_die(ret);
@@ -576,22 +576,27 @@ int alias_set_cpu_call_rcu_data();
 
 /*
  * Return a pointer to the default call_rcu_data structure, creating
- * one if need be.  Because we never free call_rcu_data structures,
- * we don't need to be in an RCU read-side critical section.
+ * one if need be.
+ *
+ * The call to this function with intent to use the returned
+ * call_rcu_data should be protected by RCU read-side lock.
  */
 
 struct call_rcu_data *get_default_call_rcu_data(void)
 {
-	if (default_call_rcu_data != NULL)
-		return rcu_dereference(default_call_rcu_data);
+	struct call_rcu_data *crdp;
+
+	crdp = rcu_dereference(default_call_rcu_data);
+	if (crdp != NULL)
+		return crdp;
+
 	call_rcu_lock(&call_rcu_mutex);
-	if (default_call_rcu_data != NULL) {
-		call_rcu_unlock(&call_rcu_mutex);
-		return default_call_rcu_data;
-	}
-	call_rcu_data_init(&default_call_rcu_data, 0, -1);
+	if (default_call_rcu_data == NULL)
+		call_rcu_data_init(&default_call_rcu_data, 0, -1);
+	crdp = default_call_rcu_data;
 	call_rcu_unlock(&call_rcu_mutex);
-	return default_call_rcu_data;
+
+	return crdp;
 }
 URCU_ATTR_ALIAS(urcu_stringify(get_default_call_rcu_data))
 struct call_rcu_data *alias_get_default_call_rcu_data();
@@ -1099,6 +1104,62 @@ void urcu_unregister_rculfhash_atfork(struct urcu_atfork *atfork __attribute__((
 {
 	urcu_die(EPERM);
 }
+
 URCU_ATTR_ALIAS(urcu_stringify(urcu_unregister_rculfhash_atfork))
 __attribute__((noreturn))
 void alias_urcu_unregister_rculfhash_atfork();
+
+/*
+ * Teardown the default call_rcu worker thread if there are no queued
+ * callbacks on process exit. This prevents leaking memory.
+ *
+ * Here is how an application can ensure graceful teardown of this
+ * worker thread:
+ *
+ * - An application queuing call_rcu callbacks should invoke
+ *   rcu_barrier() before it exits.
+ * - When chaining call_rcu callbacks, the number of calls to
+ *   rcu_barrier() on application exit must match at least the maximum
+ *   number of chained callbacks.
+ * - If an application chains callbacks endlessly, it would have to be
+ *   modified to stop chaining callbacks when it detects an application
+ *   exit (e.g. with a flag), and wait for quiescence with rcu_barrier()
+ *   after setting that flag.
+ * - The statements above apply to a library which queues call_rcu
+ *   callbacks, only it needs to invoke rcu_barrier in its library
+ *   destructor.
+ *
+ * Note that this function does not presume it is being called when the
+ * application is single-threaded even though this is invoked from a
+ * destructor: this function synchronizes against concurrent calls to
+ * get_default_call_rcu_data().
+ */
+static void urcu_call_rcu_exit(void)
+{
+	struct call_rcu_data *crdp;
+	bool teardown = true;
+
+	if (default_call_rcu_data == NULL)
+		return;
+	call_rcu_lock(&call_rcu_mutex);
+	/*
+	 * If the application leaves callbacks in the default call_rcu
+	 * worker queue, keep the default worker in place.
+	 */
+	crdp = default_call_rcu_data;
+	if (!crdp) {
+		teardown = false;
+		goto unlock;
+	}
+	if (!cds_wfcq_empty(&crdp->cbs_head, &crdp->cbs_tail)) {
+		teardown = false;
+		goto unlock;
+	}
+	rcu_set_pointer(&default_call_rcu_data, NULL);
+unlock:
+	call_rcu_unlock(&call_rcu_mutex);
+	if (teardown) {
+		synchronize_rcu();
+		call_rcu_data_free(crdp);
+	}
+}