X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Ftrack-untrack.c;h=3073996a9f6d19acfa257e87b1075959a9da3521;hp=3771de5d94b5b7bfcaacf26b0663044cecaac98f;hb=dc1c9a44fba1a368c283186e531c217206f5e816;hpb=38b4ef1b199ddb15db78774a39e9c524ca7e2d24

diff --git a/src/bin/lttng/commands/track-untrack.c b/src/bin/lttng/commands/track-untrack.c
index 3771de5d9..3073996a9 100644
--- a/src/bin/lttng/commands/track-untrack.c
+++ b/src/bin/lttng/commands/track-untrack.c
@@ -87,7 +87,7 @@ int parse_pid_string(const char *_pid_string,
 		goto error;
 	}
 	if (all) {
-		pid_list = zmalloc(sizeof(*_pid_list));
+		pid_list = zmalloc(sizeof(*pid_list));
 		if (!pid_list) {
 			ERR("Out of memory");
 			retval = CMD_ERROR;
@@ -131,6 +131,11 @@ int parse_pid_string(const char *_pid_string,
 		/* For next loop */
 		one_pid_str = strtok_r(NULL, ",", &iter);
 	}
+	if (count == 0) {
+		ERR("Fatal error occurred when parsing pid string");
+		retval = CMD_ERROR;
+		goto error;
+	}
 
 	free(pid_string);
 	/* Identity of delimiter has been lost in first pass. */
@@ -149,7 +154,7 @@ int parse_pid_string(const char *_pid_string,
 		goto error;
 	}
 
-	/* Copy */
+	/* Reparse string and populate the pid list. */
 	count = 0;
 	one_pid_str = strtok_r(pid_string, ",", &iter);
 	while (one_pid_str != NULL) {
@@ -257,8 +262,14 @@ enum cmd_error_code track_untrack_pid(enum cmd_type cmd_type, const char *cmd_st
 				break;
 			}
 		} else {
-			MSG("PID %i %sed in session %s",
-					pid_list[i], cmd_str, session_name);
+			if (pid_list[i] != -1) {
+				MSG("PID %i %sed in session %s",
+						pid_list[i], cmd_str,
+						session_name);
+			} else {
+				MSG("All PIDs %sed in session %s",
+						cmd_str, session_name);
+			}
 			success = 1;
 		}
 
@@ -320,7 +331,7 @@ const char *get_mi_element_command(enum cmd_type cmd_type)
  */
 static
 int cmd_track_untrack(enum cmd_type cmd_type, const char *cmd_str,
-		int argc, const char **argv)
+		int argc, const char **argv, const char *help_msg)
 {
 	int opt, ret = 0;
 	enum cmd_error_code command_ret = CMD_SUCCESS;
@@ -357,7 +368,7 @@ int cmd_track_untrack(enum cmd_type cmd_type, const char *cmd_str,
 
 	ret = print_missing_or_multiple_domains(opt_kernel + opt_userspace);
 	if (ret) {
-		ret = CMD_ERROR;
+		command_ret = CMD_ERROR;
 		goto end;
 	}
 
@@ -454,10 +465,26 @@ end:
 
 int cmd_track(int argc, const char **argv)
 {
-	return cmd_track_untrack(CMD_TRACK, "track", argc, argv);
+	static const char *help_msg =
+#ifdef LTTNG_EMBED_HELP
+#include <lttng-track.1.h>
+#else
+	NULL
+#endif
+	;
+
+	return cmd_track_untrack(CMD_TRACK, "track", argc, argv, help_msg);
 }
 
 int cmd_untrack(int argc, const char **argv)
 {
-	return cmd_track_untrack(CMD_UNTRACK, "untrack", argc, argv);
+	static const char *help_msg =
+#ifdef LTTNG_EMBED_HELP
+#include <lttng-untrack.1.h>
+#else
+	NULL
+#endif
+	;
+
+	return cmd_track_untrack(CMD_UNTRACK, "untrack", argc, argv, help_msg);
 }