X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=c8989113a2e9b701f460b92ad189b7e2a3b60189;hp=13bd649180452ad8346f8d7a5729446a9c58b157;hb=e0f4d107bab7aff609fa3e72b104eb78165380f8;hpb=03e431550191df8609f921c7b4054c57ee4644d8

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 13bd64918..c8989113a 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <getopt.h>
 #include <grp.h>
@@ -38,7 +37,6 @@
 #include <sys/wait.h>
 #include <urcu/uatomic.h>
 #include <unistd.h>
-#include <config.h>
 
 #include <common/common.h>
 #include <common/compat/socket.h>
@@ -49,7 +47,7 @@
 #include <common/relayd/relayd.h>
 #include <common/utils.h>
 #include <common/daemonize.h>
-#include <common/config/config.h>
+#include <common/config/session-config.h>
 
 #include "lttng-sessiond.h"
 #include "buffer-registry.h"
@@ -801,6 +799,8 @@ static void sessiond_cleanup_options(void)
 	free(kmod_probes_list);
 	free(kmod_extra_probes_list);
 
+	run_as_destroy_worker();
+
 	/* <fun> */
 	DBG("%c[%d;%dm*** assert failed :-) *** ==> %c[%dm%c[%d;%dm"
 			"Matthew, BEET driven development works!%c[%dm",
@@ -3343,9 +3343,74 @@ skip_domain:
 	switch (cmd_ctx->lsm->cmd_type) {
 	case LTTNG_ADD_CONTEXT:
 	{
-		ret = cmd_add_context(cmd_ctx->session, cmd_ctx->lsm->domain.type,
+		/*
+		 * An LTTNG_ADD_CONTEXT command might have a supplementary
+		 * payload if the context being added is an application context.
+		 */
+		if (cmd_ctx->lsm->u.context.ctx.ctx ==
+				LTTNG_EVENT_CONTEXT_APP_CONTEXT) {
+			char *provider_name = NULL, *context_name = NULL;
+			size_t provider_name_len =
+					cmd_ctx->lsm->u.context.provider_name_len;
+			size_t context_name_len =
+					cmd_ctx->lsm->u.context.context_name_len;
+
+			if (provider_name_len == 0 || context_name_len == 0) {
+				/*
+				 * Application provider and context names MUST
+				 * be provided.
+				 */
+				ret = -LTTNG_ERR_INVALID;
+				goto error;
+			}
+
+			provider_name = zmalloc(provider_name_len + 1);
+			if (!provider_name) {
+				ret = -LTTNG_ERR_NOMEM;
+				goto error;
+			}
+			cmd_ctx->lsm->u.context.ctx.u.app_ctx.provider_name =
+					provider_name;
+
+			context_name = zmalloc(context_name_len + 1);
+			if (!context_name) {
+				ret = -LTTNG_ERR_NOMEM;
+				goto error_add_context;
+			}
+			cmd_ctx->lsm->u.context.ctx.u.app_ctx.ctx_name =
+					context_name;
+
+			ret = lttcomm_recv_unix_sock(sock, provider_name,
+					provider_name_len);
+			if (ret < 0) {
+				goto error_add_context;
+			}
+
+			ret = lttcomm_recv_unix_sock(sock, context_name,
+					context_name_len);
+			if (ret < 0) {
+				goto error_add_context;
+			}
+		}
+
+		/*
+		 * cmd_add_context assumes ownership of the provider and context
+		 * names.
+		 */
+		ret = cmd_add_context(cmd_ctx->session,
+				cmd_ctx->lsm->domain.type,
 				cmd_ctx->lsm->u.context.channel_name,
-				&cmd_ctx->lsm->u.context.ctx, kernel_poll_pipe[1]);
+				&cmd_ctx->lsm->u.context.ctx,
+				kernel_poll_pipe[1]);
+
+		cmd_ctx->lsm->u.context.ctx.u.app_ctx.provider_name = NULL;
+		cmd_ctx->lsm->u.context.ctx.u.app_ctx.ctx_name = NULL;
+error_add_context:
+		free(cmd_ctx->lsm->u.context.ctx.u.app_ctx.provider_name);
+		free(cmd_ctx->lsm->u.context.ctx.u.app_ctx.ctx_name);
+		if (ret < 0) {
+			goto error;
+		}
 		break;
 	}
 	case LTTNG_DISABLE_CHANNEL:
@@ -4901,7 +4966,7 @@ end:
 
 /*
  * config_entry_handler_cb used to handle options read from a config file.
- * See config_entry_handler_cb comment in common/config/config.h for the
+ * See config_entry_handler_cb comment in common/config/session-config.h for the
  * return value conventions.
  */
 static int config_entry_handler(const struct config_entry *entry, void *unused)
@@ -5510,6 +5575,10 @@ int main(int argc, char **argv)
 		}
 	}
 
+	if (run_as_create_worker(argv[0]) < 0) {
+		goto exit_create_run_as_worker_cleanup;
+	}
+
 	/*
 	 * Starting from here, we can create threads. This needs to be after
 	 * lttng_daemonize due to RCU.
@@ -6127,13 +6196,15 @@ exit_ht_cleanup_quit_pipe:
 
 	health_app_destroy(health_sessiond);
 exit_health_sessiond_cleanup:
+exit_create_run_as_worker_cleanup:
 
 exit_options:
+	/* Ensure all prior call_rcu are done. */
+	rcu_barrier();
+
 	sessiond_cleanup_options();
 
 exit_set_signal_handler:
-	/* Ensure all prior call_rcu are done. */
-	rcu_barrier();
 
 	if (!retval) {
 		exit(EXIT_SUCCESS);