X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=280f9ddf7368141b6fd3da8e735c082f9e4bf613;hb=e78de861055e6288d11348866681d1373ed81aec;hp=b7c2b6c2263cdae040bedd6ccc4e4527ff47fdd2;hpb=1896972b00c0158cb09eb356e3f54fda9900950a;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index b7c2b6c22..280f9ddf7 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -319,7 +319,7 @@ static int list_ust_events(void)
 
 	size = lttng_list_tracepoints(handle, &event_list);
 	if (size < 0) {
-		ERR("Unable to list UST events");
+		ERR("Unable to list UST events: %s", lttng_strerror(size));
 		lttng_destroy_handle(handle);
 		return size;
 	}
@@ -380,7 +380,7 @@ static int list_ust_event_fields(void)
 
 	size = lttng_list_tracepoint_fields(handle, &event_field_list);
 	if (size < 0) {
-		ERR("Unable to list UST event fields");
+		ERR("Unable to list UST event fields: %s", lttng_strerror(size));
 		lttng_destroy_handle(handle);
 		return size;
 	}
@@ -441,7 +441,7 @@ static int list_kernel_events(void)
 
 	size = lttng_list_tracepoints(handle, &event_list);
 	if (size < 0) {
-		ERR("Unable to list kernel events");
+		ERR("Unable to list kernel events: %s", lttng_strerror(size));
 		lttng_destroy_handle(handle);
 		return size;
 	}
@@ -475,6 +475,7 @@ static int list_events(const char *channel_name)
 	count = lttng_list_events(handle, channel_name, &events);
 	if (count < 0) {
 		ret = count;
+		ERR("%s", lttng_strerror(ret));
 		goto error;
 	}
 
@@ -506,11 +507,15 @@ static void print_channel(struct lttng_channel *channel)
 	MSG("- %s:%s\n", channel->name, enabled_string(channel->enabled));
 
 	MSG("%sAttributes:", indent4);
-	MSG("%soverwrite mode: %d", indent6, channel->attr.overwrite);
-	MSG("%ssubbufers size: %" PRIu64, indent6, channel->attr.subbuf_size);
+	MSG("%swrite mode: %s", indent6,
+			channel->attr.overwrite == 0 ? "discard" : "overwrite");
+	MSG("%ssubbufers size: %" PRIu64 " bytes", indent6,
+			channel->attr.subbuf_size);
 	MSG("%snumber of subbufers: %" PRIu64, indent6, channel->attr.num_subbuf);
-	MSG("%sswitch timer interval: %u", indent6, channel->attr.switch_timer_interval);
-	MSG("%sread timer interval: %u", indent6, channel->attr.read_timer_interval);
+	MSG("%sswitch timer interval: %u usec", indent6,
+			channel->attr.switch_timer_interval);
+	MSG("%sread timer interval: %u usec", indent6,
+			channel->attr.read_timer_interval);
 	switch (channel->attr.output) {
 		case LTTNG_EVENT_SPLICE:
 			MSG("%soutput: splice()", indent6);
@@ -545,6 +550,7 @@ static int list_channels(const char *channel_name)
 			/* We had a real error */
 			ret = count;
 			ERR("%s", lttng_strerror(ret));
+			break;
 		}
 		goto error_channels;
 	}
@@ -566,7 +572,7 @@ static int list_channels(const char *channel_name)
 		/* Listing events per channel */
 		ret = list_events(channels[i].name);
 		if (ret < 0) {
-			MSG("%s", lttng_strerror(ret));
+			ERR("%s", lttng_strerror(ret));
 		}
 
 		if (chan_found) {
@@ -665,6 +671,7 @@ static int list_domains(const char *session_name)
 	count = lttng_list_domains(session_name, &domains);
 	if (count < 0) {
 		ret = count;
+		ERR("%s", lttng_strerror(ret));
 		goto error;
 	} else if (count == 0) {
 		MSG("  None");
@@ -801,6 +808,7 @@ int cmd_list(int argc, const char **argv)
 			nb_domain = lttng_list_domains(session_name, &domains);
 			if (nb_domain < 0) {
 				ret = nb_domain;
+				ERR("%s", lttng_strerror(ret));
 				goto end;
 			}
 
@@ -811,6 +819,9 @@ int cmd_list(int argc, const char **argv)
 					break;
 				case LTTNG_DOMAIN_UST:
 					MSG("=== Domain: UST global ===\n");
+					MSG("Buffer type: %s\n",
+							domains[i].buf_type ==
+							LTTNG_BUFFER_PER_PID ? "per PID" : "per UID");
 					break;
 				default:
 					MSG("=== Domain: Unimplemented ===\n");