From e350f56ee15863c0a70d0e07d8dcd47f9c40e36c Mon Sep 17 00:00:00 2001 From: Sebastien GODARD Date: Fri, 24 Jun 2016 14:06:42 +0200 Subject: [PATCH] sysstat-11.3.5 sysstat version 11.3.5 final packaging. lsm and spec files updated. Changelog added. Cosmetic fixes. NOTE: A stable version (11.2.5) also exists and will be available for download from my web site: http://pagesperso-orange.fr/sebastien.godard/ The stable version includes only the bug fixes added in sysstat 11.3.5 but not the new features. Signed-off-by: Sebastien GODARD --- CHANGES | 16 ++++++++++++++++ count.c | 2 +- iostat.c | 2 +- json_stats.c | 14 +++++++------- nls/sysstat.pot | 8 ++++---- pidstat.c | 2 +- pr_stats.c | 14 +++++++------- rd_stats.c | 12 ++++++------ rndr_stats.c | 12 ++++++------ sar.c | 2 +- sysstat-11.3.4.lsm => sysstat-11.3.5.lsm | 14 +++++++------- sysstat-11.3.4.spec => sysstat-11.3.5.spec | 2 +- xml_stats.c | 16 ++++++++-------- 13 files changed, 66 insertions(+), 50 deletions(-) rename sysstat-11.3.4.lsm => sysstat-11.3.5.lsm (89%) rename sysstat-11.3.4.spec => sysstat-11.3.5.spec (99%) diff --git a/CHANGES b/CHANGES index 16a0ffc..91a7557 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,21 @@ Changes: +2016/06/24: Version 11.3.5 - Sebastien Godard (sysstat orange.fr) + * SVG: Add SVG output for ICMP{v4,v6}, IPv6, UDPv6, voltage inputs, + NFS client, NFS server, disks, filesystems and FC HBA statistics. + * SVG: Add SVG output for IPv4, ICMPv4, TCPv4, IPv6 and ICMP + network errors statistics. + * SVG: Make sure graduations are properly aligned with grid. + * SVG: Add oneday option to control SVG output. + * SVG: Fix skipempty option. + * [Peter Schiffer]: Stricter check for file_magic->header_size [11.2.5]. + * [Peter Schiffer]: tapestat: Various fixes [11.2.5]. + * [Esteban Fallas]: Check for undefined UID variable in sysstat script + [11.2.5]. + * [Carsten Grohmann]: Unify description of the tps value in the sar + manual page for -b and -d flags [11.2.5]. + * sadf manual page updated. + 2016/05/14: Version 11.3.4 - Sebastien Godard (sysstat orange.fr) * SVG: Add SVG output for fan speed and temperature sensors statistics, I/O and transfer rate statistics, kernel tables diff --git a/count.c b/count.c index 3fbf525..affca6d 100644 --- a/count.c +++ b/count.c @@ -481,7 +481,7 @@ int get_filesystem_nr(void) /* Replace octal codes */ oct2chr(mountp); - /* Check that total size is not null */ + /* Check that total size is not zero */ if (statvfs(mountp, &buf) < 0) continue; diff --git a/iostat.c b/iostat.c index 02bf1ab..e0ba524 100644 --- a/iostat.c +++ b/iostat.c @@ -983,7 +983,7 @@ void write_ext_stat(int curr, unsigned long long itv, int fctr, */ cprintf_pc(1, 6, 2, shi->used ? xds.util / 10.0 / (double) shi->used - : xds.util / 10.0); /* shi->used should never be null here */ + : xds.util / 10.0); /* shi->used should never be zero here */ printf("\n"); } diff --git a/json_stats.c b/json_stats.c index ea933b8..9b4036c 100644 --- a/json_stats.c +++ b/json_stats.c @@ -832,7 +832,7 @@ close_json_markup: /* *************************************************************************** - * Display network interfaces error statistics in JSON. + * Display network interfaces errors statistics in JSON. * * IN: * @a Activity structure with statistics. @@ -1099,7 +1099,7 @@ close_json_markup: /* *************************************************************************** - * Display IP network error statistics in JSON. + * Display IP network errors statistics in JSON. * * IN: * @a Activity structure with statistics. @@ -1209,7 +1209,7 @@ close_json_markup: /* *************************************************************************** - * Display ICMP error message statistics in JSON. + * Display ICMP errors message statistics in JSON. * * IN: * @a Activity structure with statistics. @@ -1307,7 +1307,7 @@ close_json_markup: /* *************************************************************************** - * Display TCP network error statistics in JSON. + * Display TCP network errors statistics in JSON. * * IN: * @a Activity structure with statistics. @@ -1484,7 +1484,7 @@ close_json_markup: /* *************************************************************************** - * Display IPv6 network error statistics in JSON. + * Display IPv6 network errors statistics in JSON. * * IN: * @a Activity structure with statistics. @@ -1606,7 +1606,7 @@ close_json_markup: /* *************************************************************************** - * Display ICMPv6 error message statistics in JSON. + * Display ICMPv6 error messages statistics in JSON. * * IN: * @a Activity structure with statistics. @@ -2127,7 +2127,7 @@ __print_funct_t json_print_filesystem_stats(struct activity *a, int curr, int ta sfc = (struct stats_filesystem *) ((char *) a->buf[curr] + i * a->msize); if (!sfc->f_blocks) - /* Size of filesystem is null: We are at the end of the list */ + /* Size of filesystem is zero: We are at the end of the list */ break; if (sep) { diff --git a/nls/sysstat.pot b/nls/sysstat.pot index 6db9d89..03502e6 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: 2016-05-14 10:33+0200\n" +"POT-Creation-Date: 2016-06-24 13:49+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,7 +47,7 @@ msgstr "" msgid "Cannot find disk data\n" msgstr "" -#: iostat.c:1399 sa_common.c:1632 +#: iostat.c:1399 sa_common.c:1633 #, c-format msgid "Invalid type of persistent device name\n" msgstr "" @@ -467,7 +467,7 @@ msgstr "" msgid "Please check if data collecting is enabled\n" msgstr "" -#: sa_common.c:1451 +#: sa_common.c:1452 #, c-format msgid "Requested activities not available in file %s\n" msgstr "" @@ -479,7 +479,7 @@ msgid "" "[ -k | -m ] [ -t ] [ -V ] [ -y ] [ -z ]\n" msgstr "" -#: tapestat.c:251 +#: tapestat.c:257 #, c-format msgid "No tape drives with statistics found\n" msgstr "" diff --git a/pidstat.c b/pidstat.c index 53accfa..74a6fd5 100644 --- a/pidstat.c +++ b/pidstat.c @@ -1177,7 +1177,7 @@ int get_pid_to_display(int prev, int curr, int p, unsigned int activity, return 0; else { /* - * If interval is null, then we are trying to + * If interval is zero, then we are trying to * display stats for a given process since boot time. */ *pstp = &st_pid_null; diff --git a/pr_stats.c b/pr_stats.c index 2542ff6..2aab2fc 100644 --- a/pr_stats.c +++ b/pr_stats.c @@ -1289,7 +1289,7 @@ __print_funct_t print_net_ip_stats(struct activity *a, int prev, int curr, /* *************************************************************************** - * Display IP network error statistics. + * Display IP network errors statistics. * * IN: * @a Activity structure with statistics. @@ -1368,7 +1368,7 @@ __print_funct_t print_net_icmp_stats(struct activity *a, int prev, int curr, /* *************************************************************************** - * Display ICMP network error statistics. + * Display ICMP network errors statistics. * * IN: * @a Activity structure with statistics. @@ -1441,7 +1441,7 @@ __print_funct_t print_net_tcp_stats(struct activity *a, int prev, int curr, /* *************************************************************************** - * Display TCP network error statistics. + * Display TCP network errors statistics. * * IN: * @a Activity structure with statistics. @@ -1636,7 +1636,7 @@ __print_funct_t print_net_ip6_stats(struct activity *a, int prev, int curr, /* *************************************************************************** - * Display IPv6 network error statistics. + * Display IPv6 network errors statistics. * * IN: * @a Activity structure with statistics. @@ -1723,7 +1723,7 @@ __print_funct_t print_net_icmp6_stats(struct activity *a, int prev, int curr, /* *************************************************************************** - * Display ICMPv6 network error statistics. + * Display ICMPv6 network errors statistics. * * IN: * @a Activity structure with statistics. @@ -2604,7 +2604,7 @@ __print_funct_t stub_print_filesystem_stats(struct activity *a, int curr, int di sfc = (struct stats_filesystem *) ((char *) a->buf[curr] + i * a->msize); if (!sfc->f_blocks) - /* Size of filesystem is null: We are at the end of the list */ + /* Size of filesystem is zero: We are at the end of the list */ break; printf("%-11s", (dispavg ? _("Summary:") : timestamp[curr])); @@ -2612,7 +2612,7 @@ __print_funct_t stub_print_filesystem_stats(struct activity *a, int curr, int di (double) sfc->f_bfree / 1024 / 1024, (double) (sfc->f_blocks - sfc->f_bfree) / 1024 / 1024); cprintf_pc(2, 9, 2, - /* f_blocks is not null. But test it anyway ;-) */ + /* f_blocks is not zero. But test it anyway ;-) */ sfc->f_blocks ? SP_VALUE(sfc->f_bfree, sfc->f_blocks, sfc->f_blocks) : 0.0, sfc->f_blocks ? SP_VALUE(sfc->f_bavail, sfc->f_blocks, sfc->f_blocks) diff --git a/rd_stats.c b/rd_stats.c index 2d788e3..18682b6 100644 --- a/rd_stats.c +++ b/rd_stats.c @@ -687,7 +687,7 @@ void read_tty_driver_serial(struct stats_serial *st_serial, int nbr) sscanf(line, "%u", &st_serial_i->line); /* * A value of 0 means an unused structure. - * So increment it to make sure it is not null. + * So increment it to make sure it is not zero. */ (st_serial_i->line)++; /* @@ -1172,7 +1172,7 @@ void read_net_ip(struct stats_net_ip *st_net_ip) /* *************************************************************************** - * Read IP network error statistics from /proc/net/snmp. + * Read IP network errors statistics from /proc/net/snmp. * * IN: * @st_net_eip Structure where stats will be saved. @@ -1290,7 +1290,7 @@ void read_net_icmp(struct stats_net_icmp *st_net_icmp) /* *************************************************************************** - * Read ICMP network error statistics from /proc/net/snmp. + * Read ICMP network errors statistics from /proc/net/snmp. * * IN: * @st_net_eicmp Structure where stats will be saved. @@ -1382,7 +1382,7 @@ void read_net_tcp(struct stats_net_tcp *st_net_tcp) /* *************************************************************************** - * Read TCP network error statistics from /proc/net/snmp. + * Read TCP network errors statistics from /proc/net/snmp. * * IN: * @st_net_etcp Structure where stats will be saved. @@ -1564,7 +1564,7 @@ void read_net_ip6(struct stats_net_ip6 *st_net_ip6) /* *************************************************************************** - * Read IPv6 network error statistics from /proc/net/snmp6. + * Read IPv6 network errors statistics from /proc/net/snmp6. * * IN: * @st_net_eip6 Structure where stats will be saved. @@ -1700,7 +1700,7 @@ void read_net_icmp6(struct stats_net_icmp6 *st_net_icmp6) /* *************************************************************************** - * Read ICMPv6 network error statistics from /proc/net/snmp6. + * Read ICMPv6 network errors statistics from /proc/net/snmp6. * * IN: * @st_net_eicmp6 Structure where stats will be saved. diff --git a/rndr_stats.c b/rndr_stats.c index ad297c7..a1ad42f 100644 --- a/rndr_stats.c +++ b/rndr_stats.c @@ -1584,7 +1584,7 @@ __print_funct_t render_net_ip_stats(struct activity *a, int isdb, char *pre, /* *************************************************************************** - * Display IP network error statistics in selected format. + * Display IP network errors statistics in selected format. * * IN: * @a Activity structure with statistics. @@ -1760,7 +1760,7 @@ __print_funct_t render_net_icmp_stats(struct activity *a, int isdb, char *pre, /* *************************************************************************** - * Display ICMP error message statistics in selected format. + * Display ICMP error messages statistics in selected format. * * IN: * @a Activity structure with statistics. @@ -1900,7 +1900,7 @@ __print_funct_t render_net_tcp_stats(struct activity *a, int isdb, char *pre, /* *************************************************************************** - * Display TCP network error statistics in selected format. + * Display TCP network errors statistics in selected format. * * IN: * @a Activity structure with statistics. @@ -2117,7 +2117,7 @@ __print_funct_t render_net_ip6_stats(struct activity *a, int isdb, char *pre, /* *************************************************************************** - * Display IPv6 network error statistics in selected format. + * Display IPv6 network errors statistics in selected format. * * IN: * @a Activity structure with statistics. @@ -2329,7 +2329,7 @@ __print_funct_t render_net_icmp6_stats(struct activity *a, int isdb, char *pre, /* *************************************************************************** - * Display ICMPv6 error message statistics in selected format. + * Display ICMPv6 error messages statistics in selected format. * * IN: * @a Activity structure with statistics. @@ -2854,7 +2854,7 @@ __print_funct_t render_filesystem_stats(struct activity *a, int isdb, char *pre, sfc = (struct stats_filesystem *) ((char *) a->buf[curr] + i * a->msize); if (!sfc->f_blocks) - /* Size of filesystem is null: We are at the end of the list */ + /* Size of filesystem is zero: We are at the end of the list */ break; render(isdb, pre, PT_USERND, diff --git a/sar.c b/sar.c index 5dce83c..6898584 100644 --- a/sar.c +++ b/sar.c @@ -265,7 +265,7 @@ void print_read_error(void) *************************************************************************** * Check that every selected activity actually belongs to the sequence list. * If not, then the activity should be unselected since it will not be sent - * by sadc. An activity can be not sent if its number of items is null. + * by sadc. An activity can be not sent if its number of items is zero. * * IN: * @act_nr Size of sequence list. diff --git a/sysstat-11.3.4.lsm b/sysstat-11.3.5.lsm similarity index 89% rename from sysstat-11.3.4.lsm rename to sysstat-11.3.5.lsm index 173755f..ba0bead 100644 --- a/sysstat-11.3.4.lsm +++ b/sysstat-11.3.5.lsm @@ -1,7 +1,7 @@ Begin4 Title: sysstat - the sar, sadf, mpstat, iostat, tapestat, pidstat and cifsiostat commands for Linux -Version: 11.3.4 -Entered-date: 2016-05-14 +Version: 11.3.5 +Entered-date: 2016-06-24 Description: The sysstat package contains the sar, sadf, mpstat, iostat, tapestat, pidstat, cifsiostat and sa tools for Linux. The sar command collects and reports system activity @@ -30,11 +30,11 @@ Keywords: system administration, sar, sadf, iostat, tapestat, mpstat, pidstat, c Author: sysstat [at] orange.fr (Sebastien Godard) Maintained-by: sysstat [at] orange.fr (Sebastien Godard) Primary-site: http://pagesperso-orange.fr/sebastien.godard/ - 460kB sysstat-11.3.4.tar.gz - 373kB sysstat-11.3.4.tar.bz2 - 331kB sysstat-11.3.4.tar.xz - 468kB sysstat-11.3.4-1.src.rpm - 319kB sysstat-11.3.4-1.x86_64.rpm + 467kiB sysstat-11.3.5.tar.gz + 379kiB sysstat-11.3.5.tar.bz2 + 336kiB sysstat-11.3.5.tar.xz + 475kiB sysstat-11.3.5-1.src.rpm + 329kiB sysstat-11.3.5-1.x86_64.rpm Alternate-site: Copying-policy: GPL End diff --git a/sysstat-11.3.4.spec b/sysstat-11.3.5.spec similarity index 99% rename from sysstat-11.3.4.spec rename to sysstat-11.3.5.spec index 0cce19c..2f9a72d 100644 --- a/sysstat-11.3.4.spec +++ b/sysstat-11.3.5.spec @@ -1,6 +1,6 @@ Summary: SAR, SADF, MPSTAT, IOSTAT, TAPESTAT, PIDSTAT and CIFSIOSTAT for Linux Name: sysstat -Version: 11.3.4 +Version: 11.3.5 Release: 1 License: GPL Group: Applications/System diff --git a/xml_stats.c b/xml_stats.c index 5a21596..c8f399b 100644 --- a/xml_stats.c +++ b/xml_stats.c @@ -795,7 +795,7 @@ close_xml_markup: /* *************************************************************************** - * Display network interfaces error statistics in XML. + * Display network interfaces errors statistics in XML. * * IN: * @a Activity structure with statistics. @@ -1050,7 +1050,7 @@ close_xml_markup: /* *************************************************************************** - * Display IP network error statistics in XML. + * Display IP network errors statistics in XML. * * IN: * @a Activity structure with statistics. @@ -1160,7 +1160,7 @@ close_xml_markup: /* *************************************************************************** - * Display ICMP error message statistics in XML. + * Display ICMP error messages statistics in XML. * * IN: * @a Activity structure with statistics. @@ -1258,7 +1258,7 @@ close_xml_markup: /* *************************************************************************** - * Display TCP network error statistics in XML. + * Display TCP network errors statistics in XML. * * IN: * @a Activity structure with statistics. @@ -1435,7 +1435,7 @@ close_xml_markup: /* *************************************************************************** - * Display IPv6 network error statistics in XML. + * Display IPv6 network errors statistics in XML. * * IN: * @a Activity structure with statistics. @@ -1557,7 +1557,7 @@ close_xml_markup: /* *************************************************************************** - * Display ICMPv6 error message statistics in XML. + * Display ICMPv6 error messages statistics in XML. * * IN: * @a Activity structure with statistics. @@ -2028,7 +2028,7 @@ __print_funct_t xml_print_filesystem_stats(struct activity *a, int curr, int tab sfc = (struct stats_filesystem *) ((char *) a->buf[curr] + i * a->msize); if (!sfc->f_blocks) - /* Size of filesystem is null: We are at the end of the list */ + /* Size of filesystem is zero: We are at the end of the list */ break; xprintf(tab, "opt_flags) ? sfc->mountp : sfc->fs_name, (double) sfc->f_bfree / 1024 / 1024, (double) (sfc->f_blocks - sfc->f_bfree) / 1024 / 1024, - /* f_blocks is not null. But test it anyway ;-) */ + /* f_blocks is not zero. But test it anyway ;-) */ sfc->f_blocks ? SP_VALUE(sfc->f_bfree, sfc->f_blocks, sfc->f_blocks) : 0.0, sfc->f_blocks ? SP_VALUE(sfc->f_bavail, sfc->f_blocks, sfc->f_blocks) -- 2.49.0