X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=6677e4c4e1401767821cf62942b1ce146f3683c4;hb=8f3f773f82cf4ce088d7bee098b549b5567d77f8;hp=696e80e7f2c9a8bfd3e54de5c4caba0024e68b84;hpb=45a32634662c4b3f411deaf7380c89bf3b6e4a59;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 696e80e7f..6677e4c4e 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -294,6 +294,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));
 
@@ -322,7 +323,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 +352,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));
@@ -379,7 +384,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);
@@ -474,9 +481,7 @@ static int list_events(const char *channel_name)
 	MSG("");
 
 end:
-	if (events) {
-		free(events);
-	}
+	free(events);
 	ret = CMD_SUCCESS;
 
 error:
@@ -521,11 +526,17 @@ 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));
+		}
 		goto error_channels;
-	} else if (count == 0) {
-		ERR("Channel %s not found", channel_name);
-		goto error;
 	}
 
 	if (channel_name == NULL) {
@@ -582,6 +593,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");
@@ -674,8 +686,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 +750,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 +761,7 @@ int cmd_list(int argc, const char **argv)
 				ret = list_ust_events();
 			}
 			if (ret < 0) {
+				ret = CMD_ERROR;
 				goto end;
 			}
 		}
@@ -772,6 +785,8 @@ 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) {
@@ -812,9 +827,7 @@ int cmd_list(int argc, const char **argv)
 	}
 
 end:
-	if (domains) {
-		free(domains);
-	}
+	free(domains);
 	if (handle) {
 		lttng_destroy_handle(handle);
 	}