X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=5e644a72d9f821ec638d31e752542fa42cf2cffb;hb=a503e1ef71bfe98526469205fc2956cc65954019;hp=3d2cad9361464534128a44f5917d01f1e58899fe;hpb=8b0d46366f5c87043d22aa29b9f26e5249bf7c3a;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 3d2cad936..5e644a72d 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -858,7 +858,7 @@ error:
  *
  * Useful for CPU hotplug feature.
  */
-static int update_kernel_stream(struct consumer_data *consumer_data, int fd)
+static int update_kernel_stream(int fd)
 {
 	int ret = 0;
 	struct ltt_session *session;
@@ -1092,7 +1092,7 @@ static void *thread_manage_kernel(void *data)
 					 * New CPU detected by the kernel. Adding kernel stream to
 					 * kernel session and updating the kernel consumer
 					 */
-					ret = update_kernel_stream(&kconsumer_data, pollfd);
+					ret = update_kernel_stream(pollfd);
 					if (ret < 0) {
 						continue;
 					}
@@ -4598,6 +4598,8 @@ static void *thread_manage_clients(void *data)
 	health_code_update();
 
 	while (1) {
+		const struct cmd_completion_handler *cmd_completion_handler;
+
 		DBG("Accepting client command ...");
 
 		/* Inifinite blocking call, waiting for transmission */
@@ -4740,6 +4742,18 @@ static void *thread_manage_clients(void *data)
 			continue;
 		}
 
+		cmd_completion_handler = cmd_pop_completion_handler();
+		if (cmd_completion_handler) {
+			enum lttng_error_code completion_code;
+
+			completion_code = cmd_completion_handler->run(
+					cmd_completion_handler->data);
+			if (completion_code != LTTNG_OK) {
+				clean_command_ctx(&cmd_ctx);
+				continue;
+			}
+		}
+
 		health_code_update();
 
 		DBG("Sending response (size: %d, retcode: %s (%d))",
@@ -5830,6 +5844,12 @@ int main(int argc, char **argv)
 		goto exit_set_signal_handler;
 	}
 
+	/*
+	 * Init config from environment variables.
+	 * Command line option override env configuration per-doc. Do env first.
+	 */
+	sessiond_config_apply_env_config(&config);
+
 	/*
 	 * Parse arguments and load the daemon configuration file.
 	 *
@@ -5844,9 +5864,6 @@ int main(int argc, char **argv)
 		goto exit_options;
 	}
 
-	/* Init config from environment variables. */
-	sessiond_config_apply_env_config(&config);
-
 	/*
 	 * Resolve all paths received as arguments, configuration option, or
 	 * through environment variable as absolute paths. This is necessary