X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=afd7cf0b3172c291046710c621625d465c675c3b;hp=966be2def5e3ac8f300e47ab65e2db149c7c3a21;hb=fceb65dfca20fb1e2071a44ada9fe61384d2b890;hpb=919e300c183678cbaafaa473e9687afeb80995c9

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 966be2def..afd7cf0b3 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -146,6 +146,15 @@ const char *enabled_string(int value)
 	}
 }
 
+static
+const char *filter_string(int value)
+{
+	switch (value) {
+	case 1:	return " [with filter]";
+	default: return "";
+	}
+}
+
 static const char *loglevel_string(int value)
 {
 	switch (value) {
@@ -195,23 +204,26 @@ static void print_events(struct lttng_event *event)
 	case LTTNG_EVENT_TRACEPOINT:
 	{
 		if (event->loglevel != -1) {
-			MSG("%s%s (loglevel: %s (%d)) (type: tracepoint)%s",
+			MSG("%s%s (loglevel: %s (%d)) (type: tracepoint)%s%s",
 				indent6,
 				event->name,
 				loglevel_string(event->loglevel),
 				event->loglevel,
-				enabled_string(event->enabled));
+				enabled_string(event->enabled),
+				filter_string(event->filter));
 		} else {
-			MSG("%s%s (type: tracepoint)%s",
+			MSG("%s%s (type: tracepoint)%s%s",
 				indent6,
 				event->name,
-				enabled_string(event->enabled));
+				enabled_string(event->enabled),
+				filter_string(event->filter));
 		}
 		break;
 	}
 	case LTTNG_EVENT_PROBE:
-		MSG("%s%s (type: probe)%s", indent6,
-				event->name, enabled_string(event->enabled));
+		MSG("%s%s (type: probe)%s%s", indent6,
+				event->name, enabled_string(event->enabled),
+				filter_string(event->filter));
 		if (event->attr.probe.addr != 0) {
 			MSG("%saddr: 0x%" PRIx64, indent8, event->attr.probe.addr);
 		} else {
@@ -221,17 +233,20 @@ static void print_events(struct lttng_event *event)
 		break;
 	case LTTNG_EVENT_FUNCTION:
 	case LTTNG_EVENT_FUNCTION_ENTRY:
-		MSG("%s%s (type: function)%s", indent6,
-				event->name, enabled_string(event->enabled));
+		MSG("%s%s (type: function)%s%s", indent6,
+				event->name, enabled_string(event->enabled),
+				filter_string(event->filter));
 		MSG("%ssymbol: \"%s\"", indent8, event->attr.ftrace.symbol_name);
 		break;
 	case LTTNG_EVENT_SYSCALL:
-		MSG("%ssyscalls (type: syscall)%s", indent6,
-				enabled_string(event->enabled));
+		MSG("%ssyscalls (type: syscall)%s%s", indent6,
+				enabled_string(event->enabled),
+				filter_string(event->filter));
 		break;
 	case LTTNG_EVENT_NOOP:
-		MSG("%s (type: noop)%s", indent6,
-				enabled_string(event->enabled));
+		MSG("%s (type: noop)%s%s", indent6,
+				enabled_string(event->enabled),
+				filter_string(event->filter));
 		break;
 	case LTTNG_EVENT_ALL:
 		/* We should never have "all" events in list. */