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 620ff4ca947a5a9c1b439b670fe98821c28fb279..942374cd5b2336a10369ae12c12e552e1c815db6 100644 (file)
--- 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 aa6a3bca8bd911becfce5db02c567ec74aa5cd93..5329bcb8fd60c06e698e38fa4fff1a7cbd073a55 100644 (file)
--- 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 a129c8126f8146950c858b70b74c28e5492b3a84..82da219d58f12c616a4ba032e87519313f8611f0 100644 (file)
--- 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"