X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fchannel.c;h=69498050ede41639cfc283f4288371834dfccc2d;hb=e8fcabef14e1e2ce8d159c68c5585931df1216b4;hp=817100ff449128e2f71705623d6ac4a39d95e0f4;hpb=ecc48a904cc7c419fd1400afaa9ccb93be490cdd;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index 817100ff4..69498050e 100644
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <inttypes.h>
 #include <string.h>
 #include <unistd.h>
@@ -332,11 +333,24 @@ int channel_ust_create(struct ltt_ust_session *usess,
 	}
 
 	/* Create UST channel */
-	uchan = trace_ust_create_channel(attr);
+	uchan = trace_ust_create_channel(attr, LTTNG_DOMAIN_UST);
 	if (uchan == NULL) {
 		ret = LTTNG_ERR_FATAL;
 		goto error;
 	}
+
+	/*
+	 * HACK: Set the channel's subdomain (JUL, Log4j, Python, etc.)
+	 * based on the default name.
+	 */
+	if (!strcmp(uchan->name, DEFAULT_JUL_CHANNEL_NAME)) {
+		uchan->domain = LTTNG_DOMAIN_JUL;
+	} else if (!strcmp(uchan->name, DEFAULT_LOG4J_CHANNEL_NAME)) {
+		uchan->domain = LTTNG_DOMAIN_LOG4J;
+	} else if (!strcmp(uchan->name, DEFAULT_PYTHON_CHANNEL_NAME)) {
+		uchan->domain = LTTNG_DOMAIN_PYTHON;
+	}
+
 	uchan->enabled = 1;
 	if (trace_ust_is_max_id(usess->used_channel_id)) {
 		ret = LTTNG_ERR_UST_CHAN_FAIL;
@@ -366,7 +380,18 @@ int channel_ust_create(struct ltt_ust_session *usess,
 
 	/* Adding the channel to the channel hash table. */
 	rcu_read_lock();
-	lttng_ht_add_unique_str(usess->domain_global.channels, &uchan->node);
+	if (strncmp(uchan->name, DEFAULT_METADATA_NAME,
+				sizeof(uchan->name))) {
+		lttng_ht_add_unique_str(usess->domain_global.channels, &uchan->node);
+	} else {
+		/*
+		 * Copy channel attribute to session if this is metadata so if NO
+		 * application exists we can access that data in the shadow copy during
+		 * the global update of newly registered application.
+		 */
+		memcpy(&usess->metadata_attr, &uchan->attr,
+				sizeof(usess->metadata_attr));
+	}
 	rcu_read_unlock();
 
 	DBG2("Channel %s created successfully", uchan->name);