X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=55e73930ae9cb836da1620c76298af26aca503e4;hb=4431494bed1d1810b70ce9d0eda74c295f39639d;hp=0858f47d53b29ea598f94471b4271d029ba1a2bd;hpb=69892bbba677a6695b216046d586e58bfa0f82c9;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 0858f47d5..55e73930a 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -213,9 +213,6 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
 	case LTTNG_EVENT_TRACEPOINT:
 		lue->attr.instrumentation = LTTNG_UST_TRACEPOINT;
 		break;
-	case LTTNG_EVENT_TRACEPOINT_LOGLEVEL:
-		lue->attr.instrumentation = LTTNG_UST_TRACEPOINT_LOGLEVEL;
-		break;
 	default:
 		ERR("Unknown ust instrumentation type (%d)", ev->type);
 		goto error_free_event;
@@ -225,12 +222,33 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
 	strncpy(lue->attr.name, ev->name, LTTNG_UST_SYM_NAME_LEN);
 	lue->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
 
+	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->loglevel_type);
+		goto error_free_event;
+	}
+
+
 	/* 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;