X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.cpp;h=60ae7fe6aa7632057962a1172fc2b571032bc075;hb=dcd24bbf7dbc74e3584d1d0d52715e749023c452;hp=ef4383ff25a67262c2f6d5157422a916d94a9147;hpb=dd7ef1243236f524e57b25baa038973e793d5d72;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.cpp b/src/bin/lttng-sessiond/cmd.cpp
index ef4383ff2..60ae7fe6a 100644
--- a/src/bin/lttng-sessiond/cmd.cpp
+++ b/src/bin/lttng-sessiond/cmd.cpp
@@ -496,16 +496,14 @@ static enum lttng_error_code list_lttng_ust_global_events(char *channel_name,
 		 * We do not care about the filter bytecode and the fd from the
 		 * userspace_probe_location.
 		 */
-		ret = lttng_event_serialize(
-			tmp_event,
-			exclusion_names.size(),
-			exclusion_names.size() ?
-				exclusion_names.data() :
-				nullptr,
-			uevent->filter_expression,
-			0,
-			nullptr,
-			reply_payload);
+		ret = lttng_event_serialize(tmp_event,
+					    exclusion_names.size(),
+					    exclusion_names.size() ? exclusion_names.data() :
+								     nullptr,
+					    uevent->filter_expression,
+					    0,
+					    nullptr,
+					    reply_payload);
 		lttng_event_destroy(tmp_event);
 		if (ret) {
 			ret_code = LTTNG_ERR_FATAL;
@@ -2097,6 +2095,12 @@ static int _cmd_enable_event(struct ltt_session *session,
 		}
 	}
 
+	/* Normalize loglevel value to simplify comparisons. */
+	if (event->loglevel_type == LTTNG_EVENT_LOGLEVEL_ALL) {
+		/* Ignore the user-specified value; it has no meaning. */
+		event->loglevel = -1;
+	}
+
 	DBG("Enable event command for event \'%s\'", event->name);
 
 	lttng::urcu::read_lock_guard read_lock;
@@ -2340,6 +2344,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 		memset(&uevent, 0, sizeof(uevent));
 		uevent.type = LTTNG_EVENT_TRACEPOINT;
 		uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
+		uevent.loglevel = -1;
 		default_event_name = event_get_default_agent_ust_name(domain->type);
 		if (!default_event_name) {
 			ret = LTTNG_ERR_FATAL;