X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Flist.c;h=8c1dadac8e5dc66bddebe81d7a564c9fc7c20555;hp=a3d8868b52c6539117c7b5f8f8b07173d5cc18d0;hb=e4baff1ed855ca743e95068ca6449fd906d2d833;hpb=464dd62d5617322366e321877b440951e00a0152

diff --git a/lttng/commands/list.c b/lttng/commands/list.c
index a3d8868b5..8c1dadac8 100644
--- a/lttng/commands/list.c
+++ b/lttng/commands/list.c
@@ -113,8 +113,8 @@ static
 const char *active_string(int value)
 {
 	switch (value) {
-	case 0:	return " [active]";
-	case 1: return " [inactive]";
+	case 0:	return " [inactive]";
+	case 1: return " [active]";
 	case -1: return "";
 	default: return NULL;
 	}
@@ -124,13 +124,33 @@ static
 const char *enabled_string(int value)
 {
 	switch (value) {
-	case 0:	return " [enabled]";
-	case 1: return " [disabled]";
+	case 0:	return " [disabled]";
+	case 1: return " [enabled]";
 	case -1: return "";
 	default: return NULL;
 	}
 }
 
+static
+const char *loglevel_string_pre(const char *loglevel)
+{
+	if (loglevel[0] == '\0') {
+		return "";
+	} else {
+		return " (loglevel: ";
+	}
+}
+
+static
+const char *loglevel_string_post(const char *loglevel)
+{
+	if (loglevel[0] == '\0') {
+		return "";
+	} else {
+		return ")";
+	}
+}
+
 /*
  * Pretty print single event.
  */
@@ -138,9 +158,26 @@ static void print_events(struct lttng_event *event)
 {
 	switch (event->type) {
 	case LTTNG_EVENT_TRACEPOINT:
-		MSG("%s%s (type: tracepoint)%s", indent6,
-				event->name, enabled_string(event->enabled));
+	{
+		char ll_value[LTTNG_SYMBOL_NAME_LEN] = "";
+
+		if (event->loglevel[0] != '\0') {
+			int ret;
+
+			ret = snprintf(ll_value, LTTNG_SYMBOL_NAME_LEN,
+				", %lld", (long long) event->loglevel_value);
+			if (ret < 0)
+				ERR("snprintf error");
+		}
+		MSG("%s%s%s%s%s%s (type: tracepoint)%s", indent6,
+				event->name,
+				loglevel_string_pre(event->loglevel),
+				event->loglevel,
+				ll_value,
+				loglevel_string_post(event->loglevel),
+				enabled_string(event->enabled));
 		break;
+	}
 	case LTTNG_EVENT_PROBE:
 		MSG("%s%s (type: probe)%s", indent6,
 				event->name, enabled_string(event->enabled));
@@ -165,6 +202,11 @@ static void print_events(struct lttng_event *event)
 		MSG("%s (type: noop)%s", indent6,
 				enabled_string(event->enabled));
 		break;
+	case LTTNG_EVENT_TRACEPOINT_LOGLEVEL:
+		MSG("%s%s (type: tracepoint loglevel)%s", indent6,
+			event->name,
+			enabled_string(event->enabled));
+		break;
 	case LTTNG_EVENT_ALL:
 		/* We should never have "all" events in list. */
 		assert(0);
@@ -279,7 +321,7 @@ static int list_events(const char *channel_name)
 
 	MSG("\n%sEvents:", indent4);
 	if (count == 0) {
-		MSG("%sNone", indent6);
+		MSG("%sNone\n", indent6);
 		goto end;
 	}
 
@@ -333,7 +375,7 @@ static int list_channels(const char *channel_name)
 	unsigned int chan_found = 0;
 	struct lttng_channel *channels = NULL;
 
-	DBG("Listing channel(s) (%s)", channel_name);
+	DBG("Listing channel(s) (%s)", channel_name ? : "<all>");
 
 	count = lttng_list_channels(handle, &channels);
 	if (count < 0) {
@@ -482,7 +524,7 @@ error:
 int cmd_list(int argc, const char **argv)
 {
 	int opt, i, ret = CMD_SUCCESS;
-	unsigned int nb_domain;
+	int nb_domain;
 	const char *session_name;
 	static poptContext pc;
 	struct lttng_domain domain;