Hello community, here is the log from the commit of package sysstat for openSUSE:Factory checked in at 2018-06-22 13:35:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysstat (Old) and /work/SRC/openSUSE:Factory/.sysstat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysstat" Fri Jun 22 13:35:54 2018 rev:73 rq:618309 version:11.6.4 Changes: -------- --- /work/SRC/openSUSE:Factory/sysstat/sysstat.changes 2018-04-27 16:09:53.865024541 +0200 +++ /work/SRC/openSUSE:Factory/.sysstat.new/sysstat.changes 2018-06-22 13:35:57.377379478 +0200 @@ -1,0 +2,7 @@ +Thu Jun 21 10:45:22 UTC 2018 - [email protected] + +- Version update to 11.6.4: + * The number of decimal places used by sysstat commands (sar, cifsiostat, iostat, mpstat and pidstat), + * The network interfaces, block devices and filesystems for which statistics shall be displayed by sar or sadf. + +------------------------------------------------------------------- Old: ---- sysstat-11.6.3.tar.xz New: ---- sysstat-11.6.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysstat.spec ++++++ --- /var/tmp/diff_new_pack.Y2scPS/_old 2018-06-22 13:35:58.297345469 +0200 +++ /var/tmp/diff_new_pack.Y2scPS/_new 2018-06-22 13:35:58.309345025 +0200 @@ -17,12 +17,12 @@ Name: sysstat -Version: 11.6.3 +Version: 11.6.4 Release: 0 Summary: Sar and Iostat Commands for Linux License: GPL-2.0-or-later Group: System/Monitoring -Url: http://pagesperso-orange.fr/sebastien.godard/ +URL: http://pagesperso-orange.fr/sebastien.godard/ Source: http://pagesperso-orange.fr/sebastien.godard/%{name}-%{version}.tar.xz Source1: isag.desktop Source2: sysstat.cron.suse @@ -107,7 +107,7 @@ %find_lang %{name} install -D -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/sysstat.service # change /usr/lib to /usr/lib64 or something else when needed -if [ "%{_libdir}" != "%{_prefix}/lib" ]; then +if [ "%{_libdir}" != "%{_libexecdir}" ]; then sed -i 's:%{_libexecdir}/:%{_libdir}/:g' \ %{buildroot}%{_sysconfdir}/sysstat/sysstat.cron \ %{buildroot}%{_unitdir}/sysstat.service @@ -135,7 +135,8 @@ %endif %files -f "%{name}.lang" -%doc CHANGES COPYING CREDITS FAQ.md README.md +%license COPYING +%doc CHANGES CREDITS FAQ.md README.md %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man8/* ++++++ sysstat-11.6.3.tar.xz -> sysstat-11.6.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.6.3/CHANGES new/sysstat-11.6.4/CHANGES --- old/sysstat-11.6.3/CHANGES 2018-04-06 11:54:48.000000000 +0200 +++ new/sysstat-11.6.4/CHANGES 2018-06-01 10:18:12.000000000 +0200 @@ -1,5 +1,10 @@ Changes: +2018/06/01: Version 11.6.4 - Sebastien Godard (sysstat <at> orange.fr) + * sar: Change how used memory (kbmemused) is calculated to be + consistent with free(1) and top(1)'s output. + * pidstat: Fix incorrect thread names displayed with -t and -l options. + 2018/04/06: Version 11.6.3 - Sebastien Godard (sysstat <at> orange.fr) * iostat: Refresh device list properly. * pidstat: Report CPU usage for a process as the sum of all threads. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.6.3/configure new/sysstat-11.6.4/configure --- old/sysstat-11.6.3/configure 2018-04-06 11:54:07.000000000 +0200 +++ new/sysstat-11.6.4/configure 2018-06-01 10:17:22.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for sysstat 11.6.3. +# Generated by GNU Autoconf 2.69 for sysstat 11.6.4. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='sysstat' PACKAGE_TARNAME='sysstat' -PACKAGE_VERSION='11.6.3' -PACKAGE_STRING='sysstat 11.6.3' +PACKAGE_VERSION='11.6.4' +PACKAGE_STRING='sysstat 11.6.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1307,7 +1307,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sysstat 11.6.3 to adapt to many kinds of systems. +\`configure' configures sysstat 11.6.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1368,7 +1368,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysstat 11.6.3:";; + short | recursive ) echo "Configuration of sysstat 11.6.4:";; esac cat <<\_ACEOF @@ -1487,7 +1487,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sysstat configure 11.6.3 +sysstat configure 11.6.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1906,7 +1906,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sysstat $as_me 11.6.3, which was +It was created by sysstat $as_me 11.6.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5979,7 +5979,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sysstat $as_me 11.6.3, which was +This file was extended by sysstat $as_me 11.6.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6032,7 +6032,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sysstat config.status 11.6.3 +sysstat config.status 11.6.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.6.3/configure.in new/sysstat-11.6.4/configure.in --- old/sysstat-11.6.3/configure.in 2018-04-06 11:54:07.000000000 +0200 +++ new/sysstat-11.6.4/configure.in 2018-06-01 10:17:22.000000000 +0200 @@ -4,7 +4,7 @@ # Modified by Sebastien Godard (sysstat <at> orange.fr) # Initialization of $PACKAGE_VERSION and $PACKAGE_NAME variables -AC_INIT(sysstat, 11.6.3) +AC_INIT(sysstat, 11.6.4) # Ensure that a recent enough version of Autoconf is being used AC_PREREQ(2.53) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.6.3/json_stats.c new/sysstat-11.6.4/json_stats.c --- old/sysstat-11.6.3/json_stats.c 2018-04-06 11:54:07.000000000 +0200 +++ new/sysstat-11.6.4/json_stats.c 2018-06-01 10:17:22.000000000 +0200 @@ -470,6 +470,7 @@ struct stats_memory *smc = (struct stats_memory *) a->buf[curr]; int sep = FALSE; + unsigned long nousedmem; xprintf0(tab, "\"memory\": {"); @@ -477,6 +478,11 @@ sep = TRUE; + nousedmem = smc->frmkb + smc->bufkb + smc->camkb + smc->slabkb; + if (nousedmem > smc->tlmkb) { + nousedmem = smc->tlmkb; + } + printf("\"memfree\": %lu, " "\"avail\": %lu, " "\"memused\": %lu, " @@ -490,9 +496,9 @@ "\"dirty\": %lu", smc->frmkb, smc->availablekb, - smc->tlmkb - smc->frmkb, + smc->tlmkb - nousedmem, smc->tlmkb ? - SP_VALUE(smc->frmkb, smc->tlmkb, smc->tlmkb) : + SP_VALUE(nousedmem, smc->tlmkb, smc->tlmkb) : 0.0, smc->bufkb, smc->camkb, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.6.3/man/sar.in new/sysstat-11.6.4/man/sar.in --- old/sysstat-11.6.3/man/sar.in 2018-04-06 11:54:07.000000000 +0200 +++ new/sysstat-11.6.4/man/sar.in 2018-06-01 10:17:22.000000000 +0200 @@ -1,4 +1,4 @@ -.TH SAR 1 "JUNE 2017" Linux "Linux User's Manual" -*- nroff -*- +.TH SAR 1 "MAY 2018" Linux "Linux User's Manual" -*- nroff -*- .SH NAME sar \- Collect, report, or save system activity information. .SH SYNOPSIS @@ -1936,8 +1936,14 @@ .B kbmemused .RS -Amount of used memory in kilobytes. This does not take into account memory -used by the kernel itself. +Amount of used memory in kilobytes (calculated as total installed memory - +.B kbmemfree +- +.B kbbuffers +- +.B kbcached +- +.BR kbslab ). .RE .B %memused diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.6.3/nls/sysstat.pot new/sysstat-11.6.4/nls/sysstat.pot --- old/sysstat-11.6.3/nls/sysstat.pot 2018-04-06 11:54:30.000000000 +0200 +++ new/sysstat-11.6.4/nls/sysstat.pot 2018-06-01 10:17:36.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n" -"POT-Creation-Date: 2018-04-06 11:54+0200\n" +"POT-Creation-Date: 2018-06-01 10:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -17,6 +17,57 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#: sa_common.c:1000 +#, c-format +msgid "Error while reading system activity file: %s\n" +msgstr "" + +#: sa_common.c:1010 +#, c-format +msgid "End of system activity file unexpected\n" +msgstr "" + +#: sa_common.c:1029 +#, c-format +msgid "File created by sar/sadc from sysstat version %d.%d.%d" +msgstr "" + +#: sa_common.c:1062 +#, c-format +msgid "Invalid system activity file: %s\n" +msgstr "" + +#: sa_common.c:1074 +#, c-format +msgid "Endian format mismatch\n" +msgstr "" + +#: sa_common.c:1078 +#, c-format +msgid "Current sysstat version cannot read the format of this file (%#x)\n" +msgstr "" + +#: sa_common.c:1204 sadc.c:765 sadc.c:774 sadc.c:841 ioconf.c:510 +#: rd_stats.c:69 count.c:118 +#, c-format +msgid "Cannot open %s: %s\n" +msgstr "" + +#: sa_common.c:1207 +#, c-format +msgid "Please check if data collecting is enabled\n" +msgstr "" + +#: sa_common.c:1400 +#, c-format +msgid "Requested activities not available in file %s\n" +msgstr "" + +#: sa_common.c:1590 iostat.c:1819 +#, c-format +msgid "Invalid type of persistent device name\n" +msgstr "" + #: iostat.c:88 cifsiostat.c:72 mpstat.c:128 sar.c:98 tapestat.c:97 #, c-format msgid "Usage: %s [ options ] [ <interval> [ <count> ] ]\n" @@ -49,11 +100,6 @@ msgid "Cannot find disk data\n" msgstr "" -#: iostat.c:1819 sa_common.c:1590 -#, c-format -msgid "Invalid type of persistent device name\n" -msgstr "" - #: sadc.c:91 #, c-format msgid "Usage: %s [ options ] [ <interval> [ <count> ] ] [ <outfile> ]\n" @@ -77,12 +123,6 @@ msgid "Cannot write system activity file header: %s\n" msgstr "" -#: sadc.c:765 sadc.c:774 sadc.c:841 ioconf.c:510 rd_stats.c:69 -#: sa_common.c:1204 count.c:118 -#, c-format -msgid "Cannot open %s: %s\n" -msgstr "" - #: sadc.c:1021 #, c-format msgid "Cannot append data to that file (%s)\n" @@ -115,7 +155,7 @@ "[ -N { <node_list> | ALL } ] [ -o JSON ] [ -P { <cpu_list> | ON | ALL } ]\n" msgstr "" -#: mpstat.c:1674 sar.c:360 pidstat.c:2399 +#: mpstat.c:1674 sar.c:360 pidstat.c:2401 msgid "Average:" msgstr "" @@ -172,11 +212,28 @@ msgid "\t[Unknown activity format]" msgstr "" -#: pr_stats.c:2535 pr_stats.c:2546 pr_stats.c:2653 pr_stats.c:2664 +#: sadf.c:89 +#, c-format +msgid "" +"Usage: %s [ options ] [ <interval> [ <count> ] ] [ <datafile> | -[0-9]+ ]\n" +msgstr "" + +#: sadf.c:92 +#, c-format +msgid "" +"Options are:\n" +"[ -C ] [ -c | -d | -g | -j | -p | -r | -x ] [ -H ] [ -h ] [ -T | -t | -U ] " +"[ -V ]\n" +"[ -O <opts> [,...] ] [ -P { <cpu> [,...] | ALL } ]\n" +"[ -s [ <hh:mm[:ss]> ] ] [ -e [ <hh:mm[:ss]> ] ]\n" +"[ -- <sar_options> ]\n" +msgstr "" + +#: pr_stats.c:2541 pr_stats.c:2552 pr_stats.c:2659 pr_stats.c:2670 msgid "Summary:" msgstr "" -#: pr_stats.c:2588 +#: pr_stats.c:2594 msgid "Other devices not listed here" msgstr "" @@ -415,46 +472,6 @@ "[ -p { <pid> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n" msgstr "" -#: sa_common.c:1000 -#, c-format -msgid "Error while reading system activity file: %s\n" -msgstr "" - -#: sa_common.c:1010 -#, c-format -msgid "End of system activity file unexpected\n" -msgstr "" - -#: sa_common.c:1029 -#, c-format -msgid "File created by sar/sadc from sysstat version %d.%d.%d" -msgstr "" - -#: sa_common.c:1062 -#, c-format -msgid "Invalid system activity file: %s\n" -msgstr "" - -#: sa_common.c:1074 -#, c-format -msgid "Endian format mismatch\n" -msgstr "" - -#: sa_common.c:1078 -#, c-format -msgid "Current sysstat version cannot read the format of this file (%#x)\n" -msgstr "" - -#: sa_common.c:1207 -#, c-format -msgid "Please check if data collecting is enabled\n" -msgstr "" - -#: sa_common.c:1400 -#, c-format -msgid "Requested activities not available in file %s\n" -msgstr "" - #: tapestat.c:99 #, c-format msgid "" @@ -471,20 +488,3 @@ #, c-format msgid "Cannot handle so many processors!\n" msgstr "" - -#: sadf.c:89 -#, c-format -msgid "" -"Usage: %s [ options ] [ <interval> [ <count> ] ] [ <datafile> | -[0-9]+ ]\n" -msgstr "" - -#: sadf.c:92 -#, c-format -msgid "" -"Options are:\n" -"[ -C ] [ -c | -d | -g | -j | -p | -r | -x ] [ -H ] [ -h ] [ -T | -t | -U ] " -"[ -V ]\n" -"[ -O <opts> [,...] ] [ -P { <cpu> [,...] | ALL } ]\n" -"[ -s [ <hh:mm[:ss]> ] ] [ -e [ <hh:mm[:ss]> ] ]\n" -"[ -- <sar_options> ]\n" -msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.6.3/pidstat.c new/sysstat-11.6.4/pidstat.c --- old/sysstat-11.6.3/pidstat.c 2018-04-06 11:54:07.000000000 +0200 +++ new/sysstat-11.6.4/pidstat.c 2018-06-01 10:17:22.000000000 +0200 @@ -280,6 +280,8 @@ /* *************************************************************************** * Get pointer on task's command string. + * If this is a thread then return the short command name so that threads + * can still be identified. * * IN: * @pst Pointer on structure with process stats and command line. @@ -287,7 +289,7 @@ */ char *get_tcmd(struct pid_stats *pst) { - if (DISPLAY_CMDLINE(pidflag) && strlen(pst->cmdline)) + if (DISPLAY_CMDLINE(pidflag) && strlen(pst->cmdline) && !pst->tgid) /* Option "-l" used */ return pst->cmdline; else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.6.3/pr_stats.c new/sysstat-11.6.4/pr_stats.c --- old/sysstat-11.6.3/pr_stats.c 2018-04-06 11:54:07.000000000 +0200 +++ new/sysstat-11.6.4/pr_stats.c 2018-06-01 10:17:22.000000000 +0200 @@ -493,6 +493,7 @@ avg_tlskb = 0, avg_caskb = 0; int unit = NO_UNIT; + unsigned long nousedmem; if (DISPLAY_UNIT(flags)) { /* Default values unit is kB */ @@ -506,14 +507,18 @@ if (!dispavg) { /* Display instantaneous values */ + nousedmem = smc->frmkb + smc->bufkb + smc->camkb + smc->slabkb; + if (nousedmem > smc->tlmkb) { + nousedmem = smc->tlmkb; + } printf("%-11s", timestamp[curr]); cprintf_u64(unit, 3, 9, (unsigned long long) smc->frmkb, (unsigned long long) smc->availablekb, - (unsigned long long) (smc->tlmkb - smc->frmkb)); + (unsigned long long) (smc->tlmkb - nousedmem)); cprintf_pc(DISPLAY_UNIT(flags), 1, 9, 2, smc->tlmkb ? - SP_VALUE(smc->frmkb, smc->tlmkb, smc->tlmkb) + SP_VALUE(nousedmem, smc->tlmkb, smc->tlmkb) : 0.0); cprintf_u64(unit, 3, 9, (unsigned long long) smc->bufkb, @@ -561,14 +566,15 @@ } else { /* Display average values */ + nousedmem = avg_frmkb + avg_bufkb + avg_camkb + avg_slabkb; printf("%-11s", timestamp[curr]); cprintf_f(unit, 3, 9, 0, (double) avg_frmkb / avg_count, (double) avg_availablekb / avg_count, - (double) smc->tlmkb - ((double) avg_frmkb / avg_count)); + (double) smc->tlmkb - ((double) nousedmem / avg_count)); cprintf_pc(DISPLAY_UNIT(flags), 1, 9, 2, smc->tlmkb ? - SP_VALUE((double) (avg_frmkb / avg_count), smc->tlmkb, smc->tlmkb) + SP_VALUE((double) (nousedmem / avg_count), smc->tlmkb, smc->tlmkb) : 0.0); cprintf_f(unit, 3, 9, 0, (double) avg_bufkb / avg_count, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.6.3/rndr_stats.c new/sysstat-11.6.4/rndr_stats.c --- old/sysstat-11.6.3/rndr_stats.c 2018-04-06 11:54:07.000000000 +0200 +++ new/sysstat-11.6.4/rndr_stats.c 2018-06-01 10:17:22.000000000 +0200 @@ -741,9 +741,15 @@ int pt_newlin = (DISPLAY_HORIZONTALLY(flags) ? PT_NOFLAG : PT_NEWLIN); int ptn; + unsigned long nousedmem; if (DISPLAY_MEMORY(a->opt_flags)) { + nousedmem = smc->frmkb + smc->bufkb + smc->camkb + smc->slabkb; + if (nousedmem > smc->tlmkb) { + nousedmem = smc->tlmkb; + } + render(isdb, pre, PT_USEINT, "-\tkbmemfree", NULL, NULL, smc->frmkb, DNOVAL, NULL); @@ -754,12 +760,12 @@ render(isdb, pre, PT_USEINT, "-\tkbmemused", NULL, NULL, - smc->tlmkb - smc->frmkb, DNOVAL, NULL); + smc->tlmkb - nousedmem, DNOVAL, NULL); render(isdb, pre, PT_NOFLAG, "-\t%memused", NULL, NULL, NOVAL, smc->tlmkb ? - SP_VALUE(smc->frmkb, smc->tlmkb, smc->tlmkb) : + SP_VALUE(nousedmem, smc->tlmkb, smc->tlmkb) : 0.0, NULL); render(isdb, pre, PT_USEINT, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.6.3/svg_stats.c new/sysstat-11.6.4/svg_stats.c --- old/sysstat-11.6.3/svg_stats.c 2018-04-06 11:54:08.000000000 +0200 +++ new/sysstat-11.6.4/svg_stats.c 2018-06-01 10:17:22.000000000 +0200 @@ -1604,6 +1604,7 @@ static int *outsize; double tval; int i; + unsigned long nousedmem; if (action & F_BEGIN) { /* @@ -1618,7 +1619,11 @@ save_extrema(0, 17, 0, (void *) a->buf[curr], NULL, itv, spmin, spmax, g_fields); /* Compute %memused min/max values */ - tval = smc->tlmkb ? SP_VALUE(smc->frmkb, smc->tlmkb, smc->tlmkb) : 0.0; + nousedmem = smc->frmkb + smc->bufkb + smc->camkb + smc->slabkb; + if (nousedmem > smc->tlmkb) { + nousedmem = smc->tlmkb; + } + tval = smc->tlmkb ? SP_VALUE(nousedmem, smc->tlmkb, smc->tlmkb) : 0.0; if (tval > *(spmax + 3)) { *(spmax + 3) = tval; } @@ -1653,7 +1658,7 @@ *(spmin + 20) = tval; } /* Compute memused min/max values in MB */ - tval = ((double) (smc->tlmkb - smc->frmkb)) / 1024; + tval = ((double) (smc->tlmkb - nousedmem)) / 1024; if (tval > *(spmax + 2)) { *(spmax + 2) = tval; } @@ -1675,7 +1680,7 @@ out, outsize, svg_p->restart); /* MBmemused */ lnappend(record_hdr->ust_time - svg_p->ust_time_ref, - ((double) (smc->tlmkb - smc->frmkb)) / 1024, + ((double) (smc->tlmkb - nousedmem)) / 1024, out + 2, outsize + 2, svg_p->restart); /* MBavail */ lnappend(record_hdr->ust_time - svg_p->ust_time_ref, @@ -1741,7 +1746,7 @@ brappend(record_hdr->ust_time - svg_p->ust_time_ref, 0.0, smc->tlmkb ? - SP_VALUE(smc->frmkb, smc->tlmkb, smc->tlmkb) : 0.0, + SP_VALUE(nousedmem, smc->tlmkb, smc->tlmkb) : 0.0, out + 3, outsize + 3, svg_p->dt); /* %commit */ brappend(record_hdr->ust_time - svg_p->ust_time_ref, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.6.3/sysstat-11.6.3.lsm new/sysstat-11.6.4/sysstat-11.6.3.lsm --- old/sysstat-11.6.3/sysstat-11.6.3.lsm 2018-04-06 11:58:25.000000000 +0200 +++ new/sysstat-11.6.4/sysstat-11.6.3.lsm 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -Begin4 -Title: sysstat - the sar, sadf, mpstat, iostat, tapestat, pidstat and cifsiostat commands for Linux -Version: 11.6.3 -Entered-date: 2018-04-06 -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 - information. - The information collected by sar can be saved in a file - in a binary format for future inspection. - The statistics reported by sar concern I/O transfer rates, - paging activity, process-related activities, interrupts, - network activity, memory and swap space utilization, CPU - utilization, kernel activities and TTY statistics, among - others. Both UP and SMP machines are fully supported. - The sadf command is used to display data collected by sar in various - formats (XML, database-friendly, etc.) and to draw graphs (SVG). - The mpstat command reports global and per-processor statistics. - The iostat command reports CPU utilization and I/O statistics - for disks. - The tapestat command reports statistics for tape drives connected - to the system. - The pidstat command reports statistics for Linux tasks (processes). - The cifsiostat command reports I/O statistics for CIFS filesystems. - NB: Send bugs, patches, suggestions and/or questions to - (sysstat [at] orange.fr). - URL: http://pagesperso-orange.fr/sebastien.godard/ -Keywords: system administration, system monitoring, sar, sadf, iostat, mpstat, tapestat, pidstat, system accounting, performance, tuning -Author: [email protected] (Sebastien Godard) -Maintained-by: [email protected] (Sebastien Godard) -Primary-site: http://pagesperso-orange.fr/sebastien.godard/ - 516kiB sysstat-11.6.3.tar.xz -Alternate-site: -Copying-policy: GPL -End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.6.3/sysstat-11.6.3.spec new/sysstat-11.6.4/sysstat-11.6.3.spec --- old/sysstat-11.6.3/sysstat-11.6.3.spec 2018-04-06 11:55:47.000000000 +0200 +++ new/sysstat-11.6.4/sysstat-11.6.3.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1,81 +0,0 @@ -Summary: SAR, SADF, MPSTAT, IOSTAT, TAPESTAT, PIDSTAT and CIFSIOSTAT for Linux -Name: sysstat -Version: 11.6.3 -Release: 1 -License: GPL -Group: Applications/System -Source0: %{name}-%{version}.tar.gz -URL: http://pagesperso-orange.fr/sebastien.godard/ -Packager: Sebastien Godard <sysstat _at_ orange.fr> -BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n) -Requires: gettext - -%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 information. -The information collected by sar can be saved in a file in a binary -format for future inspection. The statistics reported by sar concern -I/O transfer rates, paging activity, process-related activities, -interrupts, network activity, memory and swap space utilization, CPU -utilization, kernel activities and TTY statistics, among others. Both -UP and SMP machines are fully supported. -The sadf command may be used to display data collected by sar in -various formats (CSV, XML, etc.) and to draw graphs (SVG). -The iostat command reports CPU utilization and I/O statistics for disks. -The tapestat command reports statistics for tapes connected to the system. -The mpstat command reports global and per-processor statistics. -The pidstat command reports statistics for Linux tasks (processes). -The cifsiostat command reports I/O statistics for CIFS filesystems. - -%prep -%setup - -%build -# To include cron installation, add options --enable-install-cron and --enable-copy-only -./configure --prefix=%{_prefix} \ - --disable-file-attr \ - sa_lib_dir=%{_libdir}/sa \ - --mandir=%{_mandir} \ - DESTDIR=$RPM_BUILD_ROOT -make - -%install -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/var/log/sa - -make install - -mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d -install -m 755 sysstat $RPM_BUILD_ROOT/etc/rc.d/init.d/sysstat -mkdir -p $RPM_BUILD_ROOT/etc/sysconfig -install -m 644 sysstat.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/sysstat -install -m 644 sysstat.ioconf $RPM_BUILD_ROOT/etc/sysconfig/sysstat.ioconf -mkdir -p $RPM_BUILD_ROOT/etc/cron.d -install -m 644 cron/sysstat.crond.sample $RPM_BUILD_ROOT/etc/cron.d/sysstat -mkdir -p $RPM_BUILD_ROOT/etc/rc2.d -cd $RPM_BUILD_ROOT/etc/rc2.d && ln -sf ../init.d/sysstat S01sysstat -mkdir -p $RPM_BUILD_ROOT/etc/rc3.d -cd $RPM_BUILD_ROOT/etc/rc3.d && ln -sf ../init.d/sysstat S01sysstat -mkdir -p $RPM_BUILD_ROOT/etc/rc5.d -cd $RPM_BUILD_ROOT/etc/rc5.d && ln -sf ../init.d/sysstat S01sysstat - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(644,root,root,755) -%doc %{_datadir}/doc/sysstat-%{version}/* -%attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_libdir}/sa/* -%attr(644,root,root) %{_mandir}/man*/* -%attr(644,root,root) %{_datadir}/locale/*/LC_MESSAGES/sysstat.mo -%attr(755,root,root) %dir /var/log/sa -%attr(755,root,root) /etc/rc.d/init.d/sysstat -%attr(644,root,root) /etc/sysconfig/sysstat -%attr(644,root,root) /etc/sysconfig/sysstat.ioconf -/etc/rc2.d/S01sysstat -/etc/rc3.d/S01sysstat -/etc/rc5.d/S01sysstat -%config(noreplace) %attr(0644,root,root) /etc/cron.d/sysstat - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.6.3/sysstat-11.6.4.lsm new/sysstat-11.6.4/sysstat-11.6.4.lsm --- old/sysstat-11.6.3/sysstat-11.6.4.lsm 1970-01-01 01:00:00.000000000 +0100 +++ new/sysstat-11.6.4/sysstat-11.6.4.lsm 2018-06-01 10:20:14.000000000 +0200 @@ -0,0 +1,35 @@ +Begin4 +Title: sysstat - the sar, sadf, mpstat, iostat, tapestat, pidstat and cifsiostat commands for Linux +Version: 11.6.4 +Entered-date: 2018-06-01 +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 + information. + The information collected by sar can be saved in a file + in a binary format for future inspection. + The statistics reported by sar concern I/O transfer rates, + paging activity, process-related activities, interrupts, + network activity, memory and swap space utilization, CPU + utilization, kernel activities and TTY statistics, among + others. Both UP and SMP machines are fully supported. + The sadf command is used to display data collected by sar in various + formats (XML, database-friendly, etc.) and to draw graphs (SVG). + The mpstat command reports global and per-processor statistics. + The iostat command reports CPU utilization and I/O statistics + for disks. + The tapestat command reports statistics for tape drives connected + to the system. + The pidstat command reports statistics for Linux tasks (processes). + The cifsiostat command reports I/O statistics for CIFS filesystems. + NB: Send bugs, patches, suggestions and/or questions to + (sysstat [at] orange.fr). + URL: http://pagesperso-orange.fr/sebastien.godard/ +Keywords: system administration, system monitoring, sar, sadf, iostat, mpstat, tapestat, pidstat, system accounting, performance, tuning +Author: [email protected] (Sebastien Godard) +Maintained-by: [email protected] (Sebastien Godard) +Primary-site: http://pagesperso-orange.fr/sebastien.godard/ + 506kiB sysstat-11.6.4.tar.xz +Alternate-site: +Copying-policy: GPL +End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.6.3/sysstat-11.6.4.spec new/sysstat-11.6.4/sysstat-11.6.4.spec --- old/sysstat-11.6.3/sysstat-11.6.4.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/sysstat-11.6.4/sysstat-11.6.4.spec 2018-06-01 10:18:42.000000000 +0200 @@ -0,0 +1,81 @@ +Summary: SAR, SADF, MPSTAT, IOSTAT, TAPESTAT, PIDSTAT and CIFSIOSTAT for Linux +Name: sysstat +Version: 11.6.4 +Release: 1 +License: GPL +Group: Applications/System +Source0: %{name}-%{version}.tar.gz +URL: http://pagesperso-orange.fr/sebastien.godard/ +Packager: Sebastien Godard <sysstat _at_ orange.fr> +BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n) +Requires: gettext + +%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 information. +The information collected by sar can be saved in a file in a binary +format for future inspection. The statistics reported by sar concern +I/O transfer rates, paging activity, process-related activities, +interrupts, network activity, memory and swap space utilization, CPU +utilization, kernel activities and TTY statistics, among others. Both +UP and SMP machines are fully supported. +The sadf command may be used to display data collected by sar in +various formats (CSV, XML, etc.) and to draw graphs (SVG). +The iostat command reports CPU utilization and I/O statistics for disks. +The tapestat command reports statistics for tapes connected to the system. +The mpstat command reports global and per-processor statistics. +The pidstat command reports statistics for Linux tasks (processes). +The cifsiostat command reports I/O statistics for CIFS filesystems. + +%prep +%setup + +%build +# To include cron installation, add options --enable-install-cron and --enable-copy-only +./configure --prefix=%{_prefix} \ + --disable-file-attr \ + sa_lib_dir=%{_libdir}/sa \ + --mandir=%{_mandir} \ + DESTDIR=$RPM_BUILD_ROOT +make + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/var/log/sa + +make install + +mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d +install -m 755 sysstat $RPM_BUILD_ROOT/etc/rc.d/init.d/sysstat +mkdir -p $RPM_BUILD_ROOT/etc/sysconfig +install -m 644 sysstat.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/sysstat +install -m 644 sysstat.ioconf $RPM_BUILD_ROOT/etc/sysconfig/sysstat.ioconf +mkdir -p $RPM_BUILD_ROOT/etc/cron.d +install -m 644 cron/sysstat.crond.sample $RPM_BUILD_ROOT/etc/cron.d/sysstat +mkdir -p $RPM_BUILD_ROOT/etc/rc2.d +cd $RPM_BUILD_ROOT/etc/rc2.d && ln -sf ../init.d/sysstat S01sysstat +mkdir -p $RPM_BUILD_ROOT/etc/rc3.d +cd $RPM_BUILD_ROOT/etc/rc3.d && ln -sf ../init.d/sysstat S01sysstat +mkdir -p $RPM_BUILD_ROOT/etc/rc5.d +cd $RPM_BUILD_ROOT/etc/rc5.d && ln -sf ../init.d/sysstat S01sysstat + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc %{_datadir}/doc/sysstat-%{version}/* +%attr(755,root,root) %{_bindir}/* +%attr(755,root,root) %{_libdir}/sa/* +%attr(644,root,root) %{_mandir}/man*/* +%attr(644,root,root) %{_datadir}/locale/*/LC_MESSAGES/sysstat.mo +%attr(755,root,root) %dir /var/log/sa +%attr(755,root,root) /etc/rc.d/init.d/sysstat +%attr(644,root,root) /etc/sysconfig/sysstat +%attr(644,root,root) /etc/sysconfig/sysstat.ioconf +/etc/rc2.d/S01sysstat +/etc/rc3.d/S01sysstat +/etc/rc5.d/S01sysstat +%config(noreplace) %attr(0644,root,root) /etc/cron.d/sysstat + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.6.3/xml_stats.c new/sysstat-11.6.4/xml_stats.c --- old/sysstat-11.6.3/xml_stats.c 2018-04-06 11:54:08.000000000 +0200 +++ new/sysstat-11.6.4/xml_stats.c 2018-06-01 10:17:22.000000000 +0200 @@ -452,11 +452,17 @@ { struct stats_memory *smc = (struct stats_memory *) a->buf[curr]; + unsigned long nousedmem; xprintf(tab, "<memory per=\"second\" unit=\"kB\">"); if (DISPLAY_MEMORY(a->opt_flags)) { + nousedmem = smc->frmkb + smc->bufkb + smc->camkb + smc->slabkb; + if (nousedmem > smc->tlmkb) { + nousedmem = smc->tlmkb; + } + xprintf(++tab, "<memfree>%lu</memfree>", smc->frmkb); @@ -464,11 +470,11 @@ smc->availablekb); xprintf(tab, "<memused>%lu</memused>", - smc->tlmkb - smc->frmkb); + smc->tlmkb - nousedmem); xprintf(tab, "<memused-percent>%.2f</memused-percent>", smc->tlmkb ? - SP_VALUE(smc->frmkb, smc->tlmkb, smc->tlmkb) : + SP_VALUE(nousedmem, smc->tlmkb, smc->tlmkb) : 0.0); xprintf(tab, "<buffers>%lu</buffers>",
