X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=ccbb5b419359414aa626622bd64cc08535f36a26;hb=502bbe892dc4cc5e105293cc774942a13170c098;hp=f43ee167ab535fd190fbedc75b60db7e8ebc5381;hpb=ebbf5ab7ebfa3774d5ca1a26d63013384f7e1407;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index f43ee167a..ccbb5b419 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>
@@ -340,8 +339,8 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count,
 		goto end;
 	}
 
-	/* Open processes element */
-	ret = mi_lttng_processes_open(writer);
+	/* Open pids element element */
+	ret = mi_lttng_pids_open(writer);
 	if (ret) {
 		goto end;
 	}
@@ -366,7 +365,7 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count,
 
 			if (!pid_element_open) {
 				/* Open and write a pid element */
-				ret = mi_lttng_process(writer, cur_pid, cmdline, 1);
+				ret = mi_lttng_pid(writer, cur_pid, cmdline, 1);
 				if (ret) {
 					goto error;
 				}
@@ -389,7 +388,7 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count,
 		}
 	}
 
-	/* Close processes */
+	/* Close pids */
 	ret = mi_lttng_writer_close_element(writer);
 	if (ret) {
 		goto end;
@@ -493,7 +492,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;
 
@@ -577,8 +576,8 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
 		goto end;
 	}
 
-	/* Open processes element */
-	ret = mi_lttng_processes_open(writer);
+	/* Open pids element */
+	ret = mi_lttng_pids_open(writer);
 	if (ret) {
 		goto end;
 	}
@@ -606,8 +605,8 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
 			cur_pid = fields[i].event.pid;
 			cmdline = get_cmdline_by_pid(cur_pid);
 			if (!pid_element_open) {
-				/* Open and write a process element */
-				ret = mi_lttng_process(writer, cur_pid, cmdline, 1);
+				/* Open and write a pid element */
+				ret = mi_lttng_pid(writer, cur_pid, cmdline, 1);
 				if (ret) {
 					goto error;
 				}
@@ -661,7 +660,7 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
 		}
 	}
 
-	/* Close processes, domain, domains */
+	/* Close pid, domain, domains */
 	ret = mi_lttng_close_multi_element(writer, 3);
 end:
 	return ret;
@@ -985,11 +984,21 @@ static int list_session_agent_events(void)
 		}
 
 		for (i = 0; i < count; i++) {
-			MSG("%s- %s%s (loglevel%s %s)", indent4, events[i].name,
-					enabled_string(events[i].enabled),
-					logleveltype_string(events[i].loglevel_type),
-					mi_lttng_loglevel_string(events[i].loglevel,
-						handle->domain.type));
+			if (events[i].loglevel_type !=
+					LTTNG_EVENT_LOGLEVEL_ALL) {
+				MSG("%s- %s%s (loglevel%s %s)", indent4,
+						events[i].name,
+						enabled_string(
+							events[i].enabled),
+						logleveltype_string(
+							events[i].loglevel_type),
+						mi_lttng_loglevel_string(
+							events[i].loglevel,
+							handle->domain.type));
+			} else {
+				MSG("%s- %s%s", indent4, events[i].name,
+				    enabled_string(events[i].enabled));
+			}
 		}
 
 		MSG("");
@@ -1845,7 +1854,8 @@ int cmd_list(int argc, const char **argv)
 					if (ret) {
 						goto end;
 					}
-					continue;
+
+					goto next_domain;
 				}
 
 				switch (domains[i].type) {
@@ -1865,6 +1875,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);