X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=965625c9bb8ad7f70c74a61422b8e299ce164648;hp=a428630f8ba8c17f7aae052d0eca89c6c3ffe379;hb=refs%2Fheads%2Fsow-2019-0002-rev1;hpb=9bc2ec5fac0abab41b0851aaabaf8fd27811c514

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index a428630f8..965625c9b 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1,20 +1,10 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *               2013 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -62,7 +52,7 @@
 #include "kernel.h"
 #include "kernel-consumer.h"
 #include "shm.h"
-#include "ust-ctl.h"
+#include "lttng-ust-ctl.h"
 #include "ust-consumer.h"
 #include "utils.h"
 #include "fd-limit.h"
@@ -95,6 +85,7 @@ NULL
 
 const char *progname;
 static int lockfile_fd = -1;
+static int opt_print_version;
 
 /* Set to 1 when a SIGUSR1 signal is received. */
 static int recv_child_signal;
@@ -323,6 +314,9 @@ static void sessiond_cleanup(void)
 
 	pthread_mutex_destroy(&session_list->lock);
 
+	DBG("Cleaning up all trigger agents");
+	trigger_agent_ht_clean();
+
 	DBG("Cleaning up all agent apps");
 	agent_app_ht_clean();
 	DBG("Closing all UST sockets");
@@ -433,8 +427,7 @@ static int set_option(int opt, const char *arg, const char *optname)
 		}
 		exit(ret ? EXIT_FAILURE : EXIT_SUCCESS);
 	} else if (string_match(optname, "version") || opt == 'V') {
-		fprintf(stdout, "%s\n", VERSION);
-		exit(EXIT_SUCCESS);
+		opt_print_version = 1;
 	} else if (string_match(optname, "sig-parent") || opt == 'S') {
 		config.sig_parent = true;
 	} else if (string_match(optname, "kconsumerd-err-sock")) {
@@ -789,6 +782,10 @@ end:
 	return ret;
 }
 
+static void print_version(void) {
+	fprintf(stdout, "%s\n", VERSION);
+}
+
 /*
  * daemon configuration loading and argument parsing
  */
@@ -1282,7 +1279,7 @@ static int launch_run_as_worker(const char *procname)
 
 static void sessiond_uuid_log(void)
 {
-	char uuid_str[UUID_STR_LEN];
+	char uuid_str[LTTNG_UUID_STR_LEN];
 
 	lttng_uuid_to_str(sessiond_uuid, uuid_str);
 	DBG("Starting lttng-sessiond {%s}", uuid_str);
@@ -1308,6 +1305,7 @@ int main(int argc, char **argv)
 	struct lttng_thread *notification_thread = NULL;
 	struct lttng_thread *register_apps_thread = NULL;
 
+	logger_set_thread_name("Main", false);
 	init_kernel_workarounds();
 
 	rcu_register_thread();
@@ -1386,6 +1384,12 @@ int main(int argc, char **argv)
 	sessiond_config_log(&config);
 	sessiond_uuid_log();
 
+	if (opt_print_version) {
+		print_version();
+		retval = 0;
+		goto exit_options;
+	}
+
 	if (create_lttng_rundir()) {
 		retval = -1;
 		goto exit_options;
@@ -1538,6 +1542,11 @@ int main(int argc, char **argv)
 		goto stop_threads;
 	}
 
+	if (trigger_agent_ht_alloc()) {
+		ERR("Failed to allocate trigger agent hash table");
+		retval = -1;
+		goto stop_threads;
+	}
 	/*
 	 * These actions must be executed as root. We do that *after* setting up
 	 * the sockets path because we MUST make the check for another daemon using
@@ -1635,7 +1644,8 @@ int main(int argc, char **argv)
 	notification_thread_handle = notification_thread_handle_create(
 			ust32_channel_monitor_pipe,
 			ust64_channel_monitor_pipe,
-			kernel_channel_monitor_pipe);
+			kernel_channel_monitor_pipe,
+			kernel_get_notification_fd());
 	if (!notification_thread_handle) {
 		retval = -1;
 		ERR("Failed to create notification thread shared data");