Copy exclusion data in add_unique_ust_event.

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

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index 77818e587d4511f65eba47f38f71d5d292cc7f1e..db62151f57512c4dca6fb1affe32806c44415190 100644 (file)
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -48,6 +48,7 @@ static void add_unique_ust_event(struct lttng_ht *ht,
        key.name = event->attr.name;
        key.filter = (struct lttng_filter_bytecode *) event->filter;
        key.loglevel = event->attr.loglevel;
+       key.exclusion = event->exclusion;
 
        node_ptr = cds_lfht_add_unique(ht->ht,
                        ht->hash_fct(event->node.key, lttng_ht_seed),
@@ -244,7 +245,7 @@ end:
 }
 
 /*
- * Enable all kernel tracepoint events of a channel of the kernel session.
+ * Enable all kernel sycalls events of a channel of the kernel session.
  */
 int event_kernel_enable_all_syscalls(struct ltt_kernel_channel *kchan,
                int kernel_tracer_fd)
@@ -350,7 +351,7 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess,
                 * previously.
                 */
                uevent = trace_ust_find_event(uchan->events, events[i].name, filter,
-                               events[i].loglevel);
+                               events[i].loglevel, NULL);
                if (uevent != NULL) {
                        ret = ust_app_enable_event_pid(usess, uchan, uevent,
                                        events[i].pid);
@@ -364,7 +365,7 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess,
                }
 
                /* Create ust event */
-               uevent = trace_ust_create_event(&events[i], filter);
+               uevent = trace_ust_create_event(&events[i], filter, NULL);
                if (uevent == NULL) {
                        ret = LTTNG_ERR_FATAL;
                        goto error_destroy;
@@ -408,7 +409,8 @@ error:
  */
 int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
                struct ltt_ust_channel *uchan, struct lttng_event *event,
-               struct lttng_filter_bytecode *filter)
+               struct lttng_filter_bytecode *filter,
+               struct lttng_event_exclusion *exclusion)
 {
        int ret = LTTNG_OK, to_create = 0;
        struct ltt_ust_event *uevent;
@@ -420,9 +422,9 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
        rcu_read_lock();
 
        uevent = trace_ust_find_event(uchan->events, event->name, filter,
-                       event->loglevel);
+                       event->loglevel, exclusion);
        if (uevent == NULL) {
-               uevent = trace_ust_create_event(event, filter);
+               uevent = trace_ust_create_event(event, filter, exclusion);
                if (uevent == NULL) {
                        ret = LTTNG_ERR_UST_ENABLE_FAIL;
                        goto error;