From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Thu, 30 Jul 2015 16:46:56 +0000 (-0400)
Subject: Fix: Initialize global agent_apps_ht_by_sock on session daemon launch
X-Git-Tag: v2.6.1~84
X-Git-Url: https://git.liburcu.org/?a=commitdiff_plain;h=144361687aad6c68ed40821846f13fcc89c04549;p=lttng-tools.git

Fix: Initialize global agent_apps_ht_by_sock on session daemon launch

Reported-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
index c50bbcaba..afc3712a7 100644
--- a/src/bin/lttng-sessiond/agent.c
+++ b/src/bin/lttng-sessiond/agent.c
@@ -1006,6 +1006,9 @@ void agent_app_ht_clean(void)
 	struct lttng_ht_node_ulong *node;
 	struct lttng_ht_iter iter;
 
+	if (!agent_apps_ht_by_sock) {
+		return;
+	}
 	rcu_read_lock();
 	cds_lfht_for_each_entry(agent_apps_ht_by_sock->ht, &iter.iter, node, node) {
 		struct agent_app *app;
diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 02d135c9c..36d154e1f 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -5080,6 +5080,9 @@ int main(int argc, char **argv)
 	void *status;
 	const char *home_path, *env_app_timeout;
 
+	/* Initialize agent apps ht global variable */
+	agent_apps_ht_by_sock = NULL;
+
 	init_kernel_workarounds();
 
 	rcu_register_thread();