X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=dba08bea16fd8080a76970f284bb712a99a27efa;hb=e86cd8cd7bea21b59a264d0760c3726d4f0eff43;hp=a26ec064197c123356c24c0be07db2f9cc6f6d54;hpb=9ad71f160a52276c878b984956e4fda76dcb1982;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index a26ec0641..dba08bea1 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -24,6 +24,7 @@
 #include <assert.h>
 
 #include <common/mi-lttng.h>
+#include <lttng/constant.h>
 
 #include "../command.h"
 
@@ -116,7 +117,8 @@ static char *get_cmdline_by_pid(pid_t pid)
 	int ret;
 	FILE *fp = NULL;
 	char *cmdline = NULL;
-	char path[20];	/* Can't go bigger than /proc/65535/cmdline */
+	/* Can't go bigger than /proc/LTTNG_MAX_PID/cmdline */
+	char path[sizeof("/proc//cmdline") + sizeof(LTTNG_MAX_PID_STR) - 1];
 
 	snprintf(path, sizeof(path), "/proc/%d/cmdline", pid);
 	fp = fopen(path, "r");
@@ -125,7 +127,7 @@ static char *get_cmdline_by_pid(pid_t pid)
 	}
 
 	/* Caller must free() *cmdline */
-	cmdline = malloc(PATH_MAX);
+	cmdline = zmalloc(PATH_MAX);
 	if (!cmdline) {
 		perror("malloc cmdline");
 		goto end;
@@ -234,7 +236,7 @@ static void print_events(struct lttng_event *event)
 				indent6,
 				event->name,
 				logleveltype_string(event->loglevel_type),
-				mi_lttng_loglevel_string(event->loglevel),
+				mi_lttng_loglevel_string(event->loglevel, handle->domain.type),
 				event->loglevel,
 				enabled_string(event->enabled),
 				exclusion_string(event->exclusion),
@@ -391,7 +393,7 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count,
 		}
 
 		/* Write an event */
-		ret = mi_lttng_event(writer, &events[i], 0);
+		ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
 		if (ret) {
 			goto end;
 		}
@@ -641,7 +643,8 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
 
 			if (!event_element_open) {
 				/* Open and write the event */
-				ret = mi_lttng_event(writer, &cur_event, 1);
+				ret = mi_lttng_event(writer, &cur_event, 1,
+						handle->domain.type);
 				if (ret) {
 					goto end;
 				}
@@ -779,7 +782,7 @@ static int mi_list_kernel_events(struct lttng_event *events, int count,
 	}
 
 	for (i = 0; i < count; i++) {
-		ret = mi_lttng_event(writer, &events[i], 0);
+		ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
 		if (ret) {
 			goto end;
 		}
@@ -867,7 +870,7 @@ static int mi_list_syscalls(struct lttng_event *events, int count)
 	}
 
 	for (i = 0; i < count; i++) {
-		ret = mi_lttng_event(writer, &events[i], 0);
+		ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
 		if (ret) {
 			goto end;
 		}
@@ -940,7 +943,7 @@ static int mi_list_session_agent_events(struct lttng_event *events, int count)
 	}
 
 	for (i = 0; i < count; i++) {
-		ret = mi_lttng_event(writer, &events[i], 0);
+		ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
 		if (ret) {
 			goto end;
 		}
@@ -989,7 +992,8 @@ static int list_session_agent_events(void)
 			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));
+					mi_lttng_loglevel_string(events[i].loglevel,
+						handle->domain.type));
 		}
 
 		MSG("");
@@ -1016,7 +1020,7 @@ static int mi_list_events(struct lttng_event *events, int count)
 	}
 
 	for (i = 0; i < count; i++) {
-		ret = mi_lttng_event(writer, &events[i], 0);
+		ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
 		if (ret) {
 			goto end;
 		}
@@ -1200,7 +1204,7 @@ static int list_channels(const char *channel_name)
 		}
 	} else {
 		/* Pretty print */
-		if (channel_name == NULL) {
+		if (count) {
 			MSG("Channels:\n-------------");
 		}