Truncate exclusion names to have a terminal '\0'

[lttng-tools.git] / src / bin / lttng-sessiond / channel.c

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index 7ea43b8f39c5b6f0ba5253f018d40dc6fa72f821..06a6d616af7a01d4c9207e6d7b86156e2d3b499e 100644 (file)
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -15,7 +15,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <inttypes.h>
 #include <string.h>
@@ -333,11 +332,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;