Fix: include loglevel type in UST event's primary key

Refs: #913

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index 36f6f483a9f3d3b492db00d699b95a799eaa450f..71b66a8468cd06410ca3e277fa63750d9b0780df 100644 (file)
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -50,7 +50,8 @@ 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_type = event->attr.loglevel;
+       key.loglevel_type = event->attr.loglevel_type;
+       key.loglevel_value = event->attr.loglevel;
        key.exclusion = event->exclusion;
 
        node_ptr = cds_lfht_add_unique(ht->ht,
@@ -207,7 +208,7 @@ 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, exclusion);
+                       event->loglevel_type, event->loglevel, exclusion);
        if (!uevent) {
                uevent = trace_ust_create_event(event, filter_expression,
                                filter, exclusion, internal_event);
@@ -533,12 +534,13 @@ int event_agent_disable(struct ltt_ust_session *usess, struct agent *agt,
        }
 
        /*
-        * The loglevel is hardcoded with 0 here since the agent ust event is set
-        * with the loglevel type to ALL thus the loglevel stays 0. The event's
-        * filter is the one handling the loglevel for agent.
+        * Agent UST event has its loglevel type forced to
+        * LTTNG_UST_LOGLEVEL_ALL. The actual loglevel type/value filtering
+        * happens thanks to an UST filter. The following -1 is actually
+        * ignored since the type is LTTNG_UST_LOGLEVEL_ALL.
         */
        uevent = trace_ust_find_event(uchan->events, (char *) ust_event_name,
-                       aevent->filter, 0, NULL);
+                       aevent->filter, LTTNG_UST_LOGLEVEL_ALL, -1, NULL);
        /* If the agent event exists, it must be available on the UST side. */
        assert(uevent);
 

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 906f916a91b51ceb1b075ff172ef14281583a577..b7ef806af1a5a218cdfa7ccc2f1b4c6e04691f98 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -87,19 +87,21 @@ int trace_ust_ht_match_event(struct cds_lfht_node *node, const void *_key)
                goto no_match;
        }
 
-       /* Event loglevel. */
-       if (ev_loglevel_value != key->loglevel_type) {
-               if (event->attr.loglevel_type == LTTNG_UST_LOGLEVEL_ALL
-                               && key->loglevel_type == 0 && ev_loglevel_value == -1) {
+       /* Event loglevel value and type. */
+       if (event->attr.loglevel_type == key->loglevel_type) {
+               /* Same loglevel type. */
+               if (key->loglevel_type != LTTNG_UST_LOGLEVEL_ALL) {
                        /*
-                        * Match is accepted. This is because on event creation, the
-                        * loglevel is set to -1 if the event loglevel type is ALL so 0 and
-                        * -1 are accepted for this loglevel type since 0 is the one set by
-                        * the API when receiving an enable event.
+                        * Loglevel value must also match since the loglevel
+                        * type is not all.
                         */
-               } else {
-                       goto no_match;
+                       if (ev_loglevel_value != key->loglevel_value) {
+                               goto no_match;
+                       }
                }
+       } else {
+               /* Loglevel type is different: no match. */
+               goto no_match;
        }
 
        /* Only one of the filters is NULL, fail. */
@@ -174,7 +176,8 @@ error:
  */
 struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
                char *name, struct lttng_filter_bytecode *filter,
-               int loglevel_value, struct lttng_event_exclusion *exclusion)
+               enum lttng_ust_loglevel_type loglevel_type, int loglevel_value,
+               struct lttng_event_exclusion *exclusion)
 {
        struct lttng_ht_node_str *node;
        struct lttng_ht_iter iter;
@@ -185,7 +188,8 @@ struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
 
        key.name = name;
        key.filter = filter;
-       key.loglevel_type = loglevel_value;
+       key.loglevel_type = loglevel_type;
+       key.loglevel_value = loglevel_value;
        key.exclusion = exclusion;
 
        cds_lfht_lookup(ht->ht, ht->hash_fct((void *) name, lttng_ht_seed),

diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
index 0e2cb6420461cdf9207cf8ab2f6ce9bbe29c9c0b..7de5f041939dfe5638bd77c7f7017f13cd6256bc 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.h
+++ b/src/bin/lttng-sessiond/trace-ust.h
@@ -35,6 +35,7 @@ struct ltt_ust_ht_key {
        const char *name;
        const struct lttng_filter_bytecode *filter;
        enum lttng_ust_loglevel_type loglevel_type;
+       int loglevel_value;
        const struct lttng_event_exclusion *exclusion;
 };
 
@@ -177,7 +178,8 @@ int trace_ust_ht_match_event_by_name(struct cds_lfht_node *node,
  */
 struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
                char *name, struct lttng_filter_bytecode *filter,
-               int loglevel_value, struct lttng_event_exclusion *exclusion);
+               enum lttng_ust_loglevel_type loglevel_type, int loglevel_value,
+               struct lttng_event_exclusion *exclusion);
 struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
                char *name);
 struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
@@ -282,9 +284,11 @@ int trace_ust_match_context(struct ltt_ust_context *uctx,
 {
        return 0;
 }
-static inline struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
+static inline
+struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
                char *name, struct lttng_filter_bytecode *filter,
-               int loglevel_value, struct lttng_event_exclusion *exclusion)
+               enum lttng_ust_loglevel_type loglevel_type, int loglevel_value,
+               struct lttng_event_exclusion *exclusion)
 {
        return NULL;
 }