X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=lttng%2Fcommands%2Flist.c;h=4b29d4dc98dced934593c6f1317a6fb1730440d2;hb=81afa345f8c652911c0684bcaa854ca8a1429947;hp=66f365e0162c95929d7c6cb7a684200225b2c55c;hpb=c3919711a7c1c4d723a7fbe68331432dfc767ea0;p=lttng-tools.git

diff --git a/lttng/commands/list.c b/lttng/commands/list.c
index 66f365e01..4b29d4dc9 100644
--- a/lttng/commands/list.c
+++ b/lttng/commands/list.c
@@ -131,6 +131,24 @@ const char *enabled_string(int value)
 	}
 }
 
+static
+const char *loglevel_string_pre(const char *loglevel)
+{
+	if (loglevel[0] == '\0')
+		return "";
+	else
+		return " (loglevel: ";
+}
+
+static
+const char *loglevel_string_post(const char *loglevel)
+{
+	if (loglevel[0] == '\0')
+		return "";
+	else
+		return ")";
+}
+
 /*
  * Pretty print single event.
  */
@@ -138,8 +156,12 @@ static void print_events(struct lttng_event *event)
 {
 	switch (event->type) {
 	case LTTNG_EVENT_TRACEPOINT:
-		MSG("%s%s (type: tracepoint)%s", indent6,
-				event->name, enabled_string(event->enabled));
+		MSG("%s%s%s%s%s (type: tracepoint)%s", indent6,
+				event->name,
+				loglevel_string_pre(event->loglevel),
+				event->loglevel,
+				loglevel_string_post(event->loglevel),
+				enabled_string(event->enabled));
 		break;
 	case LTTNG_EVENT_PROBE:
 		MSG("%s%s (type: probe)%s", indent6,
@@ -165,6 +187,10 @@ static void print_events(struct lttng_event *event)
 		MSG("%s (type: noop)%s", indent6,
 				enabled_string(event->enabled));
 		break;
+	case LTTNG_EVENT_TRACEPOINT_LOGLEVEL:
+		MSG("%s%s (type: tracepoint loglevel)%s", indent6,
+				event->name, enabled_string(event->enabled));
+		break;
 	case LTTNG_EVENT_ALL:
 		/* We should never have "all" events in list. */
 		assert(0);
@@ -279,7 +305,7 @@ static int list_events(const char *channel_name)
 
 	MSG("\n%sEvents:", indent4);
 	if (count == 0) {
-		MSG("%sNone", indent6);
+		MSG("%sNone\n", indent6);
 		goto end;
 	}