X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=ce6332d931618178948c64095abe1264cbc35315;hb=7ec24b771aedc41b349fb91bea439dc12d0e3ac3;hp=0a90cac0ec13aa1d71049d9053217ab0fde0fffe;hpb=dad47fc4c65ec0acbfedc676895833b465d25cd6;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 0a90cac0e..ce6332d93 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -223,27 +223,32 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
 	lue->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
 
 	switch (ev->loglevel_type) {
-	case LTTNG_EVENT_LOGLEVEL:
-		lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL;
+	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_ONLY:
-		lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_ONLY;
+	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);
 		goto error_free_event;
 	}
 
-	/* Copy loglevel name */
-	strncpy(lue->attr.loglevel, ev->loglevel, LTTNG_UST_SYM_NAME_LEN);
-	lue->attr.loglevel[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
 
 	/* 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;