X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=280f9ddf7368141b6fd3da8e735c082f9e4bf613;hb=e78de861055e6288d11348866681d1373ed81aec;hp=afd7cf0b3172c291046710c621625d465c675c3b;hpb=fceb65dfca20fb1e2071a44ada9fe61384d2b890;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index afd7cf0b3..280f9ddf7 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),
@@ -280,8 +290,8 @@ static void print_event_field(struct lttng_event_field *field)
 	if (!field->field_name[0]) {
 		return;
 	}
-	MSG("%sfield: %s (%s)", indent8, field->field_name,
-		field_type(field));
+	MSG("%sfield: %s (%s)%s", indent8, field->field_name,
+		field_type(field), field->nowrite ? " [no write]" : "");
 }
 
 /*
@@ -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;
 	}
 
@@ -474,9 +492,7 @@ static int list_events(const char *channel_name)
 	MSG("");
 
 end:
-	if (events) {
-		free(events);
-	}
+	free(events);
 	ret = CMD_SUCCESS;
 
 error:
@@ -491,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);
@@ -521,11 +541,18 @@ static int list_channels(const char *channel_name)
 
 	count = lttng_list_channels(handle, &channels);
 	if (count < 0) {
-		ret = count;
+		switch (-count) {
+		case LTTNG_ERR_KERN_CHAN_NOT_FOUND:
+			ret = CMD_SUCCESS;
+			WARN("No kernel channel");
+			break;
+		default:
+			/* We had a real error */
+			ret = count;
+			ERR("%s", lttng_strerror(ret));
+			break;
+		}
 		goto error_channels;
-	} else if (count == 0) {
-		ERR("Channel %s not found", channel_name);
-		goto error;
 	}
 
 	if (channel_name == NULL) {
@@ -545,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) {
@@ -582,6 +609,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");
@@ -643,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");
@@ -674,8 +703,7 @@ error:
  */
 int cmd_list(int argc, const char **argv)
 {
-	int opt, i, ret = CMD_SUCCESS;
-	int nb_domain;
+	int opt, ret = CMD_SUCCESS;
 	const char *session_name;
 	static poptContext pc;
 	struct lttng_domain domain;
@@ -739,6 +767,7 @@ int cmd_list(int argc, const char **argv)
 		if (opt_kernel) {
 			ret = list_kernel_events();
 			if (ret < 0) {
+				ret = CMD_ERROR;
 				goto end;
 			}
 		}
@@ -749,6 +778,7 @@ int cmd_list(int argc, const char **argv)
 				ret = list_ust_events();
 			}
 			if (ret < 0) {
+				ret = CMD_ERROR;
 				goto end;
 			}
 		}
@@ -772,10 +802,13 @@ int cmd_list(int argc, const char **argv)
 				goto end;
 			}
 		} else {
+			int i, nb_domain;
+
 			/* We want all domain(s) */
 			nb_domain = lttng_list_domains(session_name, &domains);
 			if (nb_domain < 0) {
 				ret = nb_domain;
+				ERR("%s", lttng_strerror(ret));
 				goto end;
 			}
 
@@ -786,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");
@@ -812,9 +848,7 @@ int cmd_list(int argc, const char **argv)
 	}
 
 end:
-	if (domains) {
-		free(domains);
-	}
+	free(domains);
 	if (handle) {
 		lttng_destroy_handle(handle);
 	}