Save filter expression as part of agent events and save them

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

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index ffff05809d2f072cd6c40ea00f83dec07fad5f56..41f6582384cf5c5577ece366f9e6b8c2c217be76 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -380,6 +380,8 @@ static int list_lttng_kernel_events(char *channel_name,
                strncpy((*events)[i].name, event->event->name, LTTNG_SYMBOL_NAME_LEN);
                (*events)[i].name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
                (*events)[i].enabled = event->enabled;
+               (*events)[i].filter =
+                               (unsigned char) !!event->filter_expression;
 
                switch (event->event->instrumentation) {
                case LTTNG_KERNEL_TRACEPOINT:
@@ -1497,6 +1499,9 @@ static int _cmd_enable_event(struct ltt_session *session,
        assert(event);
        assert(channel_name);
 
+       /* If we have a filter, we must have its filter expression */
+       assert(!(!!filter_expression ^ !!filter));
+
        DBG("Enable event command for event \'%s\'", event->name);
 
        ret = validate_event_name(event->name);
@@ -1682,6 +1687,16 @@ static int _cmd_enable_event(struct ltt_session *session,
                        assert(uchan);
                }
 
+               if (uchan->domain != LTTNG_DOMAIN_UST && !internal_event) {
+                       /*
+                        * Don't allow users to add UST events to channels which
+                        * are assigned to a userspace subdomain (JUL, Log4J,
+                        * Python, etc.).
+                        */
+                       ret = LTTNG_ERR_INVALID_CHANNEL_DOMAIN;
+                       goto error;
+               }
+
                if (!internal_event) {
                        /*
                         * Ensure the event name is not reserved for internal
@@ -1726,7 +1741,7 @@ static int _cmd_enable_event(struct ltt_session *session,
                if (!agt) {
                        agt = agent_create(domain->type);
                        if (!agt) {
-                               ret = -LTTNG_ERR_NOMEM;
+                               ret = LTTNG_ERR_NOMEM;
                                goto error;
                        }
                        agent_add(agt, usess->agents);
@@ -1736,9 +1751,10 @@ static int _cmd_enable_event(struct ltt_session *session,
                memset(&uevent, 0, sizeof(uevent));
                uevent.type = LTTNG_EVENT_TRACEPOINT;
                uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
-               default_event_name = event_get_default_agent_ust_name(domain->type);
+               default_event_name = event_get_default_agent_ust_name(
+                               domain->type);
                if (!default_event_name) {
-                       ret = -LTTNG_ERR_FATAL;
+                       ret = LTTNG_ERR_FATAL;
                        goto error;
                }
                strncpy(uevent.name, default_event_name, sizeof(uevent.name));
@@ -1768,27 +1784,37 @@ static int _cmd_enable_event(struct ltt_session *session,
                }
 
                {
+                       char *filter_expression_copy = NULL;
                        struct lttng_filter_bytecode *filter_copy = NULL;
 
                        if (filter) {
-                               filter_copy = zmalloc(
-                                       sizeof(struct lttng_filter_bytecode)
-                                       + filter->len);
+                               const size_t filter_size = sizeof(
+                                               struct lttng_filter_bytecode)
+                                               + filter->len;
+
+                               filter_copy = zmalloc(filter_size);
                                if (!filter_copy) {
-                                       goto error;
+                                       ret = LTTNG_ERR_NOMEM;
                                }
+                               memcpy(filter_copy, filter, filter_size);
 
-                               memcpy(filter_copy, filter,
-                                       sizeof(struct lttng_filter_bytecode)
-                                       + filter->len);
+                               filter_expression_copy =
+                                               strdup(filter_expression);
+                               if (!filter_expression) {
+                                       ret = LTTNG_ERR_NOMEM;
+                               }
+
+                               if (!filter_expression_copy || !filter_copy) {
+                                       free(filter_expression_copy);
+                                       free(filter_copy);
+                                       goto error;
+                               }
                        }
 
                        ret = cmd_enable_event_internal(session, &tmp_dom,
                                        (char *) default_chan_name,
-                                       &uevent, filter_expression, filter_copy,
-                                       NULL, wpipe);
-                       /* We have passed ownership */
-                       filter_expression = NULL;
+                                       &uevent, filter_expression_copy,
+                                       filter_copy, NULL, wpipe);
                }
 
                if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) {
@@ -1797,12 +1823,14 @@ static int _cmd_enable_event(struct ltt_session *session,
 
                /* The wild card * means that everything should be enabled. */
                if (strncmp(event->name, "*", 1) == 0 && strlen(event->name) == 1) {
-                       ret = event_agent_enable_all(usess, agt, event, filter);
-                       filter = NULL;
+                       ret = event_agent_enable_all(usess, agt, event, filter,
+                                       filter_expression);
                } else {
-                       ret = event_agent_enable(usess, agt, event, filter);
-                       filter = NULL;
+                       ret = event_agent_enable(usess, agt, event, filter,
+                                       filter_expression);
                }
+               filter = NULL;
+               filter_expression = NULL;
                if (ret != LTTNG_OK) {
                        goto error;
                }