X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=f1707fc76844d76d68d43c85e5da0df645c627ec;hb=f11e84c2c33f6e2f4da8436012bcc61b3291b0d7;hp=69671bd714d1c6854d2303a08e7fe9044a4c5bbc;hpb=46839cc293bbeddbc1a47dbc898ee8f9e2a52a1a;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 69671bd71..f1707fc76 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -144,46 +144,43 @@ const char *enabled_string(int value)
 	}
 }
 
-static
-const char *loglevel_string_pre(int loglevel)
-{
-	if (loglevel == -1) {
-		return "";
-	} else {
-		return " (loglevel: ";
-	}
-}
-
-static
-const char *loglevel_string_post(int loglevel)
-{
-	if (loglevel == -1) {
-		return "";
-	} else {
-		return ")";
-	}
-}
-
 static const char *loglevel_string(int value)
 {
 	switch (value) {
-	case -1: return "";
-	case 0: return "TRACE_EMERG";
-	case 1: return "TRACE_ALERT";
-	case 2: return "TRACE_CRIT";
-	case 3: return "TRACE_ERR";
-	case 4: return "TRACE_WARNING";
-	case 5: return "TRACE_NOTICE";
-	case 6: return "TRACE_INFO";
-	case 7: return "TRACE_DEBUG_SYSTEM";
-	case 8: return "TRACE_DEBUG_PROGRAM";
-	case 9: return "TRACE_DEBUG_PROCESS";
-	case 10: return "TRACE_DEBUG_MODULE";
-	case 11: return "TRACE_DEBUG_UNIT";
-	case 12: return "TRACE_DEBUG_FUNCTION";
-	case 13: return "TRACE_DEBUG_LINE";
-	case 14: return "TRACE_DEBUG";
-	default: return "<<UNKNOWN>>";
+	case -1:
+		return "";
+	case LTTNG_LOGLEVEL_EMERG:
+		return "TRACE_EMERG";
+	case LTTNG_LOGLEVEL_ALERT:
+		return "TRACE_ALERT";
+	case LTTNG_LOGLEVEL_CRIT:
+		return "TRACE_CRIT";
+	case LTTNG_LOGLEVEL_ERR:
+		return "TRACE_ERR";
+	case LTTNG_LOGLEVEL_WARNING:
+		return "TRACE_WARNING";
+	case LTTNG_LOGLEVEL_NOTICE:
+		return "TRACE_NOTICE";
+	case LTTNG_LOGLEVEL_INFO:
+		return "TRACE_INFO";
+	case LTTNG_LOGLEVEL_DEBUG_SYSTEM:
+		return "TRACE_DEBUG_SYSTEM";
+	case LTTNG_LOGLEVEL_DEBUG_PROGRAM:
+		return "TRACE_DEBUG_PROGRAM";
+	case LTTNG_LOGLEVEL_DEBUG_PROCESS:
+		return "TRACE_DEBUG_PROCESS";
+	case LTTNG_LOGLEVEL_DEBUG_MODULE:
+		return "TRACE_DEBUG_MODULE";
+	case LTTNG_LOGLEVEL_DEBUG_UNIT:
+		return "TRACE_DEBUG_UNIT";
+	case LTTNG_LOGLEVEL_DEBUG_FUNCTION:
+		return "TRACE_DEBUG_FUNCTION";
+	case LTTNG_LOGLEVEL_DEBUG_LINE:
+		return "TRACE_DEBUG_LINE";
+	case LTTNG_LOGLEVEL_DEBUG:
+		return "TRACE_DEBUG";
+	default:
+		return "<<UNKNOWN>>";
 	}
 }
 
@@ -195,12 +192,19 @@ static void print_events(struct lttng_event *event)
 	switch (event->type) {
 	case LTTNG_EVENT_TRACEPOINT:
 	{
-		MSG("%s%s%s%s%s (type: tracepoint)%s", indent6,
+		if (event->loglevel != -1) {
+			MSG("%s%s (loglevel: %s (%d)) (type: tracepoint)%s",
+				indent6,
 				event->name,
-				loglevel_string_pre(event->loglevel),
 				loglevel_string(event->loglevel),
-				loglevel_string_post(event->loglevel),
+				event->loglevel,
 				enabled_string(event->enabled));
+		} else {
+			MSG("%s%s (type: tracepoint)%s",
+				indent6,
+				event->name,
+				enabled_string(event->enabled));
+		}
 		break;
 	}
 	case LTTNG_EVENT_PROBE:
@@ -471,6 +475,9 @@ static int list_sessions(const char *session_name)
 	if (count < 0) {
 		ret = count;
 		goto error;
+	} else if (count == 0) {
+		MSG("Currently no available tracing session");
+		goto end;
 	}
 
 	if (session_name == NULL) {
@@ -508,6 +515,7 @@ static int list_sessions(const char *session_name)
 		MSG("\nUse lttng list <session_name> for more details");
 	}
 
+end:
 	return CMD_SUCCESS;
 
 error: