X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=50d6114c3d166be10483b71974b6418cf6152494;hp=f7a5c576bc58b63e0bf4e8037551075a3161c78e;hb=d14d33bf091e72b23b1f90ea18a0a01bed098b76;hpb=255a5dabcee8a4b0cfd5062955063110d46f36f4

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index f7a5c576b..50d6114c3 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -1,19 +1,18 @@
 /*
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -144,26 +143,6 @@ 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) {
@@ -212,12 +191,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:
@@ -488,6 +474,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) {
@@ -525,6 +514,7 @@ static int list_sessions(const char *session_name)
 		MSG("\nUse lttng list <session_name> for more details");
 	}
 
+end:
 	return CMD_SUCCESS;
 
 error: