X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=8e06ce6913875dd85e0a17e0eeafb929ba93d425;hp=b4521dfe3be28c63a083035b27ed121ad4dfbdd5;hb=a93b3916055c57baf374c1f566d81f91101daa54;hpb=f5436bfcf6797b979b308a9af782750f9d079686

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index b4521dfe3..8e06ce691 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2012 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2016 - 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
@@ -15,7 +16,6 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <assert.h>
 #include <inttypes.h>
@@ -1360,6 +1360,12 @@ int cmd_add_context(struct ltt_session *session, enum lttng_domain_type domain,
 		char *channel_name, struct lttng_event_context *ctx, int kwpipe)
 {
 	int ret, chan_kern_created = 0, chan_ust_created = 0;
+	char *app_ctx_provider_name = NULL, *app_ctx_name = NULL;
+
+	if (ctx->ctx == LTTNG_EVENT_CONTEXT_APP_CONTEXT) {
+		app_ctx_provider_name = ctx->u.app_ctx.provider_name;
+		app_ctx_name = ctx->u.app_ctx.ctx_name;
+	}
 
 	switch (domain) {
 	case LTTNG_DOMAIN_KERNEL:
@@ -1379,6 +1385,29 @@ int cmd_add_context(struct ltt_session *session, enum lttng_domain_type domain,
 			goto error;
 		}
 		break;
+	case LTTNG_DOMAIN_JUL:
+	case LTTNG_DOMAIN_LOG4J:
+	{
+		/*
+		 * Validate channel name.
+		 * If no channel name is given and the domain is JUL or LOG4J,
+		 * set it to the appropriate domain-specific channel name. If
+		 * a name is provided but does not match the expexted channel
+		 * name, return an error.
+		 */
+		if (domain == LTTNG_DOMAIN_JUL && *channel_name &&
+				strcmp(channel_name,
+				DEFAULT_JUL_CHANNEL_NAME)) {
+			ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
+			goto error;
+		} else if (domain == LTTNG_DOMAIN_LOG4J && *channel_name &&
+				strcmp(channel_name,
+				DEFAULT_LOG4J_CHANNEL_NAME)) {
+			ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
+			goto error;
+		}
+		/* break is _not_ missing here. */
+	}
 	case LTTNG_DOMAIN_UST:
 	{
 		struct ltt_ust_session *usess = session->ust_session;
@@ -1406,6 +1435,10 @@ int cmd_add_context(struct ltt_session *session, enum lttng_domain_type domain,
 		}
 
 		ret = context_ust_add(usess, domain, ctx, channel_name);
+		free(app_ctx_provider_name);
+		free(app_ctx_name);
+		app_ctx_name = NULL;
+		app_ctx_provider_name = NULL;
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -1416,7 +1449,8 @@ int cmd_add_context(struct ltt_session *session, enum lttng_domain_type domain,
 		goto error;
 	}
 
-	return LTTNG_OK;
+	ret = LTTNG_OK;
+	goto end;
 
 error:
 	if (chan_kern_created) {
@@ -1440,6 +1474,9 @@ error:
 				uchan);
 		trace_ust_destroy_channel(uchan);
 	}
+end:
+	free(app_ctx_provider_name);
+	free(app_ctx_name);
 	return ret;
 }
 
@@ -1754,7 +1791,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 		filter_expression = NULL;
 		filter = NULL;
 		exclusion = NULL;
-		if (ret != LTTNG_OK) {
+		if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) {
 			goto error;
 		}
 		break;