From: Sebastien GODARD <sysstat@users.noreply.github.com>
Date: Sun, 11 Sep 2022 14:57:48 +0000 (+0200)
Subject: Merge branch 'ObiWahn-master'
X-Git-Tag: v12.7.1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19d759052d41f2141e804f630fadfec665960097;p=sysstat

Merge branch 'ObiWahn-master'

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

19d759052d41f2141e804f630fadfec665960097
diff --cc man/sar.in
index 46bc7ec,150be01..b266c21
--- a/man/sar.in
+++ b/man/sar.in
@@@ -1,5 -1,5 +1,5 @@@
  .\" sar manual page - (C) 1999-2022 Sebastien Godard (sysstat <at> orange.fr)
--.TH SAR 1 "AUGUST 2022" Linux "Linux User's Manual" -*- nroff -*-
++.TH SAR 1 "SEPTEMBER 2022" Linux "Linux User's Manual" -*- nroff -*-
  .SH NAME
  sar \- Collect, report, or save system activity information.
  
@@@ -1650,10 -1650,10 +1650,10 @@@ The timestamp will also be compliant wi
  .B sar -u 2 5
  Report CPU utilization for each 2 seconds. 5 lines are displayed.
  .TP
- .B sar -I 14 -o int14.file 2 10
 -.B sar -I ALL -o int_all.file 2 10
++.B sar -I --int=14 -o int14.file 2 10
  Report statistics on IRQ 14 for each 2 seconds. 10 lines are displayed.
  Data are stored in a file called
 -.IR "int_all.file" "."
 +.IR "int14.file" "."
  .TP
  .B sar -r -n DEV -f @SA_DIR@/sa16
  .RI "Display memory and network statistics saved in daily data file " "sa16" "."
diff --cc sar.c
index 1335e13,5b9beac..ee9b97e
--- a/sar.c
+++ b/sar.c
@@@ -123,7 -123,7 +123,7 @@@ void usage(char *progname
  			  "[ -A ] [ -B ] [ -b ] [ -C ] [ -D ] [ -d ] [ -F [ MOUNT ] ] [ -H ] [ -h ]\n"
  			  "[ -p ] [ -r [ ALL ] ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -V ]\n"
  			  "[ -v ] [ -W ] [ -w ] [ -y ] [ -z ]\n"
- 			  "[ -I { <int_list> | SUM | ALL } ] [ -P { <cpu_list> | ALL } ]\n"
 -			  "[ -I { SUM | ALL } ] [ -P { <cpu_list> | ALL } ]\n"
++			  "[ -I [ SUM | ALL ] ] [ -P { <cpu_list> | ALL } ]\n"
  			  "[ -m { <keyword> [,...] | ALL } ] [ -n { <keyword> [,...] | ALL } ]\n"
  			  "[ -q [ <keyword> [,...] | ALL ] ]\n"
  			  "[ --dev=<dev_list> ] [ --fs=<fs_list> ] [ --iface=<iface_list> ] "
@@@ -153,7 -153,7 +153,7 @@@ void display_help(char *progname
  	printf(_("\t-F [ MOUNT ]\n"));
  	printf(_("\t\tFilesystems statistics [A_FS]\n"));
  	printf(_("\t-H\tHugepages utilization statistics [A_HUGE]\n"));
- 	printf(_("\t-I { <int_list> | SUM | ALL }\n"
 -	printf(_("\t-I { SUM | ALL }\n"
++	printf(_("\t-I [ SUM | ALL ]\n"
  		 "\t\tInterrupts statistics [A_IRQ]\n"));
  	printf(_("\t-m { <keyword> [,...] | ALL }\n"
  		 "\t\tPower management statistics [A_PWR_...]\n"