X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=f698fae4c634be7b3445d9dc0e6d29253352f549;hb=fb180e6e4855acd6eff826ac6253b58d5d3e6da4;hp=c45280d11583f0d8f1f44b125546b24b7d5e3232;hpb=308df7bb0aad1ee6273c99480445a2d4af81e47a;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index c45280d11..f698fae4c 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -327,17 +327,18 @@ static void sessiond_cleanup(void)
 
 	pthread_mutex_destroy(&session_list->lock);
 
-	wait_consumer(&kconsumer_data);
-	wait_consumer(&ustconsumer64_data);
-	wait_consumer(&ustconsumer32_data);
-
 	DBG("Cleaning up all agent apps");
 	agent_app_ht_clean();
-
 	DBG("Closing all UST sockets");
 	ust_app_clean_list();
 	buffer_reg_destroy_registries();
 
+	close_consumer_sockets();
+
+	wait_consumer(&kconsumer_data);
+	wait_consumer(&ustconsumer64_data);
+	wait_consumer(&ustconsumer32_data);
+
 	if (is_root && !config.no_kernel) {
 		DBG2("Closing kernel fd");
 		if (kernel_tracer_fd >= 0) {
@@ -351,8 +352,6 @@ static void sessiond_cleanup(void)
 		free(syscall_table);
 	}
 
-	close_consumer_sockets();
-
 	/*
 	 * We do NOT rmdir rundir because there are other processes
 	 * using it, for instance lttng-relayd, which can start in
@@ -1023,7 +1022,11 @@ static int set_permissions(char *rundir)
 	int ret;
 	gid_t gid;
 
-	gid = utils_get_group_id(config.tracing_group_name.value);
+	ret = utils_get_group_id(config.tracing_group_name.value, true, &gid);
+	if (ret) {
+		/* Default to root group. */
+		gid = 0;
+	}
 
 	/* Set lttng run dir */
 	ret = chown(rundir, 0, gid);
@@ -1134,7 +1137,16 @@ static int set_consumer_sockets(struct consumer_data *consumer_data)
 		goto error;
 	}
 	if (is_root) {
-		ret = chown(path, 0, utils_get_group_id(config.tracing_group_name.value));
+		gid_t gid;
+
+		ret = utils_get_group_id(config.tracing_group_name.value, true,
+				&gid);
+		if (ret) {
+			/* Default to root group. */
+			gid = 0;
+		}
+
+		ret = chown(path, 0, gid);
 		if (ret < 0) {
 			ERR("Unable to set group on %s", path);
 			PERROR("chown");
@@ -1322,8 +1334,8 @@ static void destroy_all_sessions_and_wait(void)
 			goto unlock_session;
 		}
 		(void) cmd_stop_trace(session);
-		(void) cmd_destroy_session(session,
-				notification_thread_handle);
+		(void) cmd_destroy_session(session, notification_thread_handle,
+				NULL);
 	unlock_session:
 		session_unlock(session);
 		session_put(session);
@@ -1336,6 +1348,34 @@ static void destroy_all_sessions_and_wait(void)
 	DBG("Destruction of all sessions completed");
 }
 
+static int run_as_worker_post_fork_cleanup(void *data)
+{
+	struct sessiond_config *sessiond_config = data;
+
+	sessiond_config_fini(sessiond_config);
+	return 0;
+}
+
+static int launch_run_as_worker(const char *procname)
+{
+	/*
+	 * Clean-up before forking the run-as worker. Any dynamically
+	 * allocated memory of which the worker is not aware will
+	 * be leaked as the process forks a run-as worker (and performs
+	 * no exec*()). The same would apply to any opened fd.
+	 */
+	return run_as_create_worker(procname, run_as_worker_post_fork_cleanup,
+			&config);
+}
+
+static void sessiond_uuid_log(void)
+{
+	char uuid_str[UUID_STR_LEN];
+
+	lttng_uuid_to_str(sessiond_uuid, uuid_str);
+	DBG("Starting lttng-sessiond {%s}", uuid_str);
+}
+
 /*
  * main
  */
@@ -1432,6 +1472,7 @@ int main(int argc, char **argv)
 	set_clock_plugin_env();
 
 	sessiond_config_log(&config);
+	sessiond_uuid_log();
 
 	if (create_lttng_rundir()) {
 		retval = -1;
@@ -1469,7 +1510,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-	if (run_as_create_worker(argv[0]) < 0) {
+	if (launch_run_as_worker(argv[0]) < 0) {
 		goto exit_create_run_as_worker_cleanup;
 	}
 
@@ -1800,7 +1841,7 @@ int main(int argc, char **argv)
 	 */
 
 	/* Initiate teardown once activity occurs on the quit pipe. */
-	sessiond_wait_for_quit_pipe(-1U);
+	sessiond_wait_for_quit_pipe(-1);
 
 stop_threads:
 	/*