X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=efba35e865a60162f08a8591ce938cc44591381d;hp=ccbb5b419359414aa626622bd64cc08535f36a26;hb=7d8829fd67c56102436f3e1e16d652f23076ed86;hpb=890d8fe47755c3bad936389cf48ffa141cff41c9

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index ccbb5b419..efba35e86 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -166,12 +166,9 @@ const char *enabled_string(int value)
 }
 
 static
-const char *filter_string(int value)
+const char *filter_message(const char *filter_msg)
 {
-	switch (value) {
-	case 1:	return " [with filter]";
-	default: return "";
-	}
+	return filter_msg ? filter_msg : "";
 }
 
 static
@@ -217,6 +214,25 @@ static const char *bitness_event(enum lttng_event_flag flags)
  */
 static void print_events(struct lttng_event *event)
 {
+	int ret;
+	const char *filter_str;
+	char *filter_msg = NULL;
+
+	ret = lttng_event_get_filter_string(event, &filter_str);
+
+	if (ret) {
+		filter_msg = strdup(" [failed to retrieve filter]");
+	} else if (filter_str) {
+		const char * const filter_fmt = " [filter: '%s']";
+
+		filter_msg = malloc(strlen(filter_str) +
+				strlen(filter_fmt) + 1);
+		if (filter_msg) {
+			sprintf(filter_msg, filter_fmt,
+					filter_str);
+		}
+	}
+
 	switch (event->type) {
 	case LTTNG_EVENT_TRACEPOINT:
 	{
@@ -229,21 +245,21 @@ static void print_events(struct lttng_event *event)
 				event->loglevel,
 				enabled_string(event->enabled),
 				exclusion_string(event->exclusion),
-				filter_string(event->filter));
+				filter_message(filter_msg));
 		} else {
 			MSG("%s%s (type: tracepoint)%s%s%s",
 				indent6,
 				event->name,
 				enabled_string(event->enabled),
 				exclusion_string(event->exclusion),
-				filter_string(event->filter));
+				filter_message(filter_msg));
 		}
 		break;
 	}
 	case LTTNG_EVENT_FUNCTION:
 		MSG("%s%s (type: function)%s%s", indent6,
 				event->name, enabled_string(event->enabled),
-				filter_string(event->filter));
+				filter_message(filter_msg));
 		if (event->attr.probe.addr != 0) {
 			MSG("%saddr: 0x%" PRIx64, indent8, event->attr.probe.addr);
 		} else {
@@ -254,7 +270,7 @@ static void print_events(struct lttng_event *event)
 	case LTTNG_EVENT_PROBE:
 		MSG("%s%s (type: probe)%s%s", indent6,
 				event->name, enabled_string(event->enabled),
-				filter_string(event->filter));
+				filter_message(filter_msg));
 		if (event->attr.probe.addr != 0) {
 			MSG("%saddr: 0x%" PRIx64, indent8, event->attr.probe.addr);
 		} else {
@@ -265,7 +281,7 @@ static void print_events(struct lttng_event *event)
 	case LTTNG_EVENT_FUNCTION_ENTRY:
 		MSG("%s%s (type: function)%s%s", indent6,
 				event->name, enabled_string(event->enabled),
-				filter_string(event->filter));
+				filter_message(filter_msg));
 		MSG("%ssymbol: \"%s\"", indent8, event->attr.ftrace.symbol_name);
 		break;
 	case LTTNG_EVENT_SYSCALL:
@@ -277,13 +293,15 @@ static void print_events(struct lttng_event *event)
 	case LTTNG_EVENT_NOOP:
 		MSG("%s (type: noop)%s%s", indent6,
 				enabled_string(event->enabled),
-				filter_string(event->filter));
+				filter_message(filter_msg));
 		break;
 	case LTTNG_EVENT_ALL:
 		/* We should never have "all" events in list. */
 		assert(0);
 		break;
 	}
+
+	free(filter_msg);
 }
 
 static const char *field_type(struct lttng_event_field *field)
@@ -984,21 +1002,42 @@ static int list_session_agent_events(void)
 		}
 
 		for (i = 0; i < count; i++) {
-			if (events[i].loglevel_type !=
+			const char *filter_str;
+			char *filter_msg = NULL;
+			struct lttng_event *event = &events[i];
+
+			ret = lttng_event_get_filter_string(event, &filter_str);
+			if (ret) {
+				filter_msg = strdup(" [failed to retrieve filter]");
+			} else if (filter_str) {
+				const char * const filter_fmt =
+						" [filter: '%s']";
+
+				filter_msg = malloc(strlen(filter_str) +
+						strlen(filter_fmt) + 1);
+				if (filter_msg) {
+					sprintf(filter_msg, " [filter: '%s']",
+						filter_str);
+				}
+			}
+
+			if (event->loglevel_type !=
 					LTTNG_EVENT_LOGLEVEL_ALL) {
-				MSG("%s- %s%s (loglevel%s %s)", indent4,
-						events[i].name,
-						enabled_string(
-							events[i].enabled),
+				MSG("%s- %s%s (loglevel%s %s)%s", indent4,
+						event->name,
+						enabled_string(event->enabled),
 						logleveltype_string(
-							events[i].loglevel_type),
+							event->loglevel_type),
 						mi_lttng_loglevel_string(
-							events[i].loglevel,
-							handle->domain.type));
+							event->loglevel,
+							handle->domain.type),
+						filter_message(filter_msg));
 			} else {
-				MSG("%s- %s%s", indent4, events[i].name,
-				    enabled_string(events[i].enabled));
+				MSG("%s- %s%s%s", indent4, event->name,
+						enabled_string(event->enabled),
+						filter_message(filter_msg));
 			}
+			free(filter_msg);
 		}
 
 		MSG("");