X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=db993df75d8d15b111fb0f4a6c93a74bd8073c0c;hb=88c5f0d8ee74f6c3a19299e9bb34091247d50d64;hp=8fec91fac30ffe6cab6986ac7e717a75dbf18d36;hpb=0e428499a49b2335f4859058739fa2b20f4c410f;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 8fec91fac..db993df75 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -220,6 +220,17 @@ static void print_events(struct lttng_event *event)
 		}
 		break;
 	}
+	case LTTNG_EVENT_FUNCTION:
+		MSG("%s%s (type: function)%s%s", indent6,
+				event->name, enabled_string(event->enabled),
+				filter_string(event->filter));
+		if (event->attr.probe.addr != 0) {
+			MSG("%saddr: 0x%" PRIx64, indent8, event->attr.probe.addr);
+		} else {
+			MSG("%soffset: 0x%" PRIx64, indent8, event->attr.probe.offset);
+			MSG("%ssymbol: %s", indent8, event->attr.probe.symbol_name);
+		}
+		break;
 	case LTTNG_EVENT_PROBE:
 		MSG("%s%s (type: probe)%s%s", indent6,
 				event->name, enabled_string(event->enabled),
@@ -231,7 +242,6 @@ static void print_events(struct lttng_event *event)
 			MSG("%ssymbol: %s", indent8, event->attr.probe.symbol_name);
 		}
 		break;
-	case LTTNG_EVENT_FUNCTION:
 	case LTTNG_EVENT_FUNCTION_ENTRY:
 		MSG("%s%s (type: function)%s%s", indent6,
 				event->name, enabled_string(event->enabled),
@@ -294,6 +304,7 @@ static int list_ust_events(void)
 	struct lttng_handle *handle;
 	struct lttng_event *event_list;
 	pid_t cur_pid = 0;
+	char *cmdline = NULL;
 
 	memset(&domain, 0, sizeof(domain));
 
@@ -308,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;
 	}
@@ -322,7 +333,9 @@ static int list_ust_events(void)
 	for (i = 0; i < size; i++) {
 		if (cur_pid != event_list[i].pid) {
 			cur_pid = event_list[i].pid;
-			MSG("\nPID: %d - Name: %s", cur_pid, get_cmdline_by_pid(cur_pid));
+			cmdline = get_cmdline_by_pid(cur_pid);
+			MSG("\nPID: %d - Name: %s", cur_pid, cmdline);
+			free(cmdline);
 		}
 		print_events(&event_list[i]);
 	}
@@ -349,6 +362,8 @@ static int list_ust_event_fields(void)
 	struct lttng_handle *handle;
 	struct lttng_event_field *event_field_list;
 	pid_t cur_pid = 0;
+	char *cmdline = NULL;
+
 	struct lttng_event cur_event;
 
 	memset(&domain, 0, sizeof(domain));
@@ -365,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;
 	}
@@ -379,7 +394,9 @@ static int list_ust_event_fields(void)
 	for (i = 0; i < size; i++) {
 		if (cur_pid != event_field_list[i].event.pid) {
 			cur_pid = event_field_list[i].event.pid;
-			MSG("\nPID: %d - Name: %s", cur_pid, get_cmdline_by_pid(cur_pid));
+			cmdline = get_cmdline_by_pid(cur_pid);
+			MSG("\nPID: %d - Name: %s", cur_pid, cmdline);
+			free(cmdline);
 		}
 		if (strcmp(cur_event.name, event_field_list[i].event.name) != 0) {
 			print_events(&event_field_list[i].event);
@@ -424,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;
 	}
@@ -458,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;
 	}
 
@@ -528,6 +546,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;
 	}
@@ -549,7 +568,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) {
@@ -586,6 +605,7 @@ static int list_sessions(const char *session_name)
 	DBG("Session count %d", count);
 	if (count < 0) {
 		ret = count;
+		ERR("%s", lttng_strerror(ret));
 		goto error;
 	} else if (count == 0) {
 		MSG("Currently no available tracing session");
@@ -647,6 +667,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");
@@ -783,6 +804,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;
 			}
 
@@ -793,6 +815,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");