From: Sebastien Date: Fri, 13 Jul 2012 19:43:59 +0000 (+0200) Subject: Various cosmetic changes in manual pages and usage messages displayed by sysstat... X-Git-Tag: v10.1.1~7 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71e0e8079506906138c30c2dfaa3104d2d9e7feb;p=sysstat Various cosmetic changes in manual pages and usage messages displayed by sysstat commands. Mail from Peter Schiffer (pschiffe@redhat.com) 04/07/2012: I am sending you 2 patches. They are minor modifications to the documentation: In man-usage.patch I tried to unify usage output of programs and man pages synopsis, so all the usages of utilities are similar. Also, it fixes one bug in iostat man page where Network Filesystem report was mentioned and problem in sar man page where some options in synopsis weren't bold. In man-asciibetical-order.patch I tried to unify order of option descriptions in man pages, I used asciibetical order (uppercase before lowercase) - again, so all man pages can be similar. These are rather cosmetic changes than fixes, however I think unity is important for better user experience. --- diff --git a/CHANGES b/CHANGES index ea4e283..2c493b7 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,8 @@ xxxx/xx/xx: Version 10.1.1 - Sebastien Godard (sysstat orange.fr) * Added option -[0-9]+ to sar to show data of that days ago. * [Peter Schiffer]: sar: Use /sys/dev/block/major:minor links to determine devices real name. + * [Peter Schiffer]: Various cosmetic changes in manual pages + and usage messages displayed by sysstat commands. * sar and iostat manual pages updated. 2012/05/16: Version 10.0.5 - Sebastien Godard (sysstat orange.fr) @@ -46,8 +48,8 @@ xxxx/xx/xx: Version 10.1.1 - Sebastien Godard (sysstat orange.fr) 2011/11/27: Version 10.0.3 - Sebastien Godard (sysstat orange.fr) * sadf: New output format added: JSON (JavaScript Object Notation). This format can be displayed with sadf's option -j. - * [Jürgen Heinemann]: Fixed a bug in sadf XML output. - * [Jürgen Heinemann]: Fixed several bugs in DTD and XSD + * [Jurgen Heinemann]: Fixed a bug in sadf XML output. + * [Jurgen Heinemann]: Fixed several bugs in DTD and XSD documents. * [Petr Uzel]: Fixed random crash with iostat when called with option -N [NOVELL Bug#729130]. diff --git a/cifsiostat.c b/cifsiostat.c index 7e36920..34ba875 100644 --- a/cifsiostat.c +++ b/cifsiostat.c @@ -71,7 +71,7 @@ void usage(char *progname) #ifdef DEBUG fprintf(stderr, _("Options are:\n" - "[ --debuginfo ] [ -h ] [ -k | -m ] [ -t ] [ -V ]\n")); + "[ -h ] [ -k | -m ] [ -t ] [ -V ] [ --debuginfo ]\n")); #else fprintf(stderr, _("Options are:\n" "[ -h ] [ -k | -m ] [ -t ] [ -V ]\n")); diff --git a/iostat.c b/iostat.c index d50cbf9..28a169b 100644 --- a/iostat.c +++ b/iostat.c @@ -85,16 +85,16 @@ void usage(char *progname) progname); #ifdef DEBUG fprintf(stderr, _("Options are:\n" - "[ -c ] [ -d ] [ -h ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n" - "[ -j { ID | LABEL | PATH | UUID | ... } [ [...] | ALL ] ]\n" - "[ [ [ -T ] -g ] { [...] | ALL } ]\n" - "[ -p [ [,...] | ALL ] ] [ --debuginfo ]\n")); + "[ -c ] [ -d ] [ -h ] [ -k | -m ] [ -N ] [ -t ] [ -V ] [ -x ] [ -z ]\n" + "[ -j { ID | LABEL | PATH | UUID | ... } ]\n" + "[ [ -T ] -g ] [ -p [ [,...] | ALL ] ]\n" + "[ [...] | ALL ] [ --debuginfo ]\n")); #else fprintf(stderr, _("Options are:\n" - "[ -c ] [ -d ] [ -h ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n" - "[ -j { ID | LABEL | PATH | UUID | ... } [ [...] | ALL ] ]\n" - "[ [ [ -T ] -g ] { [...] | ALL } ]\n" - "[ -p [ [,...] | ALL ] ]\n")); + "[ -c ] [ -d ] [ -h ] [ -k | -m ] [ -N ] [ -t ] [ -V ] [ -x ] [ -z ]\n" + "[ -j { ID | LABEL | PATH | UUID | ... } ]\n" + "[ [ -T ] -g ] [ -p [ [,...] | ALL ] ]\n" + "[ [...] | ALL ]\n")); #endif exit(1); } diff --git a/man/cifsiostat.in b/man/cifsiostat.in index f687c7b..0a033f5 100644 --- a/man/cifsiostat.in +++ b/man/cifsiostat.in @@ -1,9 +1,9 @@ -.TH CIFSIOSTAT 1 "JANUARY 2011" Linux "Linux User's Manual" -*- nroff -*- +.TH CIFSIOSTAT 1 "JULY 2012" Linux "Linux User's Manual" -*- nroff -*- .SH NAME cifsiostat \- Report CIFS statistics. .SH SYNOPSIS .ie 'yes'@WITH_DEBUG@' \{ -.B cifsiostat [ --debuginfo ] [ -h ] [ -k | -m ] [ -t ] [ -V ] [ +.B cifsiostat [ -h ] [ -k | -m ] [ -t ] [ -V ] [ --debuginfo ] [ .I interval .B [ .I count diff --git a/man/iostat.in b/man/iostat.in index 066a779..415271d 100644 --- a/man/iostat.in +++ b/man/iostat.in @@ -4,34 +4,30 @@ iostat \- Report Central Processing Unit (CPU) statistics and input/output statistics for devices and partitions. .SH SYNOPSIS .ie 'yes'@WITH_DEBUG@' \{ -.B iostat [ -c ] [ -d ] [ --debuginfo ] [ -h ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ] -.B [ -j { ID | LABEL | PATH | UUID | ... } [ -.I device -.B [...] | ALL ] ] -.B [ [ [ -T ] -g +.B iostat [ -c ] [ -d ] [ -h ] [ -k | -m ] [ -N ] [ -t ] [ -V ] [ -x ] [ -z ] +.B [ -j { ID | LABEL | PATH | UUID | ... } ] +.B [ [ -T ] -g .I group_name -.B ] { -.I device -.B [...] | ALL } ] [ -p [ +.B ] [ -p [ .I device .B [,...] | ALL ] ] [ +.I device +.B [...] | ALL ] [ --debuginfo ] [ .I interval .B [ .I count .B ] ] .\} .el \{ -.B iostat [ -c ] [ -d ] [ -h ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ] -.B [ -j { ID | LABEL | PATH | UUID | ... } [ -.I device -.B [...] | ALL ] ] -.B [ [ [ -T ] -g +.B iostat [ -c ] [ -d ] [ -h ] [ -k | -m ] [ -N ] [ -t ] [ -V ] [ -x ] [ -z ] +.B [ -j { ID | LABEL | PATH | UUID | ... } ] +.B [ [ -T ] -g .I group_name -.B ] { -.I device -.B [...] | ALL } ] [ -p [ +.B ] [ -p [ .I device .B [,...] | ALL ] ] [ +.I device +.B [...] | ALL ] [ .I interval .B [ .I count @@ -86,9 +82,8 @@ command generates reports continuously. .SH REPORTS The .B iostat -command generates three types of reports, the CPU -Utilization report, the Device Utilization report and -the Network Filesystem report. +command generates two types of reports, the CPU +Utilization report and the Device Utilization report. .IP "CPU Utilization Report" The first report generated by the .B iostat @@ -389,7 +384,7 @@ to work. Kernels older than 2.6.x are no longer supported. The average service time (svctm field) value is meaningless, -as I/O statistics are calculated at block level, and we don't know +as I/O statistics are now calculated at block level, and we don't know when the disk driver starts to process a request. For this reason, this field will be removed in a future sysstat version. .SH FILES diff --git a/man/mpstat.1 b/man/mpstat.1 index 1f1fdb3..253d67d 100644 --- a/man/mpstat.1 +++ b/man/mpstat.1 @@ -1,10 +1,10 @@ -.TH MPSTAT 1 "AUGUST 2011" Linux "Linux User's Manual" -*- nroff -*- +.TH MPSTAT 1 "JULY 2012" Linux "Linux User's Manual" -*- nroff -*- .SH NAME mpstat \- Report processors related statistics. .SH SYNOPSIS -.B mpstat [ -A ] [ -I { SUM | CPU | SCPU | ALL } ] [ -u ] [ -P { +.B mpstat [ -A ] [ -u ] [ -V ] [ -I { SUM | CPU | SCPU | ALL } ] [ -P { .I cpu -.B [,...] | ON | ALL } ] [ -V ] [ +.B [,...] | ON | ALL } ] [ .I interval .B [ .I count @@ -45,7 +45,7 @@ command generates reports continuously. .SH OPTIONS .IP -A This option is equivalent to specifying -.BR "-I ALL -u -P ALL" +.BR "-u -I ALL -P ALL" .IP "-I { SUM | CPU | SCPU | ALL }" Report interrupts statistics. diff --git a/man/nfsiostat.in b/man/nfsiostat.in index b455296..ea5ad7c 100644 --- a/man/nfsiostat.in +++ b/man/nfsiostat.in @@ -1,9 +1,9 @@ -.TH NFSIOSTAT 1 "JANUARY 2011" Linux "Linux User's Manual" -*- nroff -*- +.TH NFSIOSTAT 1 "JULY 2012" Linux "Linux User's Manual" -*- nroff -*- .SH NAME nfsiostat \- Report input/output statistics for network filesystems (NFS). .SH SYNOPSIS .ie 'yes'@WITH_DEBUG@' \{ -.B nfsiostat [ --debuginfo ] [ -h ] [ -k | -m ] [ -t ] [ -V ] [ +.B nfsiostat [ -h ] [ -k | -m ] [ -t ] [ -V ] [ --debuginfo ] [ .I interval .B [ .I count diff --git a/man/pidstat.1 b/man/pidstat.1 index d20e0c5..f8c8d9c 100644 --- a/man/pidstat.1 +++ b/man/pidstat.1 @@ -1,12 +1,13 @@ -.TH PIDSTAT 1 "AUGUST 2011" Linux "Linux User's Manual" -*- nroff -*- +.TH PIDSTAT 1 "JULY 2012" Linux "Linux User's Manual" -*- nroff -*- .SH NAME pidstat \- Report statistics for Linux tasks. .SH SYNOPSIS -.B pidstat [ -C +.B pidstat [ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -s ] [ -t ] [ -u ] [ -V ] +.B [ -w ] [ -C .I comm -.B ] [ -d ] [ -h ] [ -I ] [ -l ] [ -p { +.B ] [ -p { .I pid -.B [,...] | SELF | ALL } ] [ -r ] [ -s ] [ -t ] [ -T { TASK | CHILD | ALL } ] [ -u ] [ -V ] [ -w ] [ +.B [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ] [ .I interval .B [ .I count @@ -215,22 +216,6 @@ The amount of memory in kilobytes used as stack, referenced by the task. The command name of the task. .RE .RE -.IP -t -Also display statistics for threads associated with selected tasks. - -This option adds the following values to the reports: - -.B TGID -.RS -.RS -The identification number of the thread group leader. -.RE - -.B TID -.RS -The identification number of the thread being monitored. -.RE -.RE .IP "-T { TASK | CHILD | ALL }" This option specifies what has to be monitored by the .B pidstat @@ -252,6 +237,22 @@ for all options of Also these statistics are not necessarily relevant to current time interval: The statistics of a child process are collected only when it finishes or it is killed. +.IP -t +Also display statistics for threads associated with selected tasks. + +This option adds the following values to the reports: + +.B TGID +.RS +.RS +The identification number of the thread group leader. +.RE + +.B TID +.RS +The identification number of the thread being monitored. +.RE +.RE .IP -u Report CPU utilization. diff --git a/man/sadc.in b/man/sadc.in index 9a5f3a9..9b75754 100644 --- a/man/sadc.in +++ b/man/sadc.in @@ -1,10 +1,10 @@ -.TH SADC 8 "MAY 2012" Linux "Linux User's Manual" -*- nroff -*- +.TH SADC 8 "JULY 2012" Linux "Linux User's Manual" -*- nroff -*- .SH NAME sadc \- System activity data collector. .SH SYNOPSIS .B @SA_LIB_DIR@/sadc [ -C .I comment -.B ] [ -S { INT | DISK | SNMP | IPV6 | POWER | XDISK | ALL | XALL } ] [ -F ] [ -L ] [ -V ] [ +.B ] [ -F ] [ -L ] [ -V ] [ -S { INT | DISK | SNMP | IPV6 | POWER | XDISK | ALL | XALL } ] [ .I interval .B [ .I count diff --git a/man/sadf.in b/man/sadf.in index a8fccf8..d65ce84 100644 --- a/man/sadf.in +++ b/man/sadf.in @@ -1,8 +1,8 @@ -.TH SADF 1 "NOVEMBER 2011" Linux "Linux User's Manual" -*- nroff -*- +.TH SADF 1 "JULY 2012" Linux "Linux User's Manual" -*- nroff -*- .SH NAME sadf \- Display data collected by sar in multiple formats. .SH SYNOPSIS -.B sadf [ -d | -j | -p | -x ] [ -C ] [ -H ] [ -h ] [ -T ] [ -t ] [ -V ] [ -P { +.B sadf [ -C ] [ -d | -j | -p | -x ] [ -H ] [ -h ] [ -T ] [ -t ] [ -V ] [ -P { .I cpu .B [,...] | ALL } ] [ -s [ .I hh:mm:ss diff --git a/man/sar.in b/man/sar.in index 0314b00..5f9375b 100644 --- a/man/sar.in +++ b/man/sar.in @@ -2,26 +2,28 @@ .SH NAME sar \- Collect, report, or save system activity information. .SH SYNOPSIS -.B sar [ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -H ] [ -i -.I interval -.B ] [ -p ] [ -q ] [ -r ] [ -R ] [ -S ] [ -t ] [ -u [ ALL ] ] -[ -v ] [ -V ] [ -w ] [ -W ] [ -y ] -.B [ -j { ID | LABEL | PATH | UUID | ... } ] +.B sar [ -A ] [ -B ] [ -b ] [ -C ] [ -d ] [ -H ] [ -h ] [ -p ] [ -q ] [ -R ] +.B [ -r ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -V ] [ -v ] [ -W ] [ -w ] [ -y ] +.B [ -I { +.I int +.B [,...] | SUM | ALL | XALL } ] [ -P { +.I cpu +.B [,...] | ALL } ] .B [ -m { .I keyword .B [,...] | ALL } ] .B [ -n { .I keyword .B [,...] | ALL } ] -.B [ -I { -.I int -.B [,...] | SUM | ALL | XALL } ] [ -P { -.I cpu -.B [,...] | ALL } ] [ -o [ +.B [ -j { ID | LABEL | PATH | UUID | ... } ] +.B [ -f [ .I filename -.B ] | -f [ +.B ] | -o [ .I filename -.B ] | -[0-9]+ ] [ -s [ +.B ] | -[0-9]+ ] +.B [ -i +.I interval +.B ] [ -s [ .I hh:mm:ss .B ] ] [ -e [ .I hh:mm:ss @@ -144,41 +146,6 @@ command only reports on local activities. .IP -A This is equivalent to specifying .BR "-bBdHqrRSuvwWy -I SUM -I XALL -m ALL -n ALL -u ALL -P ALL". -.IP -b -Report I/O and transfer rate statistics. -The following values are displayed: - -.B tps -.RS -.RS -Total number of transfers per second that were issued to physical devices. -A transfer is an I/O request to a physical device. Multiple logical -requests can be combined into a single I/O request to the device. -A transfer is of indeterminate size. -.RE - -.B rtps -.RS -Total number of read requests per second issued to physical devices. -.RE - -.B wtps -.RS -Total number of write requests per second issued to physical devices. -.RE - -.B bread/s -.RS -Total amount of data read from the devices in blocks per second. -Blocks are equivalent to sectors -and therefore have a size of 512 bytes. -.RE - -.B bwrtn/s -.RS -Total amount of data written to devices in blocks per second. -.RE -.RE .IP -B Report paging statistics. The following values are displayed: @@ -238,6 +205,41 @@ This field is displayed as zero if no pages have been scanned during the interval of time. .RE .RE +.IP -b +Report I/O and transfer rate statistics. +The following values are displayed: + +.B tps +.RS +.RS +Total number of transfers per second that were issued to physical devices. +A transfer is an I/O request to a physical device. Multiple logical +requests can be combined into a single I/O request to the device. +A transfer is of indeterminate size. +.RE + +.B rtps +.RS +Total number of read requests per second issued to physical devices. +.RE + +.B wtps +.RS +Total number of write requests per second issued to physical devices. +.RE + +.B bread/s +.RS +Total amount of data read from the devices in blocks per second. +Blocks are equivalent to sectors +and therefore have a size of 512 bytes. +.RE + +.B bwrtn/s +.RS +Total amount of data written to devices in blocks per second. +.RE +.RE .IP -C When reading data from a file, tell .B sar @@ -350,11 +352,8 @@ Amount of hugepages memory in kilobytes that has been allocated. Percentage of total hugepages memory that has been allocated. .RE .RE -.IP "-i interval" -Select data records at seconds as close as possible to the number specified -by the -.I interval -parameter. +.IP -h +Display a short help message then exit. .IP "-I { int [,...] | SUM | ALL | XALL }" Report statistics for a given interrupt. .B int @@ -372,6 +371,11 @@ the first 16 interrupts are to be reported, whereas the keyword indicates that statistics from all interrupts, including potential APIC interrupt sources, are to be reported. Note that interrupt statistics depend on sadc option "-S INT" to be collected. +.IP "-i interval" +Select data records at seconds as close as possible to the number specified +by the +.I interval +parameter. .IP "-j { ID | LABEL | PATH | UUID | ... }" Display persistent device names. Use this option in conjunction with option -d. Options @@ -1704,6 +1708,29 @@ System load average for the past 15 minutes. Number of tasks currently blocked, waiting for I/O to complete. .RE .RE +.IP -R +Report memory statistics. The following values are displayed: + +.B frmpg/s +.RS +.RS +Number of memory pages freed by the system per second. +A negative value represents a number of pages allocated by the system. +Note that a page has a size of 4 kB or 8 kB according to the machine architecture. +.RE + +.B bufpg/s +.RS +Number of additional memory pages used as buffers by the system per second. +A negative value means fewer pages used as buffers by the system. +.RE + +.B campg/s +.RS +Number of additional memory pages cached by the system per second. +A negative value means fewer pages in the cache. +.RE +.RE .IP -r Report memory utilization statistics. The following values are displayed: @@ -1759,38 +1786,6 @@ Amount of inactive memory in kilobytes (memory which has been less recently used. It is more eligible to be reclaimed for other purposes). .RE .RE -.IP -R -Report memory statistics. The following values are displayed: - -.B frmpg/s -.RS -.RS -Number of memory pages freed by the system per second. -A negative value represents a number of pages allocated by the system. -Note that a page has a size of 4 kB or 8 kB according to the machine architecture. -.RE - -.B bufpg/s -.RS -Number of additional memory pages used as buffers by the system per second. -A negative value means fewer pages used as buffers by the system. -.RE - -.B campg/s -.RS -Number of additional memory pages cached by the system per second. -A negative value means fewer pages in the cache. -.RE -.RE -.IP "-s [ hh:mm:ss ]" -Set the starting time of the data, causing the -.B sar -command to extract records time-tagged at, or following, the time -specified. The default starting time is 08:00:00. -Hours must be given in 24-hour format. This option can be -used only when data are read from a file (option -.B -f -). .IP -S Report swap space utilization statistics. The following values are displayed: @@ -1825,6 +1820,15 @@ saves I/O). Percentage of cached swap memory in relation to the amount of used swap space. .RE .RE +.IP "-s [ hh:mm:ss ]" +Set the starting time of the data, causing the +.B sar +command to extract records time-tagged at, or following, the time +specified. The default starting time is 08:00:00. +Hours must be given in 24-hour format. This option can be +used only when data are read from a file (option +.B -f +). .IP -t When reading data from a daily data file, indicate that .B sar @@ -1909,6 +1913,8 @@ did not have an outstanding disk I/O request. Note: On SMP machines a processor that does not have any activity at all (0.00 for every field) is a disabled (offline) processor. .RE +.IP -V +Print version number then exit. .IP -v Report status of inode, file and other kernel tables. The following values are displayed: @@ -1934,34 +1940,32 @@ Number of inode handlers used by the system. Number of pseudo-terminals used by the system. .RE .RE -.IP -V -Print version number then exit. -.IP -w -Report task creation and system switching activity. +.IP -W +Report swapping statistics. The following values are displayed: -.B proc/s +.B pswpin/s .RS .RS -Total number of tasks created per second. +Total number of swap pages the system brought in per second. .RE -.B cswch/s +.B pswpout/s .RS -Total number of context switches per second. +Total number of swap pages the system brought out per second. .RE .RE -.IP -W -Report swapping statistics. The following values are displayed: +.IP -w +Report task creation and system switching activity. -.B pswpin/s +.B proc/s .RS .RS -Total number of swap pages the system brought in per second. +Total number of tasks created per second. .RE -.B pswpout/s +.B cswch/s .RS -Total number of swap pages the system brought out per second. +Total number of context switches per second. .RE .RE .IP -y diff --git a/mpstat.c b/mpstat.c index 322bb38..42fc733 100644 --- a/mpstat.c +++ b/mpstat.c @@ -1,6 +1,6 @@ /* * mpstat: per-processor statistics - * (C) 2000-2011 by Sebastien GODARD (sysstat orange.fr) + * (C) 2000-2012 by Sebastien GODARD (sysstat orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it * @@ -87,8 +87,8 @@ void usage(char *progname) progname); fprintf(stderr, _("Options are:\n" - "[ -A ] [ -I { SUM | CPU | SCPU | ALL } ] [ -u ]\n" - "[ -P { [,...] | ON | ALL } ] [ -V ]\n")); + "[ -A ] [ -u ] [ -V ] [ -I { SUM | CPU | SCPU | ALL } ]\n" + "[ -P { [,...] | ON | ALL } ]\n")); exit(1); } diff --git a/nfsiostat.c b/nfsiostat.c index c6dca8f..4dddf2b 100644 --- a/nfsiostat.c +++ b/nfsiostat.c @@ -70,7 +70,7 @@ void usage(char *progname) #ifdef DEBUG fprintf(stderr, _("Options are:\n" - "[ --debuginfo ] [ -h ] [ -k | -m ] [ -t ] [ -V ]\n")); + "[ -h ] [ -k | -m ] [ -t ] [ -V ] [ --debuginfo ]\n")); #else fprintf(stderr, _("Options are:\n" "[ -h ] [ -k | -m ] [ -t ] [ -V ]\n")); diff --git a/nls/sysstat.pot b/nls/sysstat.pot index 2f61331..0d949a6 100644 --- a/nls/sysstat.pot +++ b/nls/sysstat.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sysstat orange.fr\n" -"POT-Creation-Date: 2012-07-01 21:33+0200\n" +"POT-Creation-Date: 2012-07-11 21:35+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,144 +17,12 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: sadf_misc.c:595 -#, c-format -msgid "System activity data file: %s (%#x)\n" -msgstr "" - -#: sadf_misc.c:604 -#, c-format -msgid "Host: " -msgstr "" - -#: sadf_misc.c:610 -#, c-format -msgid "Size of a long int: %d\n" -msgstr "" - -#: sadf_misc.c:612 -#, c-format -msgid "List of activities:\n" -msgstr "" - -#: sadf_misc.c:625 -#, c-format -msgid "\t[Unknown activity format]" -msgstr "" - -#: iostat.c:84 cifsiostat.c:69 mpstat.c:86 sar.c:90 pidstat.c:78 +#: sar.c:90 cifsiostat.c:69 mpstat.c:86 pidstat.c:78 iostat.c:84 #: nfsiostat.c:68 #, c-format msgid "Usage: %s [ options ] [ [ ] ]\n" msgstr "" -#: iostat.c:87 -#, c-format -msgid "" -"Options are:\n" -"[ -c ] [ -d ] [ -h ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n" -"[ [ [ -T ] -g ] { [...] | ALL } ]\n" -"[ -p [ [,...] | ALL ] ] [ --debuginfo ]\n" -msgstr "" - -#: iostat.c:92 -#, c-format -msgid "" -"Options are:\n" -"[ -c ] [ -d ] [ -h ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n" -"[ [ [ -T ] -g ] { [...] | ALL } ]\n" -"[ -p [ [,...] | ALL ] ]\n" -msgstr "" - -#: iostat.c:327 -#, c-format -msgid "Cannot find disk data\n" -msgstr "" - -#: sadc.c:81 -#, c-format -msgid "Usage: %s [ options ] [ [ ] ] [ ]\n" -msgstr "" - -#: sadc.c:84 -#, c-format -msgid "" -"Options are:\n" -"[ -C ] [ -F ] [ -L ] [ -V ]\n" -"[ -S { INT | DISK | IPV6 | POWER | SNMP | XDISK | ALL | XALL } ]\n" -msgstr "" - -#: sadc.c:223 -#, c-format -msgid "Cannot write data to system activity file: %s\n" -msgstr "" - -#: sadc.c:510 -#, c-format -msgid "Cannot write system activity file header: %s\n" -msgstr "" - -#: sadc.c:623 sadc.c:632 sadc.c:693 ioconf.c:491 rd_stats.c:68 rd_stats.c:2120 -#: sa_common.c:1107 -#, c-format -msgid "Cannot open %s: %s\n" -msgstr "" - -#: sadc.c:807 -#, c-format -msgid "Cannot append data to that file (%s)\n" -msgstr "" - -#: common.c:57 -#, c-format -msgid "sysstat version %s\n" -msgstr "" - -#: cifsiostat.c:73 nfsiostat.c:72 -#, c-format -msgid "" -"Options are:\n" -"[ --debuginfo ] [ -h ] [ -k | -m ] [ -t ] [ -V ]\n" -msgstr "" - -#: cifsiostat.c:76 nfsiostat.c:75 -#, c-format -msgid "" -"Options are:\n" -"[ -h ] [ -k | -m ] [ -t ] [ -V ]\n" -msgstr "" - -#: sadf.c:86 -#, c-format -msgid "Usage: %s [ options ] [ [ ] ] [ ]\n" -msgstr "" - -#: sadf.c:89 -#, c-format -msgid "" -"Options are:\n" -"[ -d | -j | -p | -x ] [ -C ] [ -H ] [ -h ] [ -T ] [ -t ] [ -V ]\n" -"[ -P { [,...] | ALL } ] [ -s [ ] ] [ -e [ ] ]\n" -"[ -- ]\n" -msgstr "" - -#: mpstat.c:89 -#, c-format -msgid "" -"Options are:\n" -"[ -A ] [ -I { SUM | CPU | SCPU | ALL } ] [ -u ]\n" -"[ -P { [,...] | ON | ALL } ] [ -V ]\n" -msgstr "" - -#: mpstat.c:581 sar.c:381 pidstat.c:1822 -msgid "Average:" -msgstr "" - -#: mpstat.c:928 -#, c-format -msgid "Not that many processors!\n" -msgstr "" - #: sar.c:105 #, c-format msgid "" @@ -163,43 +31,44 @@ msgid "" "[ -R ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -v ] [ -V ] [ -w ] [ -W ] [ -y ]\n" "[ -I { [,...] | SUM | ALL | XALL } ] [ -P { [,...] | ALL } ]\n" "[ -m { [,...] | ALL } ] [ -n { [,...] | ALL } ]\n" +"[ -j { ID | LABEL | PATH | UUID | ... } ]\n" "[ -o [ ] | -f [ ] | -[0-9]+ ]\n" "[ -i ] [ -s [ ] ] [ -e [ ] ]\n" msgstr "" -#: sar.c:126 +#: sar.c:127 #, c-format msgid "Main options and reports:\n" msgstr "" -#: sar.c:127 +#: sar.c:128 #, c-format msgid "\t-b\tI/O and transfer rate statistics\n" msgstr "" -#: sar.c:128 +#: sar.c:129 #, c-format msgid "\t-B\tPaging statistics\n" msgstr "" -#: sar.c:129 +#: sar.c:130 #, c-format msgid "\t-d\tBlock device statistics\n" msgstr "" -#: sar.c:130 +#: sar.c:131 #, c-format msgid "\t-H\tHugepages utilization statistics\n" msgstr "" -#: sar.c:131 +#: sar.c:132 #, c-format msgid "" "\t-I { | SUM | ALL | XALL }\n" "\t\tInterrupts statistics\n" msgstr "" -#: sar.c:133 +#: sar.c:134 #, c-format msgid "" "\t-m { [,...] | ALL }\n" @@ -213,7 +82,7 @@ msgid "" "\t\tUSB\tUSB devices plugged into the system\n" msgstr "" -#: sar.c:142 +#: sar.c:143 #, c-format msgid "" "\t-n { [,...] | ALL }\n" @@ -239,104 +108,175 @@ msgid "" "\t\tUDP6\tUDP traffic\t(v6)\n" msgstr "" -#: sar.c:163 +#: sar.c:164 #, c-format msgid "\t-q\tQueue length and load average statistics\n" msgstr "" -#: sar.c:164 +#: sar.c:165 #, c-format msgid "\t-r\tMemory utilization statistics\n" msgstr "" -#: sar.c:165 +#: sar.c:166 #, c-format msgid "\t-R\tMemory statistics\n" msgstr "" -#: sar.c:166 +#: sar.c:167 #, c-format msgid "\t-S\tSwap space utilization statistics\n" msgstr "" -#: sar.c:167 +#: sar.c:168 #, c-format msgid "" "\t-u [ ALL ]\n" "\t\tCPU utilization statistics\n" msgstr "" -#: sar.c:169 +#: sar.c:170 #, c-format msgid "\t-v\tKernel table statistics\n" msgstr "" -#: sar.c:170 +#: sar.c:171 #, c-format msgid "\t-w\tTask creation and system switching statistics\n" msgstr "" -#: sar.c:171 +#: sar.c:172 #, c-format msgid "\t-W\tSwapping statistics\n" msgstr "" -#: sar.c:172 +#: sar.c:173 #, c-format msgid "\t-y\tTTY device statistics\n" msgstr "" -#: sar.c:215 +#: sar.c:216 #, c-format msgid "End of data collecting unexpected\n" msgstr "" -#: sar.c:802 +#: sar.c:382 mpstat.c:581 pidstat.c:1822 +msgid "Average:" +msgstr "" + +#: sar.c:803 #, c-format msgid "Invalid data format\n" msgstr "" -#: sar.c:806 +#: sar.c:807 #, c-format msgid "Using a wrong data collector from a different sysstat version\n" msgstr "" -#: sar.c:830 +#: sar.c:831 #, c-format msgid "Inconsistent input data\n" msgstr "" -#: sar.c:1013 pidstat.c:199 +#: sar.c:1014 pidstat.c:199 #, c-format msgid "Requested activities not available\n" msgstr "" -#: sar.c:1268 +#: sar.c:1272 #, c-format msgid "-f and -o options are mutually exclusive\n" msgstr "" -#: sar.c:1274 +#: sar.c:1278 #, c-format msgid "Not reading from a system activity file (use -f option)\n" msgstr "" -#: sar.c:1406 +#: sar.c:1410 #, c-format msgid "Cannot find the data collector (%s)\n" msgstr "" -#: rd_stats.c:2166 +#: cifsiostat.c:73 nfsiostat.c:72 #, c-format -msgid "Cannot handle so many processors!\n" +msgid "" +"Options are:\n" +"[ --debuginfo ] [ -h ] [ -k | -m ] [ -t ] [ -V ]\n" msgstr "" -#: pr_stats.c:2319 pr_stats.c:2332 -msgid "Summary" +#: cifsiostat.c:76 nfsiostat.c:75 +#, c-format +msgid "" +"Options are:\n" +"[ -h ] [ -k | -m ] [ -t ] [ -V ]\n" msgstr "" -#: pr_stats.c:2370 -msgid "Other devices not listed here" +#: sadc.c:81 +#, c-format +msgid "Usage: %s [ options ] [ [ ] ] [ ]\n" +msgstr "" + +#: sadc.c:84 +#, c-format +msgid "" +"Options are:\n" +"[ -C ] [ -F ] [ -L ] [ -V ]\n" +"[ -S { INT | DISK | IPV6 | POWER | SNMP | XDISK | ALL | XALL } ]\n" +msgstr "" + +#: sadc.c:223 +#, c-format +msgid "Cannot write data to system activity file: %s\n" +msgstr "" + +#: sadc.c:510 +#, c-format +msgid "Cannot write system activity file header: %s\n" +msgstr "" + +#: sadc.c:623 sadc.c:632 sadc.c:693 ioconf.c:491 rd_stats.c:68 rd_stats.c:2120 +#: sa_common.c:1107 +#, c-format +msgid "Cannot open %s: %s\n" +msgstr "" + +#: sadc.c:807 +#, c-format +msgid "Cannot append data to that file (%s)\n" +msgstr "" + +#: mpstat.c:89 +#, c-format +msgid "" +"Options are:\n" +"[ -A ] [ -I { SUM | CPU | SCPU | ALL } ] [ -u ]\n" +"[ -P { [,...] | ON | ALL } ] [ -V ]\n" +msgstr "" + +#: mpstat.c:928 +#, c-format +msgid "Not that many processors!\n" +msgstr "" + +#: sadf.c:86 +#, c-format +msgid "Usage: %s [ options ] [ [ ] ] [ ]\n" +msgstr "" + +#: sadf.c:89 +#, c-format +msgid "" +"Options are:\n" +"[ -d | -j | -p | -x ] [ -C ] [ -H ] [ -h ] [ -T ] [ -t ] [ -V ]\n" +"[ -P { [,...] | ALL } ] [ -s [ ] ] [ -e [ ] ]\n" +"[ -- ]\n" +msgstr "" + +#: rd_stats.c:2166 +#, c-format +msgid "Cannot handle so many processors!\n" msgstr "" #: sa_common.c:916 @@ -370,6 +310,11 @@ msgstr "" msgid "Requested activities not available in file %s\n" msgstr "" +#: sa_common.c:1298 iostat.c:1381 +#, c-format +msgid "Invalid type of persistent device name\n" +msgstr "" + #: pidstat.c:81 #, c-format msgid "" @@ -378,3 +323,66 @@ msgid "" "[ -t ] [ -u ] [ -V ] [ -w ]\n" "[ -p { [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n" msgstr "" + +#: sadf_misc.c:595 +#, c-format +msgid "System activity data file: %s (%#x)\n" +msgstr "" + +#: sadf_misc.c:604 +#, c-format +msgid "Host: " +msgstr "" + +#: sadf_misc.c:610 +#, c-format +msgid "Size of a long int: %d\n" +msgstr "" + +#: sadf_misc.c:612 +#, c-format +msgid "List of activities:\n" +msgstr "" + +#: sadf_misc.c:625 +#, c-format +msgid "\t[Unknown activity format]" +msgstr "" + +#: iostat.c:87 +#, c-format +msgid "" +"Options are:\n" +"[ -c ] [ -d ] [ -h ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n" +"[ -j { ID | LABEL | PATH | UUID | ... } [ [...] | ALL ] ]\n" +"[ [ [ -T ] -g ] { [...] | ALL } ]\n" +"[ -p [ [,...] | ALL ] ] [ --debuginfo ]\n" +msgstr "" + +#: iostat.c:93 +#, c-format +msgid "" +"Options are:\n" +"[ -c ] [ -d ] [ -h ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n" +"[ -j { ID | LABEL | PATH | UUID | ... } [ [...] | ALL ] ]\n" +"[ [ [ -T ] -g ] { [...] | ALL } ]\n" +"[ -p [ [,...] | ALL ] ]\n" +msgstr "" + +#: iostat.c:329 +#, c-format +msgid "Cannot find disk data\n" +msgstr "" + +#: common.c:62 +#, c-format +msgid "sysstat version %s\n" +msgstr "" + +#: pr_stats.c:2329 pr_stats.c:2342 +msgid "Summary" +msgstr "" + +#: pr_stats.c:2380 +msgid "Other devices not listed here" +msgstr "" diff --git a/pidstat.c b/pidstat.c index 4fa1550..0c958cd 100644 --- a/pidstat.c +++ b/pidstat.c @@ -1,6 +1,6 @@ /* * pidstat: Report statistics for Linux tasks - * (C) 2007-2011 by Sebastien GODARD (sysstat orange.fr) + * (C) 2007-2012 by Sebastien GODARD (sysstat orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it * @@ -79,9 +79,9 @@ void usage(char *progname) progname); fprintf(stderr, _("Options are:\n" - "[ -C ] [ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -s ]\n" - "[ -t ] [ -u ] [ -V ] [ -w ]\n" - "[ -p { [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n")); + "[ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -s ] [ -t ] [ -u ] [ -V ]\n" + "[ -w ] [ -C ] [ -p { [,...] | SELF | ALL } ]\n" + "[ -T { TASK | CHILD | ALL } ]\n")); exit(1); } diff --git a/sadf.c b/sadf.c index 0b14f85..26df8b9 100644 --- a/sadf.c +++ b/sadf.c @@ -87,7 +87,7 @@ void usage(char *progname) progname); fprintf(stderr, _("Options are:\n" - "[ -d | -j | -p | -x ] [ -C ] [ -H ] [ -h ] [ -T ] [ -t ] [ -V ]\n" + "[ -C ] [ -d | -j | -p | -x ] [ -H ] [ -h ] [ -T ] [ -t ] [ -V ]\n" "[ -P { [,...] | ALL } ] [ -s [ ] ] [ -e [ ] ]\n" "[ -- ]\n")); exit(1); diff --git a/sar.c b/sar.c index d86bf30..425ffd1 100644 --- a/sar.c +++ b/sar.c @@ -103,12 +103,12 @@ void usage(char *progname) { print_usage_title(stderr, progname); fprintf(stderr, _("Options are:\n" - "[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -H ] [ -p ] [ -q ] [ -r ]\n" - "[ -R ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -v ] [ -V ] [ -w ] [ -W ] [ -y ]\n" + "[ -A ] [ -B ] [ -b ] [ -C ] [ -d ] [ -H ] [ -h ] [ -p ] [ -q ] [ -R ]\n" + "[ -r ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -V ] [ -v ] [ -W ] [ -w ] [ -y ]\n" "[ -I { [,...] | SUM | ALL | XALL } ] [ -P { [,...] | ALL } ]\n" "[ -m { [,...] | ALL } ] [ -n { [,...] | ALL } ]\n" "[ -j { ID | LABEL | PATH | UUID | ... } ]\n" - "[ -o [ ] | -f [ ] | -[0-9]+ ]\n" + "[ -f [ ] | -o [ ] | -[0-9]+ ]\n" "[ -i ] [ -s [ ] ] [ -e [ ] ]\n")); exit(1); }