X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=0467cc6ba32d6afc828bcaeec34e31c0b58ed416;hp=826cef269f088164595e30240f9fd537c1db0dbe;hb=590b9e3c8fdaf2912d5919244a475f0e2f32f1b5;hpb=f37d259d342af1ff8855d9eaa578cb7a3cfcc4f2

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 826cef269..0467cc6ba 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. */
@@ -265,8 +280,8 @@ static void print_event_field(struct lttng_event_field *field)
 	if (!field->field_name[0]) {
 		return;
 	}
-	MSG("%sfield: %s (%s)", indent6, field->field_name,
-		field_type(field));
+	MSG("%sfield: %s (%s)%s", indent8, field->field_name,
+		field_type(field), field->nowrite ? "" : " [no write]");
 }
 
 /*