From: Sebastien GODARD <sysstat@users.noreply.github.com>
Date: Wed, 23 Nov 2016 10:24:12 +0000 (+0100)
Subject: sar/mpstat: Update help and usage messages
X-Git-Tag: v11.5.3~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91fa1cb0787b7e034e0646e0eca5a265550b44a1;p=sysstat

sar/mpstat: Update help and usage messages

Tell that a cpu or interrupts list can be entered with options -I and
-P.
Keyword XALL no longer exists with sar's option -I.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
---

diff --git a/mpstat.c b/mpstat.c
index 620ff4c..942374c 100644
--- a/mpstat.c
+++ b/mpstat.c
@@ -100,7 +100,7 @@ void usage(char *progname)
 
 	fprintf(stderr, _("Options are:\n"
 			  "[ -A ] [ -u ] [ -V ] [ -I { SUM | CPU | SCPU | ALL } ]\n"
-			  "[ -o JSON ] [ -P { <cpu> [,...] | ON | ALL } ]\n"));
+			  "[ -o JSON ] [ -P { <cpu_list> | ON | ALL } ]\n"));
 	exit(1);
 }
 
diff --git a/sa_common.c b/sa_common.c
index aa6a3bc..5329bcb 100644
--- a/sa_common.c
+++ b/sa_common.c
@@ -1561,7 +1561,7 @@ int parse_sar_opt(char *argv[], int *opt, struct activity *act[],
 			select_all_activities(act);
 
 			/*
-			 * Force '-P ALL -I XALL -r ALL -u ALL -F'.
+			 * Force '-P ALL -I ALL -r ALL -u ALL -F'.
 			 * Setting -F is compulsory because corresponding activity
 			 * has AO_MULTIPLE_OUTPUTS flag set.
 			 */
diff --git a/sar.c b/sar.c
index a129c81..82da219 100644
--- a/sar.c
+++ b/sar.c
@@ -112,7 +112,7 @@ void usage(char *progname)
 			  "[ -A ] [ -B ] [ -b ] [ -C ] [ -D ] [ -d ] [ -F [ MOUNT ] ] [ -H ] [ -h ]\n"
 			  "[ -p ] [ -q ] [ -R ] [ -r [ ALL ] ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -V ]\n"
 			  "[ -v ] [ -W ] [ -w ] [ -y ] [ --human ] [ --sadc ]\n"
-			  "[ -I { <int> [,...] | SUM | ALL | XALL } ] [ -P { <cpu> [,...] | ALL } ]\n"
+			  "[ -I { <int_list> | SUM | ALL } ] [ -P { <cpu_list> | ALL } ]\n"
 			  "[ -m { <keyword> [,...] | ALL } ] [ -n { <keyword> [,...] | ALL } ]\n"
 			  "[ -j { ID | LABEL | PATH | UUID | ... } ]\n"
 			  "[ -f [ <filename> ] | -o [ <filename> ] | -[0-9]+ ]\n"
@@ -138,7 +138,7 @@ void display_help(char *progname)
 	printf(_("\t-F [ MOUNT ]\n"));
 	printf(_("\t\tFilesystems statistics\n"));
 	printf(_("\t-H\tHugepages utilization statistics\n"));
-	printf(_("\t-I { <int> | SUM | ALL | XALL }\n"
+	printf(_("\t-I { <int_list> | SUM | ALL }\n"
 		 "\t\tInterrupts statistics\n"));
 	printf(_("\t-m { <keyword> [,...] | ALL }\n"
 		 "\t\tPower management statistics\n"