X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=1b89ef642f797f92d7fbc758a4f3fcb0768fd5e6;hp=18ae026c29e9eeb77010b8d1a1cb15cd4327e2d6;hb=4adbcc726eda1a14966e9f9ea7c0381a048ae8f6;hpb=bf239d4cf83c083459c7672ac8a1965108bacca6

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 18ae026c2..1b89ef642 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -15,7 +15,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <inttypes.h>
 #include <popt.h>
@@ -167,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
@@ -218,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:
 	{
@@ -230,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 {
@@ -255,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 {
@@ -266,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:
@@ -278,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)
@@ -493,7 +510,7 @@ static int list_ust_events(void)
 	int i, size, ret = CMD_SUCCESS;
 	struct lttng_domain domain;
 	struct lttng_handle *handle;
-	struct lttng_event *event_list;
+	struct lttng_event *event_list = NULL;
 	pid_t cur_pid = 0;
 	char *cmdline = NULL;
 
@@ -1855,7 +1872,8 @@ int cmd_list(int argc, const char **argv)
 					if (ret) {
 						goto end;
 					}
-					continue;
+
+					goto next_domain;
 				}
 
 				switch (domains[i].type) {
@@ -1875,6 +1893,7 @@ int cmd_list(int argc, const char **argv)
 					goto end;
 				}
 
+next_domain:
 				if (lttng_opt_mi) {
 					/* Close domain element */
 					ret = mi_lttng_writer_close_element(writer);