X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=d7970a8b9ab2e0a2553ef5475d66fbc3ebd7d460;hb=4cd7fd8e6b1c3a7903107ee5eba761a0d15a4241;hp=08518dc0ca26ba0436a970c58ac38ce39b768341;hpb=2f785fe7ec15872168aeff467103d3b39c02a46c;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 08518dc0c..d7970a8b9 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <assert.h>
 
+#include <lttng/constant.h>
 #include "../command.h"
 
 static int opt_userspace;
@@ -107,7 +108,8 @@ static char *get_cmdline_by_pid(pid_t pid)
 	int ret;
 	FILE *fp;
 	char *cmdline = NULL;
-	char path[24];	/* 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");
@@ -116,7 +118,11 @@ 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;
+	}
 	ret = fread(cmdline, 1, PATH_MAX, fp);
 	if (ret < 0) {
 		perror("fread proc list");
@@ -177,6 +183,34 @@ const char *exclusion_string(int value)
 	}
 }
 
+static const char *loglevel_jul_string(int value)
+{
+	switch (value) {
+	case -1:
+		return "";
+	case LTTNG_LOGLEVEL_JUL_OFF:
+		return "JUL_OFF";
+	case LTTNG_LOGLEVEL_JUL_SEVERE:
+		return "JUL_SEVERE";
+	case LTTNG_LOGLEVEL_JUL_WARNING:
+		return "JUL_WARNING";
+	case LTTNG_LOGLEVEL_JUL_INFO:
+		return "JUL_INFO";
+	case LTTNG_LOGLEVEL_JUL_CONFIG:
+		return "JUL_CONFIG";
+	case LTTNG_LOGLEVEL_JUL_FINE:
+		return "JUL_FINE";
+	case LTTNG_LOGLEVEL_JUL_FINER:
+		return "JUL_FINER";
+	case LTTNG_LOGLEVEL_JUL_FINEST:
+		return "JUL_FINEST";
+	case LTTNG_LOGLEVEL_JUL_ALL:
+		return "JUL_ALL";
+	default:
+		return "<<UNKNOWN>>";
+	}
+}
+
 static const char *loglevel_string(int value)
 {
 	switch (value) {
@@ -583,8 +617,10 @@ static int list_session_jul_events(void)
 	}
 
 	for (i = 0; i < count; i++) {
-		MSG("%s- %s%s", indent4, events[i].name,
-				enabled_string(events[i].enabled));
+		MSG("%s- %s%s (loglevel%s %s)", indent4, events[i].name,
+				enabled_string(events[i].enabled),
+				logleveltype_string(events[i].loglevel_type),
+				loglevel_jul_string(events[i].loglevel));
 	}
 
 	MSG("");
@@ -686,7 +722,7 @@ static int list_channels(const char *channel_name)
 		goto error_channels;
 	}
 
-	if (channel_name == NULL) {
+	if (count) {
 		MSG("Channels:\n-------------");
 	}