Merge branch 'master' into compat-freebsd

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

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 7f422a99e2e24658f1ea1c1d9a27c1e26463723e..55e73930ae9cb836da1620c76298af26aca503e4 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -225,27 +225,30 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
        switch (ev->loglevel_type) {
        case LTTNG_EVENT_LOGLEVEL_ALL:
                lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_ALL;
+               lue->attr.loglevel = -1;        /* Force to -1 */
                break;
        case LTTNG_EVENT_LOGLEVEL_RANGE:
                lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_RANGE;
+               lue->attr.loglevel = ev->loglevel;
                break;
        case LTTNG_EVENT_LOGLEVEL_SINGLE:
                lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_SINGLE;
+               lue->attr.loglevel = ev->loglevel;
                break;
        default:
-               ERR("Unknown ust loglevel type (%d)", ev->type);
+               ERR("Unknown ust loglevel type (%d)", ev->loglevel_type);
                goto error_free_event;
        }
 
-       /* Copy loglevel */
-       lue->attr.loglevel = ev->loglevel;
 
        /* Init node */
        lttng_ht_node_init_str(&lue->node, lue->attr.name);
        /* Alloc context hash tables */
        lue->ctx = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
 
-       DBG2("Trace UST event %s created", lue->attr.name);
+       DBG2("Trace UST event %s, loglevel (%d,%d) created",
+               lue->attr.name, lue->attr.loglevel_type,
+               lue->attr.loglevel);
 
        return lue;