From e7295b25434b6082bd8a6ad9f7f02cad63b2ce49 Mon Sep 17 00:00:00 2001 From: Sebastien GODARD Date: Sun, 4 Oct 2020 08:40:41 +0200 Subject: [PATCH] simtest: Add more tests for CPU going offline Signed-off-by: Sebastien GODARD --- tests/01700 | 5 + tests/01705 | 1 + tests/01710 | 5 + tests/01715 | 1 + tests/01720 | 5 + tests/01725 | 1 + tests/TLIST | 11 + tests/expected.cifsiostat | 2 +- tests/expected.cifsiostat-SMB2 | 2 +- tests/expected.cifsiostat-dec | 2 +- tests/expected.cifsiostat-h | 2 +- tests/expected.cifsiostat-k | 2 +- tests/expected.cifsiostat-pretty | 2 +- tests/expected.cifsiostat-t-human | 2 +- tests/expected.data-ini | 106 +- tests/expected.data-wghfreq-sadf-d | 4 +- tests/expected.data-wghfreq-sadf-j | 10 +- tests/expected.data-wghfreq-sadf-p | 4 +- tests/expected.data-wghfreq-sadf-r | 6 +- tests/expected.data-wghfreq-sadf-x | 6 +- tests/expected.iostat | 4 +- tests/expected.iostat+f-alt-ALL-ms | 4 +- tests/expected.iostat+f-alt-list-ms | 4 +- tests/expected.iostat+f-alt-pALL | 4 +- tests/expected.iostat-0 | 4 +- tests/expected.iostat-ALL | 4 +- tests/expected.iostat-ALL-p-ALL | 2 +- tests/expected.iostat-N | 2 +- tests/expected.iostat-alt-pALL | 4 +- tests/expected.iostat-ct | 4 +- tests/expected.iostat-dec | 4 +- tests/expected.iostat-ev | 2 +- tests/expected.iostat-f-alt-ALL-ms | 4 +- tests/expected.iostat-f-alt-list-ms | 4 +- tests/expected.iostat-f-alt-pALL | 4 +- tests/expected.iostat-f-alt-pALL-ms | 4 +- tests/expected.iostat-foo | 2 +- tests/expected.iostat-g | 2 +- tests/expected.iostat-g-JSON | 2 +- tests/expected.iostat-g2 | 4 +- tests/expected.iostat-gALL | 4 +- tests/expected.iostat-gH | 2 +- tests/expected.iostat-gp | 4 +- tests/expected.iostat-gpALL | 4 +- tests/expected.iostat-gpy | 4 +- tests/expected.iostat-h | 2 +- tests/expected.iostat-human | 4 +- tests/expected.iostat-jID | 2 +- tests/expected.iostat-jLABEL | 2 +- tests/expected.iostat-jLABEL-list | 2 +- tests/expected.iostat-jPARTUUID | 2 +- tests/expected.iostat-jPATH | 2 +- tests/expected.iostat-jUUID-list | 2 +- tests/expected.iostat-kz | 4 +- tests/expected.iostat-list | 4 +- tests/expected.iostat-p-ALL | 2 +- tests/expected.iostat-p-sda | 4 +- tests/expected.iostat-pretty | 2 +- tests/expected.iostat-s | 4 +- tests/expected.iostat-s-0 | 4 +- tests/expected.iostat-s-ALL | 2 +- tests/expected.iostat-s-ALL-p-ALL | 4 +- tests/expected.iostat-s-list | 2 +- tests/expected.iostat-s-list-p | 4 +- tests/expected.iostat-sigint | 8 +- tests/expected.iostat-sp-0 | 4 +- tests/expected.iostat-x | 4 +- tests/expected.iostat-x-0 | 4 +- tests/expected.iostat-x-ALL | 4 +- tests/expected.iostat-x-ALL-flush | 8 +- tests/expected.iostat-x-ALL-p-ALL | 2 +- tests/expected.iostat-x-list | 2 +- tests/expected.iostat-x-p-ALL | 4 +- tests/expected.iostat-x-p-ALL-JSON | 4 +- tests/expected.iostat-x-p-sda | 4 +- tests/expected.iostat-xs | 4 +- tests/expected.iostat-xs-list | 4 +- tests/expected.iostat-xs-list-part | 4 +- tests/expected.iostat-xs-p-sda | 2 +- tests/expected.iostat-xs-sdb | 2 +- tests/expected.iostat-ym | 2 +- tests/expected.mpstat | 4 +- tests/expected.mpstat-A | 12 +- tests/expected.mpstat-A-JSON | 62 +- tests/expected.mpstat-APN | 2 +- tests/expected.mpstat-I | 6 +- tests/expected.mpstat-T | 3 +- tests/expected.mpstat-T-JSON | 7 +- tests/expected.mpstat-dec | 4 +- tests/expected.pidstat | 2 +- tests/expected.pidstat-A | 2 +- tests/expected.pidstat-A-ALL | 2 +- tests/expected.pidstat-A-TCHILD | 2 +- tests/expected.pidstat-A-TTASK | 2 +- tests/expected.pidstat-At | 2 +- tests/expected.pidstat-At-ALL | 2 +- tests/expected.pidstat-At-TALL | 2 +- tests/expected.pidstat-C | 2 +- tests/expected.pidstat-G | 2 +- tests/expected.pidstat-Hh | 2 +- tests/expected.pidstat-I | 2 +- tests/expected.pidstat-U | 2 +- tests/expected.pidstat-Ufoo | 2 +- tests/expected.pidstat-Uroot | 2 +- tests/expected.pidstat-d-TTASK-ALL | 2 +- tests/expected.pidstat-dec | 2 +- tests/expected.pidstat-e | 2 +- tests/expected.pidstat-l | 2 +- tests/expected.pidstat-lC | 2 +- tests/expected.pidstat-lG | 2 +- tests/expected.pidstat-p | 2 +- tests/expected.pidstat-p-unkwn | 2 +- tests/expected.pidstat-plist | 2 +- tests/expected.pidstat-sigint | 2 +- tests/expected.sa1 | 4 +- tests/expected.sa1-sleep | 2 +- tests/expected.sa2 | 4 +- tests/expected.sadf-H | 8 +- tests/expected.sadf-d | 66 +- tests/expected.sadf-d-qu | 6 +- tests/expected.sadf-g | 612 ++++---- tests/expected.sadf-g-cc | 21 +- tests/expected.sadf-j | 76 +- tests/expected.sadf-p | 322 ++-- tests/expected.sadf-r | 100 +- tests/expected.sadf-se | 2 +- tests/expected.sadf-x | 68 +- tests/expected.sar-0 | 4 +- tests/expected.sar-1 | 2 +- tests/expected.sar-D | 2 +- tests/expected.sar-ISO | 10 +- tests/expected.sar-all | 58 +- tests/expected.sar-always | 10 +- tests/expected.sar-autonever | 10 +- tests/expected.sar-cpu6off | 87 ++ tests/expected.sar-cpu8off | 87 ++ tests/expected.sar-cpu8onoff | 89 ++ tests/expected.sar-dec | 104 +- tests/expected.sar-dev | 4 +- tests/expected.sar-fs | 16 +- tests/expected.sar-human | 106 +- tests/expected.sar-i | 13 +- tests/expected.sar-iface | 4 +- tests/expected.sar-jID | 4 +- tests/expected.sar-jSID | 4 +- tests/expected.sar-jUUID | 4 +- tests/expected.sar-m-freq | 9 +- tests/expected.sar-pretty | 4 +- tests/expected.sar-qALL | 2 +- tests/expected.sar-qIO | 2 +- tests/expected.sar-qMEMIO | 2 +- tests/expected.sar-qPSI | 2 +- tests/expected.sar-qu | 4 +- tests/expected.sar-se | 2 +- tests/expected.sar-sigint | 2 +- tests/expected.sar-u | 13 +- tests/expected.sar-z | 2 +- tests/expected.sar1 | 2 +- tests/expected.tapestat | 2 +- tests/expected.tapestat-m | 2 +- tests/expected.tapestat-t | 2 +- tests/expected.tapestat-y | 2 +- tests/expected.tapestat-z | 2 +- tests/expected0.sadf | 2 +- tests/expected0.sadf-g | 2 +- tests/expected0.sadf-x | 4 +- tests/expected0.sar-A | 4 +- tests/expected01.sadf-H | 2 +- tests/expected01.sadf-d | 2 +- tests/expected01.sadf-g | 2 +- tests/expected01.sar-A | 4 +- tests/expected1.pidstat | 2 +- tests/expected1.pidstat-A-TCHILD | 2 +- tests/expected1.pidstat-A-TTASK | 2 +- tests/expected1.pidstat-At | 2 +- tests/expected1.pidstat-At-TALL-ALL | 2 +- tests/expected1.pidstat-At-TCHILD | 2 +- tests/expected1.pidstat-At-TCHILD-ALL | 2 +- tests/expected1.pidstat-At-TTASK | 2 +- tests/expected1.pidstat-At-TTASK-ALL | 2 +- tests/expected1.pidstat-C | 2 +- tests/expected1.pidstat-G | 2 +- tests/expected1.pidstat-d-TTASK | 2 +- tests/expected1.pidstat-p | 2 +- tests/expected1.sadf-g | 272 ++-- tests/expected2.iostat+f-alt-list-ms | 4 +- tests/expected2.iostat-f-alt-list-ms | 4 +- tests/expected2.iostat-gpALL | 4 +- tests/expected2.pidstat-C | 2 +- tests/expected2.pidstat-G | 2 +- tests/expected2.pidstat-p-unkwn | 2 +- tests/expected2.sadf-g | 1367 +++++++++++++---- tests/expected2.sar-all | 106 +- tests/expected2.sar-q | 4 +- tests/expected2.sar-qALL | 2 +- tests/expected2.sar-u | 13 +- tests/expected3.iostat-gpALL | 4 +- tests/expected3.pidstat-C | 2 +- tests/expected3.pidstat-G | 2 +- tests/expected3.sadf | 2 +- tests/expected3.sadf-g | 21 +- tests/expected3.sar-all | 42 +- tests/expected3.sar-i | 8 +- tests/expected3.sar-u | 2 +- tests/expected32.sar-u | 4 +- tests/expected33.sar-u | 4 +- tests/expected4.pidstat-C | 2 +- tests/expected4.pidstat-G | 2 +- tests/expected5.pidstat-C | 2 +- tests/expected6.pidstat-C | 2 +- tests/root.README | 7 +- tests/root1/proc/net/softnet_stat | 1 + tests/root1/proc/stat | 3 +- .../cpu/cpu8/cpufreq/stats/time_in_state | 5 + tests/root1/sys/devices/system/cpu/cpu8/node1 | 0 .../cpu/cpu8/topology/physical_package_id | 1 + .../cpu/cpu8/topology/thread_siblings_list | 1 + tests/root2/proc/stat | 2 +- .../cpu/cpu8/cpufreq/stats/time_in_state | 5 + tests/root2/sys/devices/system/cpu/cpu8/node1 | 0 .../cpu/cpu8/topology/physical_package_id | 1 + .../cpu/cpu8/topology/thread_siblings_list | 1 + tests/root3/proc/stat | 2 +- .../cpu/cpu8/cpufreq/stats/time_in_state | 5 + tests/root3/sys/devices/system/cpu/cpu8/node1 | 0 .../cpu/cpu8/topology/physical_package_id | 1 + .../cpu/cpu8/topology/thread_siblings_list | 1 + tests/root4/proc/net/softnet_stat | 1 + tests/root4/proc/stat | 3 +- .../cpu/cpu8/cpufreq/stats/time_in_state | 5 + tests/root4/sys/devices/system/cpu/cpu8/node1 | 0 .../cpu/cpu8/topology/physical_package_id | 1 + .../cpu/cpu8/topology/thread_siblings_list | 1 + tests/root5/proc/net/softnet_stat | 1 + tests/root5/proc/stat | 3 +- .../cpu/cpu8/cpufreq/stats/time_in_state | 5 + tests/root5/sys/devices/system/cpu/cpu8/node1 | 0 .../cpu/cpu8/topology/physical_package_id | 1 + .../cpu/cpu8/topology/thread_siblings_list | 1 + tests/root7/proc/net/softnet_stat | 18 +- 240 files changed, 2871 insertions(+), 1634 deletions(-) create mode 100644 tests/01700 create mode 100644 tests/01705 create mode 100644 tests/01710 create mode 100644 tests/01715 create mode 100644 tests/01720 create mode 100644 tests/01725 create mode 100644 tests/expected.sar-cpu6off create mode 100644 tests/expected.sar-cpu8off create mode 100644 tests/expected.sar-cpu8onoff create mode 100644 tests/root1/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state create mode 100644 tests/root1/sys/devices/system/cpu/cpu8/node1 create mode 100644 tests/root1/sys/devices/system/cpu/cpu8/topology/physical_package_id create mode 100644 tests/root1/sys/devices/system/cpu/cpu8/topology/thread_siblings_list create mode 100644 tests/root2/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state create mode 100644 tests/root2/sys/devices/system/cpu/cpu8/node1 create mode 100644 tests/root2/sys/devices/system/cpu/cpu8/topology/physical_package_id create mode 100644 tests/root2/sys/devices/system/cpu/cpu8/topology/thread_siblings_list create mode 100644 tests/root3/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state create mode 100644 tests/root3/sys/devices/system/cpu/cpu8/node1 create mode 100644 tests/root3/sys/devices/system/cpu/cpu8/topology/physical_package_id create mode 100644 tests/root3/sys/devices/system/cpu/cpu8/topology/thread_siblings_list create mode 100644 tests/root4/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state create mode 100644 tests/root4/sys/devices/system/cpu/cpu8/node1 create mode 100644 tests/root4/sys/devices/system/cpu/cpu8/topology/physical_package_id create mode 100644 tests/root4/sys/devices/system/cpu/cpu8/topology/thread_siblings_list create mode 100644 tests/root5/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state create mode 100644 tests/root5/sys/devices/system/cpu/cpu8/node1 create mode 100644 tests/root5/sys/devices/system/cpu/cpu8/topology/physical_package_id create mode 100644 tests/root5/sys/devices/system/cpu/cpu8/topology/thread_siblings_list diff --git a/tests/01700 b/tests/01700 new file mode 100644 index 0000000..27e92c2 --- /dev/null +++ b/tests/01700 @@ -0,0 +1,5 @@ +rm -f tests/root +ln -s root3 tests/root +LC_ALL=C TZ=GMT ./sar -P ALL -u -n SOFT 2 3 > tests/out.sar-cpu6off.tmp +rm -f tests/root +ln -s root1 tests/root diff --git a/tests/01705 b/tests/01705 new file mode 100644 index 0000000..34f37d2 --- /dev/null +++ b/tests/01705 @@ -0,0 +1 @@ +diff -u tests/out.sar-cpu6off.tmp tests/expected.sar-cpu6off diff --git a/tests/01710 b/tests/01710 new file mode 100644 index 0000000..87cbab6 --- /dev/null +++ b/tests/01710 @@ -0,0 +1,5 @@ +rm -f tests/root +ln -s root1 tests/root +LC_ALL=C TZ=GMT ./sar -P ALL -u -n SOFT 2 3 > tests/out.sar-cpu8onoff.tmp +rm -f tests/root +ln -s root1 tests/root diff --git a/tests/01715 b/tests/01715 new file mode 100644 index 0000000..c78a7de --- /dev/null +++ b/tests/01715 @@ -0,0 +1 @@ +diff -u tests/out.sar-cpu8onoff.tmp tests/expected.sar-cpu8onoff diff --git a/tests/01720 b/tests/01720 new file mode 100644 index 0000000..0916e50 --- /dev/null +++ b/tests/01720 @@ -0,0 +1,5 @@ +rm -f tests/root +ln -s root2 tests/root +LC_ALL=C TZ=GMT ./sar -P ALL -u -n SOFT 2 3 > tests/out.sar-cpu8off.tmp +rm -f tests/root +ln -s root1 tests/root diff --git a/tests/01725 b/tests/01725 new file mode 100644 index 0000000..e544924 --- /dev/null +++ b/tests/01725 @@ -0,0 +1 @@ +diff -u tests/out.sar-cpu8off.tmp tests/expected.sar-cpu8off diff --git a/tests/TLIST b/tests/TLIST index 2e2c777..079970e 100644 --- a/tests/TLIST +++ b/tests/TLIST @@ -333,6 +333,17 @@ NOTES: 01667 cat tests/out.data-wghfreq-sadf-x.tmp | $VER_XML --schema xml/sysstat.xsd - >/dev/null; 01669 cat tests/out.data-wghfreq-sadf-x.tmp | $VER_XML --dtdvalid xml/sysstat-*.dtd - >/dev/null; +===== Specific tests +01700 LC_ALL=C TZ=GMT ./sar -P ALL -u 2 3 > tests/out.sar-cpu6off.tmp + [Starting at root3 where CPU#6 is already offline] +01705 diff -u tests/out.sar-cpu6off.tmp tests/expected.sar-cpu6off +01710 LC_ALL=C TZ=GMT ./sar -P ALL -u -n SOFT 2 3 > tests/out.sar-cpu8onoff.tmp +01705 diff -u tests/out.sar-cpu8onoff.tmp tests/expected.sar-cpu8onoff + [CPU#8 - Last in list - online then offline] +01720 LC_ALL=C TZ=GMT ./sar -P ALL -u -n SOFT 2 3 > tests/out.sar-cpu8off.tmp + [CPU#8 - Last in list - already offline] +01725 diff -u tests/out.sar-cpu8off.tmp tests/expected.sar-cpu8off + ===== iostat tests (basic output) 02010 LC_ALL=C TZ=GMT ./iostat 2 3 > tests/out.iostat.tmp 02015 diff -u tests/out.iostat.tmp tests/expected.iostat diff --git a/tests/expected.cifsiostat b/tests/expected.cifsiostat index 283fc0c..65dab81 100644 --- a/tests/expected.cifsiostat +++ b/tests/expected.cifsiostat @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Filesystem rB/s wB/s rops/s wops/s fo/s fc/s fd/s \\addr\SHARED 0.03 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected.cifsiostat-SMB2 b/tests/expected.cifsiostat-SMB2 index 16160de..4ad1392 100644 --- a/tests/expected.cifsiostat-SMB2 +++ b/tests/expected.cifsiostat-SMB2 @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Filesystem rB/s wB/s rops/s wops/s fo/s fc/s fd/s \\addr\SHARED 0.03 0.01 0.00 0.00 0.00 0.32 0.00 diff --git a/tests/expected.cifsiostat-dec b/tests/expected.cifsiostat-dec index 2e64a7b..a393bfb 100644 --- a/tests/expected.cifsiostat-dec +++ b/tests/expected.cifsiostat-dec @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Filesystem rB/s wB/s rops/s wops/s fo/s fc/s fd/s \\addr\SHARED 0 0 0 0 0 0 0 diff --git a/tests/expected.cifsiostat-h b/tests/expected.cifsiostat-h index 85d791c..313a581 100644 --- a/tests/expected.cifsiostat-h +++ b/tests/expected.cifsiostat-h @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) rB/s wB/s rops/s wops/s fo/s fc/s fd/s Filesystem 0.0B 0.0B 0.00 0.00 0.00 0.00 0.00 \\addr\SHARED diff --git a/tests/expected.cifsiostat-k b/tests/expected.cifsiostat-k index ec799cf..0bf592c 100644 --- a/tests/expected.cifsiostat-k +++ b/tests/expected.cifsiostat-k @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Filesystem rkB/s wkB/s rops/s wops/s fo/s fc/s fd/s \\addr\SHARED 0.00 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected.cifsiostat-pretty b/tests/expected.cifsiostat-pretty index 51b66a8..9d53cc5 100644 --- a/tests/expected.cifsiostat-pretty +++ b/tests/expected.cifsiostat-pretty @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) rB/s wB/s rops/s wops/s fo/s fc/s fd/s Filesystem 0.03 0.00 0.00 0.00 0.00 0.00 0.00 \\addr\SHARED diff --git a/tests/expected.cifsiostat-t-human b/tests/expected.cifsiostat-t-human index 87bec81..1507004 100644 --- a/tests/expected.cifsiostat-t-human +++ b/tests/expected.cifsiostat-t-human @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 01/01/70 00:00:00 Filesystem rB/s wB/s rops/s wops/s fo/s fc/s fd/s diff --git a/tests/expected.data-ini b/tests/expected.data-ini index d727f31..b6610c5 100644 --- a/tests/expected.data-ini +++ b/tests/expected.data-ini @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 CPU %usr %nice %sys %iowait %steal %irq %soft %guest %gnice %idle 13:20:19 all 2.15 12.50 1.84 0.12 0.00 0.34 0.19 0.00 0.00 82.88 @@ -18,7 +18,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:29 4 3.44 0.00 2.16 0.84 0.00 0.32 0.16 0.00 0.00 93.08 13:20:29 5 2.76 0.00 2.08 0.16 0.00 0.19 0.10 0.00 0.00 94.71 13:20:29 7 0.25 0.00 0.25 70.04 0.00 0.03 0.02 0.00 0.00 29.42 -13:20:39 all 2.66 23.20 1.74 0.17 0.00 0.33 0.20 0.00 0.00 71.70 +13:20:39 all 2.67 23.08 1.79 0.17 0.00 0.33 0.28 0.00 0.00 71.68 13:20:39 0 2.19 52.01 1.46 0.00 0.00 0.36 0.39 0.00 0.00 43.59 13:20:39 1 3.45 0.00 2.33 0.55 0.00 0.34 0.39 0.00 0.00 92.94 13:20:39 2 0.68 16.81 1.77 0.39 0.00 0.34 0.08 0.00 0.00 79.93 @@ -26,7 +26,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:39 4 3.11 31.18 2.27 0.00 0.00 0.50 0.18 0.00 0.00 62.76 13:20:39 5 3.92 0.00 2.56 0.03 0.00 0.37 0.10 0.00 0.00 93.02 13:20:39 7 3.23 0.00 1.35 0.36 0.00 0.13 0.13 0.00 0.00 94.79 -13:20:49 all 6.53 9.63 3.44 0.54 0.00 0.60 0.38 0.00 0.00 78.89 +13:20:39 8 5.26 0.00 10.53 0.00 0.00 0.00 16.45 0.00 0.00 67.76 +13:20:49 all 6.21 8.70 6.64 0.49 0.39 0.54 0.34 0.59 0.10 75.90 13:20:49 0 2.69 47.44 1.26 0.18 0.00 0.36 0.85 0.00 0.00 47.22 13:20:49 1 9.25 0.00 4.06 0.18 0.00 0.59 0.95 0.00 0.00 84.97 13:20:49 2 9.90 0.04 3.78 0.90 0.00 0.49 0.49 0.00 0.00 84.39 @@ -35,7 +36,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:49 5 7.62 0.00 4.01 0.14 0.00 0.50 0.23 0.00 0.00 87.51 13:20:49 6 4.13 0.01 2.72 0.63 0.00 0.59 0.13 0.00 0.00 91.79 13:20:49 7 7.81 0.00 4.38 0.32 0.00 0.63 0.23 0.00 0.00 86.63 -Average: all 3.51 13.20 2.22 0.31 0.00 0.38 0.25 0.00 0.00 80.13 +13:20:49 8 2.84 0.00 39.98 0.00 4.50 0.00 0.00 6.75 1.13 44.80 +Average: all 3.50 12.85 3.11 0.31 0.10 0.37 0.27 0.16 0.03 79.29 Average: 0 2.17 24.86 1.61 0.12 0.00 0.31 0.59 0.00 0.00 70.34 Average: 1 4.02 0.00 2.78 0.40 0.00 0.41 0.38 0.00 0.00 92.01 Average: 2 3.40 5.26 2.06 0.65 0.00 0.31 0.17 0.00 0.00 88.14 @@ -44,6 +46,7 @@ Average: 4 3.28 19.24 1.99 0.22 0.00 0.39 Average: 5 3.72 0.00 2.64 0.07 0.00 0.34 0.12 0.00 0.00 93.10 Average: 6 3.69 0.01 2.54 0.51 0.00 0.56 0.12 0.00 0.00 92.56 Average: 7 3.36 0.00 1.61 0.18 0.00 0.20 0.11 0.00 0.00 94.54 +Average: 8 2.99 0.00 38.10 0.00 4.21 0.00 1.05 6.32 1.05 46.27 13:20:09 proc/s cswch/s 13:20:19 3.56 68409.30 @@ -2852,7 +2855,8 @@ Average: 0.00 0.00 0.00 0.00 host0 13:20:39 4 0.00 0.00 0.00 0.00 0.00 13:20:39 5 0.00 0.00 0.00 0.00 0.00 13:20:39 7 0.00 0.00 0.00 0.00 0.00 -13:20:49 all 0.00 0.00 0.00 0.00 0.00 +13:20:39 8 0.00 0.00 0.00 0.00 0.00 +13:20:49 all 4.29 0.00 0.00 0.00 0.00 13:20:49 0 0.00 0.00 0.00 0.00 0.00 13:20:49 1 0.00 0.00 0.00 0.00 0.00 13:20:49 2 0.00 0.00 0.00 0.00 0.00 @@ -2861,7 +2865,8 @@ Average: 0.00 0.00 0.00 0.00 host0 13:20:49 5 0.00 0.00 0.00 0.00 0.00 13:20:49 6 0.00 0.00 0.00 0.00 0.00 13:20:49 7 0.00 0.00 0.00 0.00 0.00 -Average: all 0.00 0.00 0.00 0.00 0.00 +13:20:49 8 4.29 0.00 0.00 0.00 0.00 +Average: all 0.78 0.00 0.00 0.00 0.00 Average: 0 0.00 0.00 0.00 0.00 0.00 Average: 1 0.00 0.00 0.00 0.00 0.00 Average: 2 0.00 0.00 0.00 0.00 0.00 @@ -2870,6 +2875,7 @@ Average: 4 0.00 0.00 0.00 0.00 0.00 Average: 5 0.00 0.00 0.00 0.00 0.00 Average: 6 0.00 0.00 0.00 0.00 0.00 Average: 7 0.00 0.00 0.00 0.00 0.00 +Average: 8 0.78 0.00 0.00 0.00 0.00 13:20:09 CPU MHz 13:20:19 all 3522.54 @@ -2920,33 +2926,33 @@ Average: 7 3497.56 13:20:09 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM 13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -13:20:19 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 +13:20:19 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 13:20:19 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda9 -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda7 -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda12 -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda6 -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sdf -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sdg -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda9 -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda7 -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda12 -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda6 -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sdf -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sdg +13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda9 +13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 +13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 +13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf +13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg +13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda9 +13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 +13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 +13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf +13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg 13:20:49 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 13:20:49 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -13:20:49 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:20:49 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:20:49 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 +13:20:49 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sdf -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sdg +Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 +Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 +Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf +Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) 13:39:09 COM Testing sysstat! 13:54:09 LINUX RESTART (10 CPU) @@ -4138,28 +4144,28 @@ Average: 0.00 0.00 0.00 0.00 Average: 0.00 0.00 0.00 0.00 host0 13:54:15 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s -13:54:35 all 0.00 0.00 0.00 0.00 0.00 +13:54:35 all 0.00 0.00 394.13 0.00 0.00 13:54:35 0 0.00 0.00 0.00 0.00 0.00 -13:54:35 1 0.00 0.00 0.00 0.00 0.00 -13:54:35 2 0.00 0.00 0.00 0.00 0.00 -13:54:35 3 0.00 0.00 0.00 0.00 0.00 -13:54:35 4 0.00 0.00 0.00 0.00 0.00 -13:54:35 5 0.00 0.00 0.00 0.00 0.00 -13:54:35 6 0.00 0.00 0.00 0.00 0.00 -13:54:35 7 0.00 0.00 0.00 0.00 0.00 -13:54:35 8 0.00 0.00 0.00 0.00 0.00 -13:54:35 9 0.00 0.00 0.00 0.00 0.00 -Average: all 0.00 0.00 0.00 0.00 0.00 +13:54:35 1 0.00 0.00 8.76 0.00 0.00 +13:54:35 2 0.00 0.00 17.52 0.00 0.00 +13:54:35 3 0.00 0.00 26.28 0.00 0.00 +13:54:35 4 0.00 0.00 35.03 0.00 0.00 +13:54:35 5 0.00 0.00 43.79 0.00 0.00 +13:54:35 6 0.00 0.00 52.55 0.00 0.00 +13:54:35 7 0.00 0.00 61.31 0.00 0.00 +13:54:35 8 0.00 0.00 70.07 0.00 0.00 +13:54:35 9 0.00 0.00 78.83 0.00 0.00 +Average: all 0.00 0.00 394.13 0.00 0.00 Average: 0 0.00 0.00 0.00 0.00 0.00 -Average: 1 0.00 0.00 0.00 0.00 0.00 -Average: 2 0.00 0.00 0.00 0.00 0.00 -Average: 3 0.00 0.00 0.00 0.00 0.00 -Average: 4 0.00 0.00 0.00 0.00 0.00 -Average: 5 0.00 0.00 0.00 0.00 0.00 -Average: 6 0.00 0.00 0.00 0.00 0.00 -Average: 7 0.00 0.00 0.00 0.00 0.00 -Average: 8 0.00 0.00 0.00 0.00 0.00 -Average: 9 0.00 0.00 0.00 0.00 0.00 +Average: 1 0.00 0.00 8.76 0.00 0.00 +Average: 2 0.00 0.00 17.52 0.00 0.00 +Average: 3 0.00 0.00 26.28 0.00 0.00 +Average: 4 0.00 0.00 35.03 0.00 0.00 +Average: 5 0.00 0.00 43.79 0.00 0.00 +Average: 6 0.00 0.00 52.55 0.00 0.00 +Average: 7 0.00 0.00 61.31 0.00 0.00 +Average: 8 0.00 0.00 70.07 0.00 0.00 +Average: 9 0.00 0.00 78.83 0.00 0.00 13:54:15 CPU MHz 13:54:35 all 3517.54 @@ -4188,9 +4194,9 @@ Average: 9 3497.56 13:54:15 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM 13:54:35 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 13:54:35 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -13:54:35 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:54:35 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:54:35 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 +13:54:35 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 +Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 diff --git a/tests/expected.data-wghfreq-sadf-d b/tests/expected.data-wghfreq-sadf-d index 8e23602..9d52851 100644 --- a/tests/expected.data-wghfreq-sadf-d +++ b/tests/expected.data-wghfreq-sadf-d @@ -1,5 +1,5 @@ # hostname;interval;timestamp;CPU;wghMHz -SYSSTAT.TEST;31;2019-04-18 13:20:10 UTC;-1;1160.30 +SYSSTAT.TEST;31;2019-04-18 13:20:10 UTC;-1;1123.35 SYSSTAT.TEST;31;2019-04-18 13:20:10 UTC;0;1200.33 SYSSTAT.TEST;31;2019-04-18 13:20:10 UTC;1;872.73 SYSSTAT.TEST;31;2019-04-18 13:20:10 UTC;2;1200.33 @@ -8,6 +8,7 @@ SYSSTAT.TEST;31;2019-04-18 13:20:10 UTC;4;1200.33 SYSSTAT.TEST;31;2019-04-18 13:20:10 UTC;5;1200.33 SYSSTAT.TEST;31;2019-04-18 13:20:10 UTC;6;1200.33 SYSSTAT.TEST;31;2019-04-18 13:20:10 UTC;7;1200.33 +SYSSTAT.TEST;31;2019-04-18 13:20:10 UTC;8;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:11 UTC;-1;2001.00 SYSSTAT.TEST;31;2019-04-18 13:20:11 UTC;0;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:11 UTC;1;2001.00 @@ -17,3 +18,4 @@ SYSSTAT.TEST;31;2019-04-18 13:20:11 UTC;4;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:11 UTC;5;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:11 UTC;6;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:11 UTC;7;0.00 +SYSSTAT.TEST;31;2019-04-18 13:20:11 UTC;8;0.00 diff --git a/tests/expected.data-wghfreq-sadf-j b/tests/expected.data-wghfreq-sadf-j index b09a316..38aa71b 100644 --- a/tests/expected.data-wghfreq-sadf-j +++ b/tests/expected.data-wghfreq-sadf-j @@ -5,7 +5,7 @@ "sysname": "Linux", "release": "1.2.3-TEST", "machine": "x86_64", - "number-of-cpus": 8, + "number-of-cpus": 9, "file-date": "2019-04-18", "file-utc-time": "13:20:09", "timezone": "GMT", @@ -14,7 +14,7 @@ "timestamp": {"date": "2019-04-18", "time": "13:20:10", "utc": 1, "interval": 31}, "power-management": { "cpu-weighted-frequency": [ - {"number": "all", "weighted-frequency": 1160.30}, + {"number": "all", "weighted-frequency": 1123.35}, {"number": "0", "weighted-frequency": 1200.33}, {"number": "1", "weighted-frequency": 872.73}, {"number": "2", "weighted-frequency": 1200.33}, @@ -22,7 +22,8 @@ {"number": "4", "weighted-frequency": 1200.33}, {"number": "5", "weighted-frequency": 1200.33}, {"number": "6", "weighted-frequency": 1200.33}, - {"number": "7", "weighted-frequency": 1200.33} + {"number": "7", "weighted-frequency": 1200.33}, + {"number": "8", "weighted-frequency": 0.00} ] } }, @@ -38,7 +39,8 @@ {"number": "4", "weighted-frequency": 0.00}, {"number": "5", "weighted-frequency": 0.00}, {"number": "6", "weighted-frequency": 0.00}, - {"number": "7", "weighted-frequency": 0.00} + {"number": "7", "weighted-frequency": 0.00}, + {"number": "8", "weighted-frequency": 0.00} ] } } diff --git a/tests/expected.data-wghfreq-sadf-p b/tests/expected.data-wghfreq-sadf-p index eb4ed38..a143862 100644 --- a/tests/expected.data-wghfreq-sadf-p +++ b/tests/expected.data-wghfreq-sadf-p @@ -1,4 +1,4 @@ -SYSSTAT.TEST 31 2019-04-18 13:20:10 UTC all wghMHz 1160.30 +SYSSTAT.TEST 31 2019-04-18 13:20:10 UTC all wghMHz 1123.35 SYSSTAT.TEST 31 2019-04-18 13:20:10 UTC cpu0 wghMHz 1200.33 SYSSTAT.TEST 31 2019-04-18 13:20:10 UTC cpu1 wghMHz 872.73 SYSSTAT.TEST 31 2019-04-18 13:20:10 UTC cpu2 wghMHz 1200.33 @@ -7,6 +7,7 @@ SYSSTAT.TEST 31 2019-04-18 13:20:10 UTC cpu4 wghMHz 1200.33 SYSSTAT.TEST 31 2019-04-18 13:20:10 UTC cpu5 wghMHz 1200.33 SYSSTAT.TEST 31 2019-04-18 13:20:10 UTC cpu6 wghMHz 1200.33 SYSSTAT.TEST 31 2019-04-18 13:20:10 UTC cpu7 wghMHz 1200.33 +SYSSTAT.TEST 31 2019-04-18 13:20:10 UTC cpu8 wghMHz 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:11 UTC all wghMHz 2001.00 SYSSTAT.TEST 31 2019-04-18 13:20:11 UTC cpu0 wghMHz 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:11 UTC cpu1 wghMHz 2001.00 @@ -16,3 +17,4 @@ SYSSTAT.TEST 31 2019-04-18 13:20:11 UTC cpu4 wghMHz 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:11 UTC cpu5 wghMHz 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:11 UTC cpu6 wghMHz 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:11 UTC cpu7 wghMHz 0.00 +SYSSTAT.TEST 31 2019-04-18 13:20:11 UTC cpu8 wghMHz 0.00 diff --git a/tests/expected.data-wghfreq-sadf-r b/tests/expected.data-wghfreq-sadf-r index 95596dd..d829575 100644 --- a/tests/expected.data-wghfreq-sadf-r +++ b/tests/expected.data-wghfreq-sadf-r @@ -1,4 +1,4 @@ -13:20:10 UTC; CPU; -1; freq; 2001000; tminst; 60804; 60813; freq; 2000000; tminst; 5734; 5724; freq; 1600000; tminst; 5996; 5996; freq; 1200000; tminst; 8819; 8849; freq; 800000; tminst; 205211; 205212; +13:20:10 UTC; CPU; -1; freq; 2001000; tminst; 60804; 60811; freq; 2000000; tminst; 5734; 5725; freq; 1600000; tminst; 6107; 6107; freq; 1200000; tminst; 8752; 8779; freq; 800000; tminst; 206322; 206323; 13:20:10 UTC; CPU; 0; freq; 2001000; tminst; 60803; 60813; freq; 2000000; tminst; 5734; 5724; freq; 1600000; tminst; 5996; 5996; freq; 1200000; tminst; 8819; 8849; freq; 800000; tminst; 205211; 205211; 13:20:10 UTC; CPU; 1; freq; 2001000; tminst; 60813; 60813; freq; 2000000; tminst; 5734; 5724; freq; 1600000; tminst; 5996; 5999; freq; 1200000; tminst; 8819; 8849; freq; 800000; tminst; 205211; 205221; 13:20:10 UTC; CPU; 2; freq; 2001000; tminst; 60803; 60813; freq; 2000000; tminst; 5734; 5724; freq; 1600000; tminst; 5996; 5996; freq; 1200000; tminst; 8819; 8849; freq; 800000; tminst; 205211; 205211; @@ -7,7 +7,8 @@ 13:20:10 UTC; CPU; 5; freq; 2001000; tminst; 60803; 60813; freq; 2000000; tminst; 5734; 5724; freq; 1600000; tminst; 5996; 5996; freq; 1200000; tminst; 8819; 8849; freq; 800000; tminst; 205211; 205211; 13:20:10 UTC; CPU; 6; freq; 2001000; tminst; 60803; 60813; freq; 2000000; tminst; 5734; 5724; freq; 1600000; tminst; 5996; 5996; freq; 1200000; tminst; 8819; 8849; freq; 800000; tminst; 205211; 205211; 13:20:10 UTC; CPU; 7; freq; 2001000; tminst; 60803; 60813; freq; 2000000; tminst; 5734; 5724; freq; 1600000; tminst; 5996; 5996; freq; 1200000; tminst; 8819; 8849; freq; 800000; tminst; 205211; 205211; -13:20:11 UTC; CPU; -1; freq; 2001000; tminst; 60813; 60821; freq; 2000000; tminst; 5724; 5724; freq; 1600000; tminst; 5996; 5996; freq; 1200000; tminst; 8849; 8849; freq; 800000; tminst; 205212; 205212; +13:20:10 UTC; CPU; 8; freq; 2003000; tminst; 60803; 60803; freq; 2001000; tminst; 5734; 5734; freq; 1600000; tminst; 6996; 6996; freq; 1200000; tminst; 8219; 8219; freq; 800000; tminst; 215211; 215211; +13:20:11 UTC; CPU; -1; freq; 2001000; tminst; 60811; 60819; freq; 2000000; tminst; 5725; 5725; freq; 1600000; tminst; 6107; 6107; freq; 1200000; tminst; 8779; 8779; freq; 800000; tminst; 206323; 206323; 13:20:11 UTC; CPU; 0; freq; 2001000; tminst; 60813; 60813; freq; 2000000; tminst; 5724; 5724; freq; 1600000; tminst; 5996; 5996; freq; 1200000; tminst; 8849; 8849; freq; 800000; tminst; 205211; 205211; 13:20:11 UTC; CPU; 1; freq; 2001000; tminst; 60813; 60883; freq; 2000000; tminst; 5724; 5724; freq; 1600000; tminst; 5999; 5999; freq; 1200000; tminst; 8849; 8849; freq; 800000; tminst; 205221; 205221; 13:20:11 UTC; CPU; 2; freq; 2001000; tminst; 60813; 60813; freq; 2000000; tminst; 5724; 5724; freq; 1600000; tminst; 5996; 5996; freq; 1200000; tminst; 8849; 8849; freq; 800000; tminst; 205211; 205211; @@ -16,3 +17,4 @@ 13:20:11 UTC; CPU; 5; freq; 2001000; tminst; 60813; 60813; freq; 2000000; tminst; 5724; 5724; freq; 1600000; tminst; 5996; 5996; freq; 1200000; tminst; 8849; 8849; freq; 800000; tminst; 205211; 205211; 13:20:11 UTC; CPU; 6; freq; 2001000; tminst; 60813; 60813; freq; 2000000; tminst; 5724; 5724; freq; 1600000; tminst; 5996; 5996; freq; 1200000; tminst; 8849; 8849; freq; 800000; tminst; 205211; 205211; 13:20:11 UTC; CPU; 7; freq; 2001000; tminst; 60813; 60813; freq; 2000000; tminst; 5724; 5724; freq; 1600000; tminst; 5996; 5996; freq; 1200000; tminst; 8849; 8849; freq; 800000; tminst; 205211; 205211; +13:20:11 UTC; CPU; 8; freq; 2003000; tminst; 60803; 60803; freq; 2001000; tminst; 5734; 5734; freq; 1600000; tminst; 6996; 6996; freq; 1200000; tminst; 8219; 8219; freq; 800000; tminst; 215211; 215211; diff --git a/tests/expected.data-wghfreq-sadf-x b/tests/expected.data-wghfreq-sadf-x index 7ce47c5..c86e356 100644 --- a/tests/expected.data-wghfreq-sadf-x +++ b/tests/expected.data-wghfreq-sadf-x @@ -10,7 +10,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> Linux 1.2.3-TEST x86_64 - 8 + 9 2019-04-18 13:20:09 GMT @@ -18,7 +18,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - + @@ -27,6 +27,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> + @@ -42,6 +43,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> + diff --git a/tests/expected.iostat b/tests/expected.iostat index 45baf2f..c40b8fc 100644 --- a/tests/expected.iostat +++ b/tests/expected.iostat @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat+f-alt-ALL-ms b/tests/expected.iostat+f-alt-ALL-ms index c0b6587..0761a19 100644 --- a/tests/expected.iostat+f-alt-ALL-ms +++ b/tests/expected.iostat+f-alt-ALL-ms @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd dm-2 0.00 0.00 0.00 0.00 0 0 0 diff --git a/tests/expected.iostat+f-alt-list-ms b/tests/expected.iostat+f-alt-list-ms index 2b26f0b..97470e7 100644 --- a/tests/expected.iostat+f-alt-list-ms +++ b/tests/expected.iostat+f-alt-list-ms @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd dm-2 0.00 0.00 0.00 0.00 0 0 0 diff --git a/tests/expected.iostat+f-alt-pALL b/tests/expected.iostat+f-alt-pALL index 10765ac..da26532 100644 --- a/tests/expected.iostat+f-alt-pALL +++ b/tests/expected.iostat+f-alt-pALL @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-0 b/tests/expected.iostat-0 index bfb1098..9309340 100644 --- a/tests/expected.iostat-0 +++ b/tests/expected.iostat-0 @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-ALL b/tests/expected.iostat-ALL index ebb20ea..cb98308 100644 --- a/tests/expected.iostat-ALL +++ b/tests/expected.iostat-ALL @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd dm-2 0.00 0.00 0.00 0.00 0 0 0 diff --git a/tests/expected.iostat-ALL-p-ALL b/tests/expected.iostat-ALL-p-ALL index 0d5dbe6..e18d24d 100644 --- a/tests/expected.iostat-ALL-p-ALL +++ b/tests/expected.iostat-ALL-p-ALL @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-N b/tests/expected.iostat-N index 84aa504..ca19883 100644 --- a/tests/expected.iostat-N +++ b/tests/expected.iostat-N @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-alt-pALL b/tests/expected.iostat-alt-pALL index 10765ac..da26532 100644 --- a/tests/expected.iostat-alt-pALL +++ b/tests/expected.iostat-alt-pALL @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-ct b/tests/expected.iostat-ct index bf3be4c..8e4c7e9 100644 --- a/tests/expected.iostat-ct +++ b/tests/expected.iostat-ct @@ -1,8 +1,8 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 01/01/70 00:00:00 avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 diff --git a/tests/expected.iostat-dec b/tests/expected.iostat-dec index 1d91ba1..2aab29b 100644 --- a/tests/expected.iostat-dec +++ b/tests/expected.iostat-dec @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.6 44.9 1.8 1.0 0.0 50.6 + 1.5 39.9 1.7 0.9 0.0 56.0 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.6 222.1 57.1 0.0 1597749 410544 0 diff --git a/tests/expected.iostat-ev b/tests/expected.iostat-ev index 7830a2c..ffc469e 100644 --- a/tests/expected.iostat-ev +++ b/tests/expected.iostat-ev @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 1970-01-01 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 1970-01-01 _x86_64_ (9 CPU) Device tps Blk_read/s Blk_wrtn/s Blk_dscd/s Blk_read Blk_wrtn Blk_dscd sda 8.59 444.28 114.16 0.00 3195498 821088 0 diff --git a/tests/expected.iostat-f-alt-ALL-ms b/tests/expected.iostat-f-alt-ALL-ms index 4ed98a7..3c430da 100644 --- a/tests/expected.iostat-f-alt-ALL-ms +++ b/tests/expected.iostat-f-alt-ALL-ms @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-f-alt-list-ms b/tests/expected.iostat-f-alt-list-ms index dd7b282..8872053 100644 --- a/tests/expected.iostat-f-alt-list-ms +++ b/tests/expected.iostat-f-alt-list-ms @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-f-alt-pALL b/tests/expected.iostat-f-alt-pALL index 10765ac..da26532 100644 --- a/tests/expected.iostat-f-alt-pALL +++ b/tests/expected.iostat-f-alt-pALL @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-f-alt-pALL-ms b/tests/expected.iostat-f-alt-pALL-ms index 105aa36..a1bd7dd 100644 --- a/tests/expected.iostat-f-alt-pALL-ms +++ b/tests/expected.iostat-f-alt-pALL-ms @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-foo b/tests/expected.iostat-foo index 1c6908b..3c066fe 100644 --- a/tests/expected.iostat-foo +++ b/tests/expected.iostat-foo @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd diff --git a/tests/expected.iostat-g b/tests/expected.iostat-g index 12619c2..e15aa30 100644 --- a/tests/expected.iostat-g +++ b/tests/expected.iostat-g @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-g-JSON b/tests/expected.iostat-g-JSON index 180a9de..29652a3 100644 --- a/tests/expected.iostat-g-JSON +++ b/tests/expected.iostat-g-JSON @@ -5,7 +5,7 @@ "sysname": "Linux", "release": "1.2.3-TEST", "machine": "x86_64", - "number-of-cpus": 8, + "number-of-cpus": 9, "date": "01/01/70", "statistics": [ { diff --git a/tests/expected.iostat-g2 b/tests/expected.iostat-g2 index e94f3ea..b07a44e 100644 --- a/tests/expected.iostat-g2 +++ b/tests/expected.iostat-g2 @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-gALL b/tests/expected.iostat-gALL index b53e7fc..7d0f5f1 100644 --- a/tests/expected.iostat-gALL +++ b/tests/expected.iostat-gALL @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd dm-2 0.00 0.00 0.00 0.00 0 0 0 diff --git a/tests/expected.iostat-gH b/tests/expected.iostat-gH index f13a370..e808aac 100644 --- a/tests/expected.iostat-gH +++ b/tests/expected.iostat-gH @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd disks 8.60 222.43 57.08 0.00 1599857 410544 0 diff --git a/tests/expected.iostat-gp b/tests/expected.iostat-gp index 4b7cb35..c2ea722 100644 --- a/tests/expected.iostat-gp +++ b/tests/expected.iostat-gp @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-gpALL b/tests/expected.iostat-gpALL index 94e0960..51ffc19 100644 --- a/tests/expected.iostat-gpALL +++ b/tests/expected.iostat-gpALL @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-gpy b/tests/expected.iostat-gpy index 9fa4491..1ade8c1 100644 --- a/tests/expected.iostat-gpy +++ b/tests/expected.iostat-gpy @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle @@ -42,7 +42,7 @@ sda9 0.00 0.00 0.00 0.00 0 avg-cpu: %user %nice %system %iowait %steal %idle - 2.99 12.51 2.49 0.21 0.00 81.80 + 0.00 0.00 0.00 0.00 0.00 0.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 1604.70 41499.97 10663.48 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-h b/tests/expected.iostat-h index 5c67892..96f05f1 100644 --- a/tests/expected.iostat-h +++ b/tests/expected.iostat-h @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd Device 8.59 222.1k 57.1k 0.0k 1.5G 400.9M 0.0k sda diff --git a/tests/expected.iostat-human b/tests/expected.iostat-human index 290d7c4..ada1a60 100644 --- a/tests/expected.iostat-human +++ b/tests/expected.iostat-human @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.6% 44.9% 1.8% 1.0% 0.0% 50.6% + 1.5% 39.9% 1.7% 0.9% 0.0% 56.0% Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.1k 57.1k 0.0k 1.5G 400.9M 0.0k diff --git a/tests/expected.iostat-jID b/tests/expected.iostat-jID index 88b76bf..c84ecdf 100644 --- a/tests/expected.iostat-jID +++ b/tests/expected.iostat-jID @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd Device 8.59 222.14 57.08 0.00 1597749 410544 0 ata-Hitachi_HDS723020BLA642_MN1240F33J1XND diff --git a/tests/expected.iostat-jLABEL b/tests/expected.iostat-jLABEL index 5a09357..097759b 100644 --- a/tests/expected.iostat-jLABEL +++ b/tests/expected.iostat-jLABEL @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd Device 8.59 222.14 57.08 0.00 1597749 410544 0 sda diff --git a/tests/expected.iostat-jLABEL-list b/tests/expected.iostat-jLABEL-list index f0b6e6e..1aa8f53 100644 --- a/tests/expected.iostat-jLABEL-list +++ b/tests/expected.iostat-jLABEL-list @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd Device 0.01 0.29 0.00 0.00 2108 0 0 SYSTEM diff --git a/tests/expected.iostat-jPARTUUID b/tests/expected.iostat-jPARTUUID index 02e159b..1cc0e26 100644 --- a/tests/expected.iostat-jPARTUUID +++ b/tests/expected.iostat-jPARTUUID @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd Device 8.59 222.14 57.08 0.00 1597749 410544 0 sda diff --git a/tests/expected.iostat-jPATH b/tests/expected.iostat-jPATH index 26d7680..c5732c5 100644 --- a/tests/expected.iostat-jPATH +++ b/tests/expected.iostat-jPATH @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd Device 8.59 222.14 57.08 0.00 1597749 410544 0 pci-0000:00:1f.2-ata-1 diff --git a/tests/expected.iostat-jUUID-list b/tests/expected.iostat-jUUID-list index c0c469d..eae8dd1 100644 --- a/tests/expected.iostat-jUUID-list +++ b/tests/expected.iostat-jUUID-list @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) tps kB/s rqm/s await areq-sz aqu-sz %util Device 0.01 0.31 0.00 209.25 39.51 0.00 0.00 2578463f-6947-48c7-8b09-876a4145cfb1 diff --git a/tests/expected.iostat-kz b/tests/expected.iostat-kz index d975a84..06b95f5 100644 --- a/tests/expected.iostat-kz +++ b/tests/expected.iostat-kz @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-list b/tests/expected.iostat-list index 950be91..77b4060 100644 --- a/tests/expected.iostat-list +++ b/tests/expected.iostat-list @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-p-ALL b/tests/expected.iostat-p-ALL index 0d5dbe6..e18d24d 100644 --- a/tests/expected.iostat-p-ALL +++ b/tests/expected.iostat-p-ALL @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-p-sda b/tests/expected.iostat-p-sda index 81b3f86..f3abd34 100644 --- a/tests/expected.iostat-p-sda +++ b/tests/expected.iostat-p-sda @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 diff --git a/tests/expected.iostat-pretty b/tests/expected.iostat-pretty index b5913c7..cabb698 100644 --- a/tests/expected.iostat-pretty +++ b/tests/expected.iostat-pretty @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd Device 8.59 222.14 57.08 0.00 1597749 410544 0 sda diff --git a/tests/expected.iostat-s b/tests/expected.iostat-s index 40ea220..ea16d4d 100644 --- a/tests/expected.iostat-s +++ b/tests/expected.iostat-s @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_w+d/s kB_read kB_w+d sda 8.59 222.14 57.08 1597749 410544 diff --git a/tests/expected.iostat-s-0 b/tests/expected.iostat-s-0 index acd6de1..cd93fdd 100644 --- a/tests/expected.iostat-s-0 +++ b/tests/expected.iostat-s-0 @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_w+d/s kB_read kB_w+d sda 8.59 222.14 57.08 1597749 410544 diff --git a/tests/expected.iostat-s-ALL b/tests/expected.iostat-s-ALL index cf45796..af2bac6 100644 --- a/tests/expected.iostat-s-ALL +++ b/tests/expected.iostat-s-ALL @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Device tps kB_read/s kB_w+d/s kB_read kB_w+d dm-2 0.00 0.00 0.00 0 0 diff --git a/tests/expected.iostat-s-ALL-p-ALL b/tests/expected.iostat-s-ALL-p-ALL index 49f3391..88104d2 100644 --- a/tests/expected.iostat-s-ALL-p-ALL +++ b/tests/expected.iostat-s-ALL-p-ALL @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_w+d/s kB_read kB_w+d sda 8.59 222.14 57.08 1597749 410544 diff --git a/tests/expected.iostat-s-list b/tests/expected.iostat-s-list index 2a965a0..398a6fe 100644 --- a/tests/expected.iostat-s-list +++ b/tests/expected.iostat-s-list @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Device tps kB_read/s kB_w+d/s kB_read kB_w+d sda 8.59 222.14 57.08 1597749 410544 diff --git a/tests/expected.iostat-s-list-p b/tests/expected.iostat-s-list-p index 8a38a1a..21ce659 100644 --- a/tests/expected.iostat-s-list-p +++ b/tests/expected.iostat-s-list-p @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_w+d/s kB_read kB_w+d sdb 0.01 0.29 0.00 2108 0 diff --git a/tests/expected.iostat-sigint b/tests/expected.iostat-sigint index b7e76a2..910f3e0 100644 --- a/tests/expected.iostat-sigint +++ b/tests/expected.iostat-sigint @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 8.59 222.14 57.08 0.00 1597749 410544 0 @@ -26,7 +26,7 @@ sdd 1.63 67.48 0.00 0.00 2108 avg-cpu: %user %nice %system %iowait %steal %idle - 2.99 12.51 2.49 0.21 0.00 81.80 + 0.00 0.00 0.00 0.00 0.00 0.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 1604.70 41499.97 10663.48 0.00 1597749 410544 0 @@ -36,7 +36,7 @@ sdg 2.91 114.91 0.31 0.00 4424 avg-cpu: %user %nice %system %iowait %steal %idle - 7.51 12.53 4.64 0.30 0.00 75.02 + 7.75 11.18 8.57 0.27 0.50 71.73 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 0.00 0.00 0.00 0.00 0 0 0 diff --git a/tests/expected.iostat-sp-0 b/tests/expected.iostat-sp-0 index c8352d2..782dc83 100644 --- a/tests/expected.iostat-sp-0 +++ b/tests/expected.iostat-sp-0 @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_w+d/s kB_read kB_w+d sda 8.59 222.14 57.08 1597749 410544 diff --git a/tests/expected.iostat-x b/tests/expected.iostat-x index ad3d319..2538a01 100644 --- a/tests/expected.iostat-x +++ b/tests/expected.iostat-x @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device r/s rkB/s rrqm/s %rrqm r_await rareq-sz w/s wkB/s wrqm/s %wrqm w_await wareq-sz d/s dkB/s drqm/s %drqm d_await dareq-sz f/s f_await aqu-sz %util sda 6.90 222.14 0.39 5.38 12.58 32.21 1.69 57.08 1.36 44.55 9.61 33.71 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.10 0.46 diff --git a/tests/expected.iostat-x-0 b/tests/expected.iostat-x-0 index c51e59c..7a998ff 100644 --- a/tests/expected.iostat-x-0 +++ b/tests/expected.iostat-x-0 @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device r/s rkB/s rrqm/s %rrqm r_await rareq-sz w/s wkB/s wrqm/s %wrqm w_await wareq-sz d/s dkB/s drqm/s %drqm d_await dareq-sz f/s f_await aqu-sz %util sda 6.90 222.14 0.39 5.38 12.58 32.21 1.69 57.08 1.36 44.55 9.61 33.71 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.10 0.46 diff --git a/tests/expected.iostat-x-ALL b/tests/expected.iostat-x-ALL index 709a944..ecb1e40 100644 --- a/tests/expected.iostat-x-ALL +++ b/tests/expected.iostat-x-ALL @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device r/s rkB/s rrqm/s %rrqm r_await rareq-sz w/s wkB/s wrqm/s %wrqm w_await wareq-sz d/s dkB/s drqm/s %drqm d_await dareq-sz f/s f_await aqu-sz %util dm-2 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected.iostat-x-ALL-flush b/tests/expected.iostat-x-ALL-flush index 350e5c4..9821fc4 100644 --- a/tests/expected.iostat-x-ALL-flush +++ b/tests/expected.iostat-x-ALL-flush @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.62 1.85 1.00 0.00 50.88 + 1.49 39.70 1.67 0.93 0.00 56.20 Device r/s rkB/s rrqm/s %rrqm r_await rareq-sz w/s wkB/s wrqm/s %wrqm w_await wareq-sz d/s dkB/s drqm/s %drqm d_await dareq-sz f/s f_await aqu-sz %util sda 6.85 220.24 0.40 5.55 12.56 32.15 1.69 56.59 1.36 44.59 9.54 33.44 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.10 0.45 @@ -13,7 +13,7 @@ sr0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0. avg-cpu: %user %nice %system %iowait %steal %idle - 2.99 12.51 2.49 0.21 0.00 81.80 + 0.00 0.00 0.00 0.00 0.00 0.00 Device r/s rkB/s rrqm/s %rrqm r_await rareq-sz w/s wkB/s wrqm/s %wrqm w_await wareq-sz d/s dkB/s drqm/s %drqm d_await dareq-sz f/s f_await aqu-sz %util sda 1288.34 41499.97 73.30 5.38 12.58 32.21 316.36 10663.48 254.13 44.55 9.61 33.71 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 18.56 85.36 @@ -23,7 +23,7 @@ sdg 2.83 114.91 0.03 0.91 25.06 40.59 0.08 0. avg-cpu: %user %nice %system %iowait %steal %idle - 7.51 12.53 4.64 0.30 0.00 75.02 + 7.75 11.18 8.57 0.27 0.50 71.73 Device r/s rkB/s rrqm/s %rrqm r_await rareq-sz w/s wkB/s wrqm/s %wrqm w_await wareq-sz d/s dkB/s drqm/s %drqm d_await dareq-sz f/s f_await aqu-sz %util sda 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected.iostat-x-ALL-p-ALL b/tests/expected.iostat-x-ALL-p-ALL index 39ec56e..d5aa715 100644 --- a/tests/expected.iostat-x-ALL-p-ALL +++ b/tests/expected.iostat-x-ALL-p-ALL @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Device r/s rkB/s rrqm/s %rrqm r_await rareq-sz w/s wkB/s wrqm/s %wrqm w_await wareq-sz d/s dkB/s drqm/s %drqm d_await dareq-sz f/s f_await aqu-sz %util sda 6.90 222.14 0.39 5.38 12.58 32.21 1.69 57.08 1.36 44.55 9.61 33.71 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.10 0.46 diff --git a/tests/expected.iostat-x-list b/tests/expected.iostat-x-list index f5658fb..4a2696e 100644 --- a/tests/expected.iostat-x-list +++ b/tests/expected.iostat-x-list @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Device r/s rkB/s rrqm/s %rrqm r_await rareq-sz w/s wkB/s wrqm/s %wrqm w_await wareq-sz d/s dkB/s drqm/s %drqm d_await dareq-sz f/s f_await aqu-sz %util sdb 0.01 0.29 0.00 0.00 60.92 41.33 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected.iostat-x-p-ALL b/tests/expected.iostat-x-p-ALL index ecbb9d0..534c904 100644 --- a/tests/expected.iostat-x-p-ALL +++ b/tests/expected.iostat-x-p-ALL @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device r/s rkB/s rrqm/s %rrqm r_await rareq-sz w/s wkB/s wrqm/s %wrqm w_await wareq-sz d/s dkB/s drqm/s %drqm d_await dareq-sz f/s f_await aqu-sz %util sda 6.90 222.14 0.39 5.38 12.58 32.21 1.69 57.08 1.36 44.55 9.61 33.71 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.10 0.46 diff --git a/tests/expected.iostat-x-p-ALL-JSON b/tests/expected.iostat-x-p-ALL-JSON index e6770ea..1df518a 100644 --- a/tests/expected.iostat-x-p-ALL-JSON +++ b/tests/expected.iostat-x-p-ALL-JSON @@ -5,11 +5,11 @@ "sysname": "Linux", "release": "1.2.3-TEST", "machine": "x86_64", - "number-of-cpus": 8, + "number-of-cpus": 9, "date": "01/01/70", "statistics": [ { - "avg-cpu": {"user": 1.65, "nice": 44.90, "system": 1.84, "iowait": 1.01, "steal": 0.00, "idle": 50.60}, + "avg-cpu": {"user": 1.49, "nice": 39.91, "system": 1.67, "iowait": 0.94, "steal": 0.00, "idle": 56.00}, "disk": [ {"disk_device": "sda", "r/s": 6.90, "w/s": 1.69, "d/s": 0.00, "f/s": 0.00, "rkB/s": 222.14, "wkB/s": 57.08, "dkB/s": 0.00, "rrqm/s": 0.39, "wrqm/s": 1.36, "drqm/s": 0.00, "rrqm": 5.38, "wrqm": 44.55, "drqm": 0.00, "r_await": 12.58, "w_await": 9.61, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 32.21, "wareq-sz": 33.71, "dareq-sz": 0.00, "aqu-sz": 0.10, "util": 0.46}, {"disk_device": "sda1", "r/s": 0.01, "w/s": 0.00, "d/s": 0.00, "f/s": 0.00, "rkB/s": 0.29, "wkB/s": 0.00, "dkB/s": 0.00, "rrqm/s": 0.00, "wrqm/s": 0.00, "drqm/s": 0.00, "rrqm": 0.00, "wrqm": 0.00, "drqm": 0.00, "r_await": 60.92, "w_await": 0.00, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 41.33, "wareq-sz": 0.00, "dareq-sz": 0.00, "aqu-sz": 0.00, "util": 0.00}, diff --git a/tests/expected.iostat-x-p-sda b/tests/expected.iostat-x-p-sda index d4c180c..959a4c4 100644 --- a/tests/expected.iostat-x-p-sda +++ b/tests/expected.iostat-x-p-sda @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device r/s rkB/s rrqm/s %rrqm r_await rareq-sz w/s wkB/s wrqm/s %wrqm w_await wareq-sz d/s dkB/s drqm/s %drqm d_await dareq-sz f/s f_await aqu-sz %util sda 6.90 222.14 0.39 5.38 12.58 32.21 1.69 57.08 1.36 44.55 9.61 33.71 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.10 0.46 diff --git a/tests/expected.iostat-xs b/tests/expected.iostat-xs index 04c0369..4ee88d4 100644 --- a/tests/expected.iostat-xs +++ b/tests/expected.iostat-xs @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB/s rqm/s await areq-sz aqu-sz %util sda 8.59 279.22 1.75 12.00 32.51 0.10 0.46 diff --git a/tests/expected.iostat-xs-list b/tests/expected.iostat-xs-list index 04d27db..5b89677 100644 --- a/tests/expected.iostat-xs-list +++ b/tests/expected.iostat-xs-list @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB/s rqm/s await areq-sz aqu-sz %util sda1 0.01 0.29 0.00 60.92 41.33 0.00 0.00 diff --git a/tests/expected.iostat-xs-list-part b/tests/expected.iostat-xs-list-part index 07bc045..70ed379 100644 --- a/tests/expected.iostat-xs-list-part +++ b/tests/expected.iostat-xs-list-part @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB/s rqm/s await areq-sz aqu-sz %util sda1 0.01 0.29 0.00 60.92 41.33 0.00 0.00 diff --git a/tests/expected.iostat-xs-p-sda b/tests/expected.iostat-xs-p-sda index 9565c81..ae50153 100644 --- a/tests/expected.iostat-xs-p-sda +++ b/tests/expected.iostat-xs-p-sda @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Device tps kB/s rqm/s await areq-sz aqu-sz %util sda 8.59 279.22 1.75 12.00 32.51 0.10 0.46 diff --git a/tests/expected.iostat-xs-sdb b/tests/expected.iostat-xs-sdb index def95aa..f4b87ce 100644 --- a/tests/expected.iostat-xs-sdb +++ b/tests/expected.iostat-xs-sdb @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Device tps kB/s rqm/s await areq-sz aqu-sz %util sdb 0.01 0.29 0.00 60.92 41.33 0.00 0.00 diff --git a/tests/expected.iostat-ym b/tests/expected.iostat-ym index 2608c6e..78dbdf3 100644 --- a/tests/expected.iostat-ym +++ b/tests/expected.iostat-ym @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle diff --git a/tests/expected.mpstat b/tests/expected.mpstat index 9233f92..bc0fd8c 100644 --- a/tests/expected.mpstat +++ b/tests/expected.mpstat @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 CPU %usr %nice %sys %iowait %irq %soft %steal %guest %gnice %idle -00:00:00 all 1.65 44.90 0.91 1.01 0.48 0.45 0.00 0.00 0.00 50.60 +00:00:00 all 1.49 39.91 0.83 0.94 0.43 0.40 0.00 0.00 0.00 56.00 diff --git a/tests/expected.mpstat-A b/tests/expected.mpstat-A index 92c4a2d..004817d 100644 --- a/tests/expected.mpstat-A +++ b/tests/expected.mpstat-A @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 CPU %usr %nice %sys %iowait %irq %soft %steal %guest %gnice %idle 00:00:01 all 2.15 12.50 1.84 0.12 0.34 0.19 0.00 0.00 0.00 82.88 @@ -26,6 +26,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) 00:00:01 5 42.67 00:00:01 6 62.88 00:00:01 7 42.22 +00:00:01 8 0.00 00:00:00 CPU 0/s 8/s 9/s 16/s 17/s 18/s 19/s 23/s 24/s 25/s 26/s 27/s 28/s 29/s 30/s 31/s 32/s 33/s 34/s 35/s 36/s NMI/s LOC/s SPU/s PMI/s IWI/s RTR/s RES/s CAL/s TLB/s TRM/s THR/s DFR/s MCE/s MCP/s HYP/s HRE/s HVS/s ERR/s MIS/s PIN/s NPI/s PIW/s 00:00:01 0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.03 5434.36 0.00 0.03 0.00 0.00 149.37 69.87 105.97 0.00 0.00 0.00 0.00 0.03 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 @@ -36,6 +37,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) 00:00:01 5 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 5828.49 0.00 0.00 0.00 0.00 2.69 17.32 32.34 0.00 0.00 0.00 0.00 0.03 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 00:00:01 6 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 149.98 0.00 0.00 0.03 4691.08 0.00 0.03 0.00 0.00 9.11 18.67 29.71 0.00 0.00 0.00 0.00 0.03 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 00:00:01 7 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 468.33 0.00 0.00 0.00 0.00 3.21 31.15 84.57 0.00 0.00 0.00 0.00 0.03 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +00:00:01 8 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 00:00:00 CPU HI/s TIMER/s NET_TX/s NET_RX/s BLOCK/s IRQ_POLL/s TASKLET/s SCHED/s HRTIMER/s RCU/s 00:00:01 0 0.00 13.09 0.00 0.00 0.00 0.00 0.00 19.44 0.00 8.25 @@ -46,6 +48,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) 00:00:01 5 0.00 19.19 0.00 0.00 0.77 0.00 0.00 11.87 0.00 10.84 00:00:01 6 0.00 31.41 0.00 0.00 0.00 0.00 0.00 15.01 0.00 16.46 00:00:01 7 0.00 20.08 0.00 0.00 0.00 0.00 0.00 9.82 0.00 12.32 +00:00:01 8 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 00:00:01 CPU %usr %nice %sys %iowait %irq %soft %steal %guest %gnice %idle 00:00:02 all 2.28 0.00 1.55 0.48 0.19 0.19 0.00 0.00 0.00 95.31 @@ -72,6 +75,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) 00:00:02 5 75.35 00:00:02 6 0.00 00:00:02 7 34.86 +00:00:02 8 0.00 00:00:01 CPU 0/s 8/s 9/s 16/s 17/s 18/s 19/s 23/s 24/s 25/s 26/s 27/s 28/s 29/s 30/s 31/s 32/s 33/s 34/s 35/s 36/s NMI/s LOC/s SPU/s PMI/s IWI/s RTR/s RES/s CAL/s TLB/s TRM/s THR/s DFR/s MCE/s MCP/s HYP/s HRE/s HVS/s ERR/s MIS/s PIN/s NPI/s PIW/s 00:00:02 0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 2967.32 0.00 0.00 0.00 0.00 130.12 5.35 15.72 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 @@ -82,6 +86,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) 00:00:02 5 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.03 2852.85 0.00 0.03 0.00 0.00 3.36 12.64 24.20 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 00:00:02 6 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 137.10 0.00 0.00 0.00 6864.76 0.00 0.00 0.00 0.00 4.29 7.75 20.52 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 00:00:02 7 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 1132.78 0.00 0.00 0.00 0.00 2.37 3.68 10.69 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +00:00:02 8 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 00:00:01 CPU HI/s TIMER/s NET_TX/s NET_RX/s BLOCK/s IRQ_POLL/s TASKLET/s SCHED/s HRTIMER/s RCU/s 00:00:02 0 0.00 31.91 0.00 0.00 0.00 0.00 0.00 26.50 0.00 17.57 @@ -92,6 +97,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) 00:00:02 5 0.00 36.14 0.00 0.00 0.99 0.00 0.00 18.21 0.00 20.01 00:00:02 6 0.00 33.07 0.00 0.00 0.00 0.00 0.00 15.72 0.00 18.25 00:00:02 7 0.00 16.77 0.00 0.00 0.00 0.00 0.00 8.51 0.00 9.57 +00:00:02 8 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: CPU %usr %nice %sys %iowait %irq %soft %steal %guest %gnice %idle Average: all 2.20 7.13 1.71 0.27 0.27 0.19 0.00 0.00 0.00 88.22 @@ -103,6 +109,7 @@ Average: 4 2.93 0.00 1.88 0.43 0.29 0.18 0.00 0.00 Average: 5 2.21 0.00 2.21 0.08 0.27 0.10 0.00 0.00 0.00 95.14 Average: 6 2.41 0.00 2.03 0.16 0.48 0.10 0.00 0.00 0.00 94.82 Average: 7 1.86 0.00 0.79 0.02 0.08 0.06 0.00 0.00 0.00 97.19 +Average: 8 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 100.00 Average: NODE %usr %nice %sys %iowait %irq %soft %steal %guest %gnice %idle Average: all 2.20 7.13 1.71 0.27 0.27 0.19 0.00 0.00 0.00 88.22 @@ -119,6 +126,7 @@ Average: 4 80.92 Average: 5 59.03 Average: 6 64.96 Average: 7 38.54 +Average: 8 0.00 Average: CPU 0/s 8/s 9/s 16/s 17/s 18/s 19/s 23/s 24/s 25/s 26/s 27/s 28/s 29/s 30/s 31/s 32/s 33/s 34/s 35/s 36/s NMI/s LOC/s SPU/s PMI/s IWI/s RTR/s RES/s CAL/s TLB/s TRM/s THR/s DFR/s MCE/s MCP/s HYP/s HRE/s HVS/s ERR/s MIS/s PIN/s NPI/s PIW/s Average: 0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.02 4199.46 0.00 0.02 0.00 0.00 139.74 37.57 60.79 0.00 0.00 0.00 0.00 0.02 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 @@ -129,6 +137,7 @@ Average: 4 0.00 0.00 0.00 0.00 0.00 0. Average: 5 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.02 4339.00 0.00 0.02 0.00 0.00 3.03 14.98 28.26 0.00 0.00 0.00 0.00 0.02 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: 6 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 143.53 0.00 0.00 0.02 5779.14 0.00 0.02 0.00 0.00 6.70 13.20 25.11 0.00 0.00 0.00 0.00 0.02 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: 7 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 800.93 0.00 0.00 0.00 0.00 2.79 17.40 47.59 0.00 0.00 0.00 0.00 0.02 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +Average: 8 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: CPU HI/s TIMER/s NET_TX/s NET_RX/s BLOCK/s IRQ_POLL/s TASKLET/s SCHED/s HRTIMER/s RCU/s Average: 0 0.00 22.51 0.00 0.00 0.00 0.00 0.00 22.98 0.00 12.91 @@ -139,3 +148,4 @@ Average: 4 4.74 25.40 0.00 0.00 0.40 0. Average: 5 0.00 27.67 0.00 0.00 0.88 0.00 0.00 15.05 0.00 15.43 Average: 6 0.00 32.24 0.00 0.00 0.00 0.00 0.00 15.37 0.00 17.35 Average: 7 0.00 18.43 0.00 0.00 0.00 0.00 0.00 9.17 0.00 10.94 +Average: 8 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected.mpstat-A-JSON b/tests/expected.mpstat-A-JSON index 52b9349..587c3a9 100644 --- a/tests/expected.mpstat-A-JSON +++ b/tests/expected.mpstat-A-JSON @@ -5,7 +5,7 @@ "sysname": "Linux", "release": "1.2.3-TEST", "machine": "x86_64", - "number-of-cpus": 8, + "number-of-cpus": 9, "date": "01/01/70", "statistics": [ { @@ -35,7 +35,8 @@ {"cpu": "4", "intr": 68.85}, {"cpu": "5", "intr": 42.67}, {"cpu": "6", "intr": 62.88}, - {"cpu": "7", "intr": 42.22} + {"cpu": "7", "intr": 42.22}, + {"cpu": "8", "intr": 0.00} ], "individual-interrupts": [ {"cpu": "0", "intr": [ @@ -397,6 +398,51 @@ {"name": "PIN", "value": 0.00}, {"name": "NPI", "value": 0.00}, {"name": "PIW", "value": 0.00} + ] }, + {"cpu": "8", "intr": [ + {"name": "0", "value": 0.00}, + {"name": "8", "value": 0.00}, + {"name": "9", "value": 0.00}, + {"name": "16", "value": 0.00}, + {"name": "17", "value": 0.00}, + {"name": "18", "value": 0.00}, + {"name": "19", "value": 0.00}, + {"name": "23", "value": 0.00}, + {"name": "24", "value": 0.00}, + {"name": "25", "value": 0.00}, + {"name": "26", "value": 0.00}, + {"name": "27", "value": 0.00}, + {"name": "28", "value": 0.00}, + {"name": "29", "value": 0.00}, + {"name": "30", "value": 0.00}, + {"name": "31", "value": 0.00}, + {"name": "32", "value": 0.00}, + {"name": "33", "value": 0.00}, + {"name": "34", "value": 0.00}, + {"name": "35", "value": 0.00}, + {"name": "36", "value": 0.00}, + {"name": "NMI", "value": 0.00}, + {"name": "LOC", "value": 0.00}, + {"name": "SPU", "value": 0.00}, + {"name": "PMI", "value": 0.00}, + {"name": "IWI", "value": 0.00}, + {"name": "RTR", "value": 0.00}, + {"name": "RES", "value": 0.00}, + {"name": "CAL", "value": 0.00}, + {"name": "TLB", "value": 0.00}, + {"name": "TRM", "value": 0.00}, + {"name": "THR", "value": 0.00}, + {"name": "DFR", "value": 0.00}, + {"name": "MCE", "value": 0.00}, + {"name": "MCP", "value": 0.00}, + {"name": "HYP", "value": 0.00}, + {"name": "HRE", "value": 0.00}, + {"name": "HVS", "value": 0.00}, + {"name": "ERR", "value": 0.00}, + {"name": "MIS", "value": 0.00}, + {"name": "PIN", "value": 0.00}, + {"name": "NPI", "value": 0.00}, + {"name": "PIW", "value": 0.00} ] } ], "soft-interrupts": [ @@ -495,6 +541,18 @@ {"name": "SCHED", "value": 9.82}, {"name": "HRTIMER", "value": 0.00}, {"name": "RCU", "value": 12.32} + ] }, + {"cpu": "8", "intr": [ + {"name": "HI", "value": 0.00}, + {"name": "TIMER", "value": 0.00}, + {"name": "NET_TX", "value": 0.00}, + {"name": "NET_RX", "value": 0.00}, + {"name": "BLOCK", "value": 0.00}, + {"name": "IRQ_POLL", "value": 0.00}, + {"name": "TASKLET", "value": 0.00}, + {"name": "SCHED", "value": 0.00}, + {"name": "HRTIMER", "value": 0.00}, + {"name": "RCU", "value": 0.00} ] } ] } diff --git a/tests/expected.mpstat-APN b/tests/expected.mpstat-APN index 6494180..97ae14b 100644 --- a/tests/expected.mpstat-APN +++ b/tests/expected.mpstat-APN @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 CPU %usr %nice %sys %iowait %irq %soft %steal %guest %gnice %idle 00:00:01 0 2.71 0.03 2.16 0.00 0.32 0.64 0.00 0.00 0.00 94.14 diff --git a/tests/expected.mpstat-I b/tests/expected.mpstat-I index 8095ac4..45d6d3d 100644 --- a/tests/expected.mpstat-I +++ b/tests/expected.mpstat-I @@ -1,8 +1,8 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 NODE %usr %nice %sys %iowait %irq %soft %steal %guest %gnice %idle -00:00:00 all 1.65 44.90 0.91 1.01 0.48 0.45 0.00 0.00 0.00 50.60 -00:00:00 1 1.66 46.18 0.89 0.91 0.45 0.29 0.00 0.00 0.00 49.61 +00:00:00 all 1.49 39.91 0.83 0.94 0.43 0.40 0.00 0.00 0.00 56.00 +00:00:00 1 1.36 36.96 0.76 0.80 0.37 0.24 0.00 0.00 0.00 59.52 00:00:00 CPU intr/s 00:00:00 0 57.08 diff --git a/tests/expected.mpstat-T b/tests/expected.mpstat-T index b2ab9ea..f42aced 100644 --- a/tests/expected.mpstat-T +++ b/tests/expected.mpstat-T @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 CPU CORE SOCK NODE %usr %nice %sys %iowait %irq %soft %steal %guest %gnice %idle 00:00:01 all 2.15 12.50 1.84 0.12 0.34 0.19 0.00 0.00 0.00 82.88 @@ -31,3 +31,4 @@ Average: 4 0 0 0 2.93 0.00 1.88 0.43 0.29 0.18 Average: 5 1 0 1 2.21 0.00 2.21 0.08 0.27 0.10 0.00 0.00 0.00 95.14 Average: 6 2 0 0 2.41 0.00 2.03 0.16 0.48 0.10 0.00 0.00 0.00 94.82 Average: 7 3 0 1 1.86 0.00 0.79 0.02 0.08 0.06 0.00 0.00 0.00 97.19 +Average: 8 0 0 1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 100.00 diff --git a/tests/expected.mpstat-T-JSON b/tests/expected.mpstat-T-JSON index b674c7e..07aecc7 100644 --- a/tests/expected.mpstat-T-JSON +++ b/tests/expected.mpstat-T-JSON @@ -5,13 +5,13 @@ "sysname": "Linux", "release": "1.2.3-TEST", "machine": "x86_64", - "number-of-cpus": 8, + "number-of-cpus": 9, "date": "01/01/70", "statistics": [ { "timestamp": "00:00:00", "cpu-load": [ - {"cpu": "all", "core": "", "socket": "", "node": "", "usr": 1.65, "nice": 44.90, "sys": 0.91, "iowait": 1.01, "irq": 0.48, "soft": 0.45, "steal": 0.00, "guest": 0.00, "gnice": 0.00, "idle": 50.60}, + {"cpu": "all", "core": "", "socket": "", "node": "", "usr": 1.49, "nice": 39.91, "sys": 0.83, "iowait": 0.94, "irq": 0.43, "soft": 0.40, "steal": 0.00, "guest": 0.00, "gnice": 0.00, "idle": 56.00}, {"cpu": "0", "core": "0", "socket": "0", "node": "0", "usr": 1.48, "nice": 46.19, "sys": 0.81, "iowait": 0.59, "irq": 0.45, "soft": 1.34, "steal": 0.00, "guest": 0.00, "gnice": 0.00, "idle": 49.15}, {"cpu": "1", "core": "1", "socket": "0", "node": "1", "usr": 1.54, "nice": 50.59, "sys": 0.87, "iowait": 0.75, "irq": 0.48, "soft": 0.65, "steal": 0.00, "guest": 0.00, "gnice": 0.00, "idle": 45.12}, {"cpu": "2", "core": "2", "socket": "0", "node": "0", "usr": 0.81, "nice": 78.78, "sys": 0.40, "iowait": 1.03, "irq": 0.62, "soft": 0.19, "steal": 0.00, "guest": 0.00, "gnice": 0.00, "idle": 18.18}, @@ -19,7 +19,8 @@ {"cpu": "4", "core": "0", "socket": "0", "node": "0", "usr": 1.78, "nice": 40.97, "sys": 1.11, "iowait": 1.30, "irq": 0.48, "soft": 0.74, "steal": 0.00, "guest": 0.00, "gnice": 0.00, "idle": 53.62}, {"cpu": "5", "core": "1", "socket": "0", "node": "1", "usr": 1.73, "nice": 42.97, "sys": 0.93, "iowait": 1.10, "irq": 0.43, "soft": 0.15, "steal": 0.00, "guest": 0.00, "gnice": 0.00, "idle": 52.69}, {"cpu": "6", "core": "2", "socket": "0", "node": "0", "usr": 2.49, "nice": 8.42, "sys": 1.41, "iowait": 1.51, "irq": 0.49, "soft": 0.15, "steal": 0.00, "guest": 0.00, "gnice": 0.00, "idle": 85.53}, - {"cpu": "7", "core": "3", "socket": "0", "node": "1", "usr": 2.27, "nice": 14.07, "sys": 1.27, "iowait": 1.02, "irq": 0.29, "soft": 0.14, "steal": 0.00, "guest": 0.00, "gnice": 0.00, "idle": 80.95} + {"cpu": "7", "core": "3", "socket": "0", "node": "1", "usr": 2.27, "nice": 14.07, "sys": 1.27, "iowait": 1.02, "irq": 0.29, "soft": 0.14, "steal": 0.00, "guest": 0.00, "gnice": 0.00, "idle": 80.95}, + {"cpu": "8", "core": "0", "socket": "0", "node": "1", "usr": 0.20, "nice": 0.00, "sys": 0.20, "iowait": 0.36, "irq": 0.04, "soft": 0.00, "steal": 0.00, "guest": 0.00, "gnice": 0.00, "idle": 99.19} ] } ] diff --git a/tests/expected.mpstat-dec b/tests/expected.mpstat-dec index 9f53d9b..07829f1 100644 --- a/tests/expected.mpstat-dec +++ b/tests/expected.mpstat-dec @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 CPU intr/s 00:00:00 all 13222.7 @@ -12,6 +12,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) 00:00:00 5 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1521.4 0.0 0.0 0.0 0.0 11.9 4.4 5.4 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 00:00:00 6 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 105.1 0.0 0.0 0.0 1882.4 0.0 0.0 0.0 0.0 12.9 5.8 9.8 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 00:00:00 7 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1736.5 0.0 0.0 0.0 0.0 6.9 5.1 7.9 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 +00:00:00 8 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 00:00:00 CPU HI/s TIMER/s NET_TX/s NET_RX/s BLOCK/s IRQ_POLL/s TASKLET/s SCHED/s HRTIMER/s RCU/s 00:00:00 0 0.0 23.2 0.0 0.0 0.0 0.0 0.0 20.6 0.0 13.3 @@ -22,3 +23,4 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) 00:00:00 5 0.0 26.3 0.0 0.0 0.2 0.0 0.0 12.5 0.0 14.5 00:00:00 6 0.0 23.0 0.0 0.0 0.2 0.0 0.0 10.6 0.0 13.5 00:00:00 7 0.0 26.2 0.0 0.0 0.0 0.0 0.0 11.7 0.0 14.4 +00:00:00 8 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 diff --git a/tests/expected.pidstat b/tests/expected.pidstat index 21ddd9d..da75221 100644 --- a/tests/expected.pidstat +++ b/tests/expected.pidstat @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID %usr %system %guest %wait %CPU CPU Command 00:00:00 0 8407 0.12 0.01 0.00 0.00 0.13 1 gnome-terminal- diff --git a/tests/expected.pidstat-A b/tests/expected.pidstat-A index 44997b3..566c9e5 100644 --- a/tests/expected.pidstat-A +++ b/tests/expected.pidstat-A @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID %usr %system %guest %wait %CPU CPU Command 00:00:00 0 8407 0.12 0.01 0.00 0.00 0.13 1 gnome-terminal- diff --git a/tests/expected.pidstat-A-ALL b/tests/expected.pidstat-A-ALL index 4375e87..03c35ac 100644 --- a/tests/expected.pidstat-A-ALL +++ b/tests/expected.pidstat-A-ALL @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID %usr %system %guest %wait %CPU CPU Command 00:00:00 0 8407 0.12 0.01 0.00 0.00 0.13 1 gnome-terminal- diff --git a/tests/expected.pidstat-A-TCHILD b/tests/expected.pidstat-A-TCHILD index ac955d3..6b14c0a 100644 --- a/tests/expected.pidstat-A-TCHILD +++ b/tests/expected.pidstat-A-TCHILD @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID usr-ms system-ms guest-ms Command 00:00:00 0 8407 21180 2610 0 gnome-terminal- diff --git a/tests/expected.pidstat-A-TTASK b/tests/expected.pidstat-A-TTASK index 44997b3..566c9e5 100644 --- a/tests/expected.pidstat-A-TTASK +++ b/tests/expected.pidstat-A-TTASK @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID %usr %system %guest %wait %CPU CPU Command 00:00:00 0 8407 0.12 0.01 0.00 0.00 0.13 1 gnome-terminal- diff --git a/tests/expected.pidstat-At b/tests/expected.pidstat-At index 8736ec3..4415a4f 100644 --- a/tests/expected.pidstat-At +++ b/tests/expected.pidstat-At @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:00 0 8407 - 0.12 0.01 0.00 0.00 0.13 1 gnome-terminal- diff --git a/tests/expected.pidstat-At-ALL b/tests/expected.pidstat-At-ALL index 9a9d955..a25960c 100644 --- a/tests/expected.pidstat-At-ALL +++ b/tests/expected.pidstat-At-ALL @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:00 0 8407 - 0.12 0.01 0.00 0.00 0.13 1 gnome-terminal- diff --git a/tests/expected.pidstat-At-TALL b/tests/expected.pidstat-At-TALL index d265b4c..f66f87a 100644 --- a/tests/expected.pidstat-At-TALL +++ b/tests/expected.pidstat-At-TALL @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:00 0 8407 - 0.12 0.01 0.00 0.00 0.13 1 gnome-terminal- diff --git a/tests/expected.pidstat-C b/tests/expected.pidstat-C index 7480500..f72883a 100644 --- a/tests/expected.pidstat-C +++ b/tests/expected.pidstat-C @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID %usr %system %guest %wait %CPU CPU Command diff --git a/tests/expected.pidstat-G b/tests/expected.pidstat-G index e670084..f921e42 100644 --- a/tests/expected.pidstat-G +++ b/tests/expected.pidstat-G @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command diff --git a/tests/expected.pidstat-Hh b/tests/expected.pidstat-Hh index dba23e4..a06c6cc 100644 --- a/tests/expected.pidstat-Hh +++ b/tests/expected.pidstat-Hh @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) # Time UID TGID TID %usr %system %guest %wait %CPU CPU minflt/s majflt/s VSZ RSS %MEM StkSize StkRef kB_rd/s kB_wr/s kB_ccwr/s iodelay cswch/s nvcswch/s threads fd-nr prio policy Command 2 1000 7900 - 359.42 53.55 0.00 8.47 412.96 2 25095.93 1.48 4453984 259044 3.18 128 108 411.81 2.82 0.00 253 5700.42 700.96 18 5 0 NORMAL gnome-shell diff --git a/tests/expected.pidstat-I b/tests/expected.pidstat-I index acaafd4..cfb7f8c 100644 --- a/tests/expected.pidstat-I +++ b/tests/expected.pidstat-I @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID %usr %system %guest %wait %CPU CPU Command 00:00:02 1000 7900 359.4% 53.5% 0.0% 8.5% 51.8% 2 gnome-shell diff --git a/tests/expected.pidstat-U b/tests/expected.pidstat-U index 5f98cb6..fa22958 100644 --- a/tests/expected.pidstat-U +++ b/tests/expected.pidstat-U @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 USER PID usr-ms system-ms guest-ms Command 00:00:02 testusr 7900 112090 16710 0 gnome-shell diff --git a/tests/expected.pidstat-Ufoo b/tests/expected.pidstat-Ufoo index fc20e0a..1900d58 100644 --- a/tests/expected.pidstat-Ufoo +++ b/tests/expected.pidstat-Ufoo @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 USER TGID TID %usr %system %guest %wait %CPU CPU Command diff --git a/tests/expected.pidstat-Uroot b/tests/expected.pidstat-Uroot index 8fa6589..8a60ebc 100644 --- a/tests/expected.pidstat-Uroot +++ b/tests/expected.pidstat-Uroot @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 USER TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:02 root 8407 - 0.35 0.03 0.00 0.00 0.38 0 gnome-terminal- diff --git a/tests/expected.pidstat-d-TTASK-ALL b/tests/expected.pidstat-d-TTASK-ALL index 1354de9..5bc3600 100644 --- a/tests/expected.pidstat-d-TTASK-ALL +++ b/tests/expected.pidstat-d-TTASK-ALL @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID kB_rd/s kB_wr/s kB_ccwr/s iodelay Command 00:00:00 0 8407 23.34 28.80 0.01 58 gnome-terminal- diff --git a/tests/expected.pidstat-dec b/tests/expected.pidstat-dec index 60c92bb..8536d99 100644 --- a/tests/expected.pidstat-dec +++ b/tests/expected.pidstat-dec @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:00 0 8407 - 0.1 0.0 0.0 0.0 0.1 1 gnome-terminal- diff --git a/tests/expected.pidstat-e b/tests/expected.pidstat-e index 2eab598..c5f56cc 100644 --- a/tests/expected.pidstat-e +++ b/tests/expected.pidstat-e @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:02 1000 8741 - 0.00 0.00 0.00 0.00 0.00 0 firefox diff --git a/tests/expected.pidstat-l b/tests/expected.pidstat-l index 9f46dc4..70af69f 100644 --- a/tests/expected.pidstat-l +++ b/tests/expected.pidstat-l @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:02 1000 7900 - 359.42 53.55 0.00 8.47 412.96 2 /usr/bin/gnome-shell diff --git a/tests/expected.pidstat-lC b/tests/expected.pidstat-lC index d4ffd6a..dbc7ef1 100644 --- a/tests/expected.pidstat-lC +++ b/tests/expected.pidstat-lC @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID %usr %system %guest %wait %CPU CPU Command diff --git a/tests/expected.pidstat-lG b/tests/expected.pidstat-lG index d3208de..c2e25b3 100644 --- a/tests/expected.pidstat-lG +++ b/tests/expected.pidstat-lG @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:02 0 8407 - 0.35 0.03 0.00 0.00 0.38 0 /usr/libexec/gnome-terminal-server diff --git a/tests/expected.pidstat-p b/tests/expected.pidstat-p index 16e5ad2..a901fb5 100644 --- a/tests/expected.pidstat-p +++ b/tests/expected.pidstat-p @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID StkSize StkRef Command 00:00:01 1000 8741 132 52 firefox diff --git a/tests/expected.pidstat-p-unkwn b/tests/expected.pidstat-p-unkwn index 70d9a1e..2f2174b 100644 --- a/tests/expected.pidstat-p-unkwn +++ b/tests/expected.pidstat-p-unkwn @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID %usr %system %guest %wait %CPU CPU Command diff --git a/tests/expected.pidstat-plist b/tests/expected.pidstat-plist index 8a93525..d919c8c 100644 --- a/tests/expected.pidstat-plist +++ b/tests/expected.pidstat-plist @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:02 1000 9009 - 0.00 0.00 0.00 0.00 0.00 3 WebExtensions diff --git a/tests/expected.pidstat-sigint b/tests/expected.pidstat-sigint index 89c28d6..ef42b65 100644 --- a/tests/expected.pidstat-sigint +++ b/tests/expected.pidstat-sigint @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID cswch/s nvcswch/s Command 00:00:02 1000 7900 5700.42 700.96 gnome-shell diff --git a/tests/expected.sa1 b/tests/expected.sa1 index d957ada..0e0a5dd 100644 --- a/tests/expected.sa1 +++ b/tests/expected.sa1 @@ -1,6 +1,6 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) -13:20:09 LINUX RESTART (8 CPU) +13:20:09 LINUX RESTART (9 CPU) 13:20:29 CPU %user %nice %system %iowait %steal %idle 13:20:49 all 2.28 0.00 1.93 0.48 0.00 95.31 diff --git a/tests/expected.sa1-sleep b/tests/expected.sa1-sleep index 48a72c1..86b4304 100644 --- a/tests/expected.sa1-sleep +++ b/tests/expected.sa1-sleep @@ -1,2 +1,2 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 COM LINUX SLEEP MODE (post hibernate) diff --git a/tests/expected.sa2 b/tests/expected.sa2 index ebb026f..f8387b9 100644 --- a/tests/expected.sa2 +++ b/tests/expected.sa2 @@ -1,6 +1,6 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) -13:20:09 LINUX RESTART (8 CPU) +13:20:09 LINUX RESTART (9 CPU) 13:20:29 CPU %usr %nice %sys %iowait %steal %irq %soft %guest %gnice %idle 13:20:49 all 2.28 0.00 1.55 0.48 0.00 0.19 0.19 0.00 0.00 95.31 diff --git a/tests/expected.sadf-H b/tests/expected.sadf-H index 4fb2940..e40861f 100644 --- a/tests/expected.sadf-H +++ b/tests/expected.sadf-H @@ -1,7 +1,7 @@ System activity data file: tests/data.tmp (0x2175) File created by sar/sadc from sysstat version 99.9.9 Genuine sa datafile: yes (0) -Host: Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Host: Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) File date: 2019-04-18 File time: 13:20:09 UTC (1555593609) Timezone: GMT @@ -11,7 +11,7 @@ HZ = 100 Number of activities in file: 37 Extra structures available: N List of activities: -01: [8b] A_CPU Y: 9 (10,0,0) +01: [8b] A_CPU Y: 10 (10,0,0) 02: [8b] A_PCSW N: 1 (1,1,0) 03: [8b] A_IRQ Y: 489 (1,0,0) 04: [8a] A_SWAP N: 1 (0,2,0) @@ -42,8 +42,8 @@ List of activities: 28: [8a] A_NET_EICMP6 N: 1 (0,11,0) 29: [8a] A_NET_UDP6 N: 1 (0,4,0) 38: [8a] A_NET_FC Y: 1 (0,4,0) -39: [8a] A_NET_SOFT Y: 9 (0,0,5) -30: [8a] A_PWR_CPU Y: 9 (0,1,0) +39: [8a] A_NET_SOFT Y: 10 (0,0,5) +30: [8a] A_PWR_CPU Y: 10 (0,1,0) 37: [8b] A_FS Y: 4 (5,0,0) 40: [8a] A_PSI_CPU N: 1 (1,3,0) 41: [8a] A_PSI_IO N: 1 (2,6,0) diff --git a/tests/expected.sadf-d b/tests/expected.sadf-d index 4780ee5..fb8f505 100644 --- a/tests/expected.sadf-d +++ b/tests/expected.sadf-d @@ -16,7 +16,7 @@ SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;3;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.0 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;4;3.44;0.00;2.16;0.84;0.00;0.32;0.16;0.00;0.00;93.08 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;5;2.76;0.00;2.08;0.16;0.00;0.19;0.10;0.00;0.00;94.71 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;7;0.83;0.00;0.83;0.00;0.00;0.10;0.06;0.00;0.00;98.17 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;-1;2.66;23.20;1.74;0.17;0.00;0.33;0.20;0.00;0.00;71.70 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;-1;2.67;23.08;1.79;0.17;0.00;0.33;0.28;0.00;0.00;71.68 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;0;2.19;52.01;1.46;0.00;0.00;0.36;0.39;0.00;0.00;43.59 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;1;3.45;0.00;2.33;0.55;0.00;0.34;0.39;0.00;0.00;92.94 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;2;0.68;16.81;1.77;0.39;0.00;0.34;0.08;0.00;0.00;79.93 @@ -24,7 +24,8 @@ SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;3;2.33;44.73;1.03;0.01;0.00;0.29;0.16;0. SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;4;3.11;31.18;2.27;0.00;0.00;0.50;0.18;0.00;0.00;62.76 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;5;3.92;0.00;2.56;0.03;0.00;0.37;0.10;0.00;0.00;93.02 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;7;3.23;0.00;1.35;0.36;0.00;0.13;0.13;0.00;0.00;94.79 -SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;-1;6.53;9.63;3.44;0.54;0.00;0.60;0.38;0.00;0.00;78.89 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;8;5.26;0.00;10.53;0.00;0.00;0.00;16.45;0.00;0.00;67.76 +SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;-1;6.21;8.70;6.64;0.49;0.39;0.54;0.34;0.59;0.10;75.90 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;0;2.69;47.44;1.26;0.18;0.00;0.36;0.85;0.00;0.00;47.22 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;1;9.25;0.00;4.06;0.18;0.00;0.59;0.95;0.00;0.00;84.97 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;2;9.90;0.04;3.78;0.90;0.00;0.49;0.49;0.00;0.00;84.39 @@ -33,6 +34,7 @@ SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;4;4.54;52.40;1.80;0.00;0.00;0.49;0.27;0. SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;5;7.62;0.00;4.01;0.14;0.00;0.50;0.23;0.00;0.00;87.51 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;6;4.13;0.01;2.72;0.63;0.00;0.59;0.13;0.00;0.00;91.79 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;7;7.81;0.00;4.38;0.32;0.00;0.63;0.23;0.00;0.00;86.63 +SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;8;2.84;0.00;39.98;0.00;4.50;0.00;0.00;6.75;1.13;44.80 # hostname;interval;timestamp;proc/s;cswch/s SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;3.56;68409.30 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;4.83;46287.74 @@ -2264,7 +2266,8 @@ SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;3;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;4;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;5;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;7;0.00;0.00;0.00;0.00;0.00 -SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;-1;0.00;0.00;0.00;0.00;0.00 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;8;0.00;0.00;0.00;0.00;0.00 +SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;-1;4.29;0.00;0.00;0.00;0.00 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;0;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;1;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;2;0.00;0.00;0.00;0.00;0.00 @@ -2273,6 +2276,7 @@ SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;4;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;5;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;6;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;7;0.00;0.00;0.00;0.00;0.00 +SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;8;4.29;0.00;0.00;0.00;0.00 # hostname;interval;timestamp;CPU;MHz SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;-1;3522.54 SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;0;3566.48 @@ -2312,25 +2316,25 @@ SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;6;3492.22 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;7;3497.56 # hostname;interval;timestamp;FILESYSTEM;MBfsfree;MBfsused;%fsused;%ufsused;Ifree;Iused;%Iused SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;/dev/sda9;85582;7774;8.33;13.45;6008414;102818;1.68 -SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;/dev/sda7;279700;15464;5.24;10.33;19201593;455;0.00 +SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;/dev/sda7;279061;16103;5.46;10.54;19051710;150338;0.78 SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;/dev/sda12;85582;7774;8.33;13.45;6008414;102818;1.68 SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;/dev/sda6;279700;15464;5.24;10.33;19201593;455;0.00 -SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sda9;279700;15464;5.24;10.33;19201593;455;0.00 -SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sda7;85582;7774;8.33;13.45;6008414;102818;1.68 -SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sda12;279700;15464;5.24;10.33;19201593;455;0.00 -SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sda6;85582;7774;8.33;13.45;6008414;102818;1.68 -SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sdf;279700;15464;5.24;10.33;19201593;455;0.00 -SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sdg;85582;7774;8.33;13.45;6008414;102818;1.68 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda9;279700;15464;5.24;10.33;19201593;455;0.00 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda7;85582;7774;8.33;13.45;6008414;102818;1.68 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda12;279700;15464;5.24;10.33;19201593;455;0.00 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda6;85582;7774;8.33;13.45;6008414;102818;1.68 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sdf;279700;15464;5.24;10.33;19201593;455;0.00 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sdg;85582;7774;8.33;13.45;6008414;102818;1.68 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sda9;11154;18247;62.06;67.22;1621550;299810;15.60 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sda7;279061;16103;5.46;10.54;19051710;150338;0.78 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sda12;85582;7774;8.33;13.45;6008414;102818;1.68 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sda6;279700;15464;5.24;10.33;19201593;455;0.00 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sdf;11154;18247;62.06;67.22;1621550;299810;15.60 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sdg;279061;16103;5.46;10.54;19051710;150338;0.78 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda9;11154;18247;62.06;67.22;1621550;299810;15.60 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda7;279061;16103;5.46;10.54;19051710;150338;0.78 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda12;85582;7774;8.33;13.45;6008414;102818;1.68 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda6;279700;15464;5.24;10.33;19201593;455;0.00 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sdf;11154;18247;62.06;67.22;1621550;299810;15.60 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sdg;279061;16103;5.46;10.54;19051710;150338;0.78 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda9;85582;7774;8.33;13.45;6008414;102818;1.68 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda7;279700;15464;5.24;10.33;19201593;455;0.00 -SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda12;85582;7774;8.33;13.45;6008414;102818;1.68 -SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda6;279700;15464;5.24;10.33;19201593;455;0.00 +SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda12;11154;18247;62.06;67.22;1621550;299810;15.60 +SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda6;279061;16103;5.46;10.54;19051710;150338;0.78 # hostname;interval;timestamp;%scpu-10;%scpu-60;%scpu-300;%scpu SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;0.00;0.00;0.00;0.03 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;0.00;0.00;0.00;0.23 @@ -2346,7 +2350,7 @@ SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;3.12;1.40;0.03;0.05;0.00;0.00;0.00;0.02 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;21.06;14.31;3.80;0.03;0.00;0.00;0.00;0.01 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;99.80;70.16;38.70;0.09;0.00;0.00;0.00;0.01 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;23.00;3.00;0.36;0.21;0.00;0.00;0.00;0.15 -SYSSTAT.TEST;-1;2019-04-18 13:37:29 UTC;LINUX-RESTART (8 CPU) +SYSSTAT.TEST;-1;2019-04-18 13:37:29 UTC;LINUX-RESTART (9 CPU) SYSSTAT.TEST;-1;2019-04-18 13:39:09 UTC;COM Testing sysstat! SYSSTAT.TEST;-1;2019-04-18 13:54:09 UTC;LINUX-RESTART (10 CPU) # hostname;interval;timestamp;CPU;%usr;%nice;%sys;%iowait;%steal;%irq;%soft;%guest;%gnice;%idle @@ -2943,17 +2947,17 @@ SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0.00;0.00;0.00;0.00 # hostname;interval;timestamp;FCHOST;fch_rxf/s;fch_txf/s;fch_rxw/s;fch_txw/s SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;host0;0.00;0.00;0.00;0.00 # hostname;interval;timestamp;CPU;total/s;dropd/s;squeezd/s;rx_rps/s;flw_lim/s -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;-1;0.00;0.00;0.00;0.00;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;-1;0.00;0.00;394.13;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0;0.00;0.00;0.00;0.00;0.00 -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;1;0.00;0.00;0.00;0.00;0.00 -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;2;0.00;0.00;0.00;0.00;0.00 -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;3;0.00;0.00;0.00;0.00;0.00 -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;4;0.00;0.00;0.00;0.00;0.00 -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;5;0.00;0.00;0.00;0.00;0.00 -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;6;0.00;0.00;0.00;0.00;0.00 -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;7;0.00;0.00;0.00;0.00;0.00 -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;8;0.00;0.00;0.00;0.00;0.00 -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;9;0.00;0.00;0.00;0.00;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;1;0.00;0.00;8.76;0.00;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;2;0.00;0.00;17.52;0.00;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;3;0.00;0.00;26.28;0.00;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;4;0.00;0.00;35.03;0.00;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;5;0.00;0.00;43.79;0.00;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;6;0.00;0.00;52.55;0.00;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;7;0.00;0.00;61.31;0.00;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;8;0.00;0.00;70.07;0.00;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;9;0.00;0.00;78.83;0.00;0.00 # hostname;interval;timestamp;CPU;MHz SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;-1;3517.54 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0;3566.48 @@ -2969,8 +2973,8 @@ SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;9;3497.56 # hostname;interval;timestamp;FILESYSTEM;MBfsfree;MBfsused;%fsused;%ufsused;Ifree;Iused;%Iused SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda9;85582;7774;8.33;13.45;6008414;102818;1.68 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda7;279700;15464;5.24;10.33;19201593;455;0.00 -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda12;85582;7774;8.33;13.45;6008414;102818;1.68 -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda6;279700;15464;5.24;10.33;19201593;455;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda12;11154;18247;62.06;67.22;1621550;299810;15.60 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda6;279061;16103;5.46;10.54;19051710;150338;0.78 # hostname;interval;timestamp;%scpu-10;%scpu-60;%scpu-300;%scpu SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0.00;0.00;0.00;0.00 # hostname;interval;timestamp;%sio-10;%sio-60;%sio-300;%sio;%fio-10;%fio-60;%fio-300;%fio diff --git a/tests/expected.sadf-d-qu b/tests/expected.sadf-d-qu index 0053519..e55e9c5 100644 --- a/tests/expected.sadf-d-qu +++ b/tests/expected.sadf-d-qu @@ -1,14 +1,14 @@ # hostname;interval;timestamp;CPU;%user;%nice;%system;%iowait;%steal;%idle SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;-1;2.15;12.50;2.36;0.12;0.00;82.88 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;-1;2.28;0.00;1.93;0.48;0.00;95.31 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;-1;2.66;23.20;2.27;0.17;0.00;71.70 -SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;-1;6.53;9.63;4.42;0.54;0.00;78.89 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;-1;2.67;23.08;2.40;0.17;0.00;71.68 +SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;-1;6.80;8.80;7.53;0.49;0.39;75.90 # hostname;interval;timestamp;runq-sz;plist-sz;ldavg-1;ldavg-5;ldavg-15;blocked SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;3;956;3.16;3.24;3.43;0 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;3;956;3.16;3.24;3.43;0 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;3;956;3.16;3.24;3.43;0 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;3;956;3.16;3.24;3.43;0 -SYSSTAT.TEST;-1;2019-04-18 13:37:29 UTC;LINUX-RESTART (8 CPU) +SYSSTAT.TEST;-1;2019-04-18 13:37:29 UTC;LINUX-RESTART (9 CPU) SYSSTAT.TEST;-1;2019-04-18 13:54:09 UTC;LINUX-RESTART (10 CPU) # hostname;interval;timestamp;CPU;%user;%nice;%system;%iowait;%steal;%idle SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;-1;2.47;17.21;3.39;0.77;0.00;76.16 diff --git a/tests/expected.sadf-g b/tests/expected.sadf-g index 69d2a38..bd2c5f8 100644 --- a/tests/expected.sadf-g +++ b/tests/expected.sadf-g @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) @@ -9,15 +9,15 @@ (Min, Max values) -%usr (2.15, 6.53) -%nice (0.00, 23.20) -%sys (1.55, 3.44) +%usr (2.15, 6.21) +%nice (0.00, 23.08) +%sys (1.55, 6.64) %iowait (0.12, 0.77) -%steal (0.00, 0.00) +%steal (0.00, 0.39) %irq (0.19, 0.96) -%soft (0.19, 0.38) -%guest (0.00, 0.00) -%gnice (0.00, 0.00) +%soft (0.19, 0.34) +%guest (0.00, 0.59) +%gnice (0.00, 0.10) 0. @@ -52,22 +52,31 @@ 13:54:29 UTC - + - + - + - + + + + - + - + + + + + + + @@ -612,15 +621,15 @@ (Min, Max values) -%usr (4.15, 4.15) -%nice (41.49, 41.49) -%sys (4.15, 4.15) -%iowait (4.15, 4.15) -%steal (0.00, 0.00) -%irq (4.15, 4.15) -%soft (0.41, 0.41) -%guest (0.00, 0.00) -%gnice (0.00, 0.00) +%usr (2.84, 5.26) +%nice (0.00, 41.49) +%sys (4.15, 39.98) +%iowait (0.00, 4.15) +%steal (0.00, 4.50) +%irq (0.00, 4.15) +%soft (0.00, 16.45) +%guest (0.00, 6.75) +%gnice (0.00, 1.13) 0. @@ -655,22 +664,31 @@ 13:54:29 UTC - + - + + + + - + + + + + + + @@ -11611,16 +11629,18 @@ (Min, Max values) -total/s (0.00, 0.00) +total/s (0.00, 4.29) dropd/s (0.00, 0.00) -0.00. - -0.33. - -0.67. - -1.00. +0. + +1. + +2. + +3. + +4. 13:20:09 @@ -11644,25 +11664,25 @@ 13:54:29 UTC - - + + Software-based network processing statistics (2) [all] (Min, Max values) -squeezd/s (0.00, 0.00) +squeezd/s (0.00, 394.13) rx_rps/s (0.00, 0.00) flw_lim/s (0.00, 0.00) -0.00. - -0.33. - -0.67. - -1.00. +0. + +100. + +200. + +300. 13:20:09 @@ -11686,9 +11706,9 @@ 13:54:29 UTC - - - + + + @@ -11824,17 +11844,19 @@ (Min, Max values) -squeezd/s (0.00, 0.00) +squeezd/s (0.00, 8.76) rx_rps/s (0.00, 0.00) flw_lim/s (0.00, 0.00) -0.00. - -0.33. - -0.67. - -1.00. +0. + +2. + +4. + +6. + +8. 13:20:09 @@ -11858,9 +11880,9 @@ 13:54:29 UTC - - - + + + @@ -11910,17 +11932,17 @@ (Min, Max values) -squeezd/s (0.00, 0.00) +squeezd/s (0.00, 17.52) rx_rps/s (0.00, 0.00) flw_lim/s (0.00, 0.00) -0.00. - -0.33. - -0.67. - -1.00. +0. + +5. + +10. + +15. 13:20:09 @@ -11944,9 +11966,9 @@ 13:54:29 UTC - - - + + + @@ -11996,17 +12018,17 @@ (Min, Max values) -squeezd/s (0.00, 0.00) +squeezd/s (0.00, 26.28) rx_rps/s (0.00, 0.00) flw_lim/s (0.00, 0.00) -0.00. - -0.33. - -0.67. - -1.00. +0. + +8. + +16. + +24. 13:20:09 @@ -12030,9 +12052,9 @@ 13:54:29 UTC - - - + + + @@ -12082,17 +12104,17 @@ (Min, Max values) -squeezd/s (0.00, 0.00) +squeezd/s (0.00, 35.03) rx_rps/s (0.00, 0.00) flw_lim/s (0.00, 0.00) -0.00. - -0.33. - -0.67. - -1.00. +0. + +10. + +20. + +30. 13:20:09 @@ -12116,9 +12138,9 @@ 13:54:29 UTC - - - + + + @@ -12168,17 +12190,19 @@ (Min, Max values) -squeezd/s (0.00, 0.00) +squeezd/s (0.00, 43.79) rx_rps/s (0.00, 0.00) flw_lim/s (0.00, 0.00) -0.00. - -0.33. - -0.67. - -1.00. +0. + +10. + +20. + +30. + +40. 13:20:09 @@ -12202,9 +12226,9 @@ 13:54:29 UTC - - - + + + @@ -12254,17 +12278,21 @@ (Min, Max values) -squeezd/s (0.00, 0.00) +squeezd/s (0.00, 52.55) rx_rps/s (0.00, 0.00) flw_lim/s (0.00, 0.00) -0.00. - -0.33. - -0.67. - -1.00. +0. + +10. + +20. + +30. + +40. + +50. 13:20:09 @@ -12288,9 +12316,9 @@ 13:54:29 UTC - - - + + + @@ -12340,17 +12368,17 @@ (Min, Max values) -squeezd/s (0.00, 0.00) +squeezd/s (0.00, 61.31) rx_rps/s (0.00, 0.00) flw_lim/s (0.00, 0.00) -0.00. - -0.33. - -0.67. - -1.00. +0. + +20. + +40. + +60. 13:20:09 @@ -12374,9 +12402,9 @@ 13:54:29 UTC - - - + + + @@ -12385,16 +12413,18 @@ (Min, Max values) -total/s (0.00, 0.00) +total/s (0.00, 4.29) dropd/s (0.00, 0.00) -0.00. - -0.33. - -0.67. - -1.00. +0. + +1. + +2. + +3. + +4. 13:20:09 @@ -12418,25 +12448,25 @@ 13:54:29 UTC - - + + Software-based network processing statistics (2) [8] (Min, Max values) -squeezd/s (0.00, 0.00) +squeezd/s (0.00, 70.07) rx_rps/s (0.00, 0.00) flw_lim/s (0.00, 0.00) -0.00. - -0.33. - -0.67. - -1.00. +0. + +20. + +40. + +60. 13:20:09 @@ -12460,9 +12490,9 @@ 13:54:29 UTC - - - + + + @@ -12512,17 +12542,17 @@ (Min, Max values) -squeezd/s (0.00, 0.00) +squeezd/s (78.83, 78.83) rx_rps/s (0.00, 0.00) flw_lim/s (0.00, 0.00) -0.00. - -0.33. - -0.67. - -1.00. +0. + +20. + +40. + +60. 13:20:09 @@ -12546,9 +12576,9 @@ 13:54:29 UTC - - - + + + @@ -13008,16 +13038,18 @@ (Min, Max values) -MBfsfree (85582, 279700) -MBfsused (7774, 15464) +MBfsfree (11154, 85582) +MBfsused (7774, 18247) 0. - -90000. - -180000. - -270000. + +20000. + +40000. + +60000. + +80000. 13:20:09 @@ -13041,16 +13073,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/dev/sda9] (Min, Max values) -%ufsused (10.33, 13.45) -%fsused (5.24, 8.33) +%ufsused (13.45, 67.22) +%fsused (8.33, 62.06) 0. @@ -13085,10 +13117,10 @@ 13:54:29 UTC - + - + @@ -13096,16 +13128,16 @@ (Min, Max values) -Ifree/1000 (6008.41, 19201.59) -Iused/1000 (0.46, 102.82) +Ifree/1000 (1621.55, 6008.41) +Iused/1000 (102.82, 299.81) 0. - -6000. - -12000. - -18000. + +2000. + +4000. + +6000. 13:20:09 @@ -13129,15 +13161,15 @@ 13:54:29 UTC - - + + Filesystems statistics (4) [/dev/sda9] (Min, Max values) -%Iused (0.00, 1.68) +%Iused (1.68, 15.60) 0. @@ -13172,7 +13204,7 @@ 13:54:29 UTC - + @@ -13182,8 +13214,8 @@ (Min, Max values) -MBfsfree (85582, 279700) -MBfsused (7774, 15464) +MBfsfree (279061, 279700) +MBfsused (15464, 16103) 0. @@ -13215,16 +13247,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/dev/sda7] (Min, Max values) -%ufsused (10.33, 13.45) -%fsused (5.24, 8.33) +%ufsused (10.33, 10.54) +%fsused (5.24, 5.46) 0. @@ -13259,10 +13291,10 @@ 13:54:29 UTC - + - + @@ -13270,8 +13302,8 @@ (Min, Max values) -Ifree/1000 (6008.41, 19201.59) -Iused/1000 (0.46, 102.82) +Ifree/1000 (19051.71, 19201.59) +Iused/1000 (0.46, 150.34) 0. @@ -13303,15 +13335,15 @@ 13:54:29 UTC - - + + Filesystems statistics (4) [/dev/sda7] (Min, Max values) -%Iused (0.00, 1.68) +%Iused (0.00, 0.78) 0. @@ -13346,7 +13378,7 @@ 13:54:29 UTC - + @@ -13356,16 +13388,18 @@ (Min, Max values) -MBfsfree (85582, 279700) -MBfsused (7774, 15464) +MBfsfree (11154, 85582) +MBfsused (7774, 18247) 0. - -90000. - -180000. - -270000. + +20000. + +40000. + +60000. + +80000. 13:20:09 @@ -13389,16 +13423,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/dev/sda12] (Min, Max values) -%ufsused (10.33, 13.45) -%fsused (5.24, 8.33) +%ufsused (13.45, 67.22) +%fsused (8.33, 62.06) 0. @@ -13433,10 +13467,10 @@ 13:54:29 UTC - + - + @@ -13444,16 +13478,16 @@ (Min, Max values) -Ifree/1000 (6008.41, 19201.59) -Iused/1000 (0.46, 102.82) +Ifree/1000 (1621.55, 6008.41) +Iused/1000 (102.82, 299.81) 0. - -6000. - -12000. - -18000. + +2000. + +4000. + +6000. 13:20:09 @@ -13477,15 +13511,15 @@ 13:54:29 UTC - - + + Filesystems statistics (4) [/dev/sda12] (Min, Max values) -%Iused (0.00, 1.68) +%Iused (1.68, 15.60) 0. @@ -13520,7 +13554,7 @@ 13:54:29 UTC - + @@ -13530,8 +13564,8 @@ (Min, Max values) -MBfsfree (85582, 279700) -MBfsused (7774, 15464) +MBfsfree (279061, 279700) +MBfsused (15464, 16103) 0. @@ -13563,16 +13597,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/dev/sda6] (Min, Max values) -%ufsused (10.33, 13.45) -%fsused (5.24, 8.33) +%ufsused (10.33, 10.54) +%fsused (5.24, 5.46) 0. @@ -13607,10 +13641,10 @@ 13:54:29 UTC - + - + @@ -13618,8 +13652,8 @@ (Min, Max values) -Ifree/1000 (6008.41, 19201.59) -Iused/1000 (0.46, 102.82) +Ifree/1000 (19051.71, 19201.59) +Iused/1000 (0.46, 150.34) 0. @@ -13651,15 +13685,15 @@ 13:54:29 UTC - - + + Filesystems statistics (4) [/dev/sda6] (Min, Max values) -%Iused (0.00, 1.68) +%Iused (0.00, 0.78) 0. @@ -13694,7 +13728,7 @@ 13:54:29 UTC - + @@ -13704,16 +13738,16 @@ (Min, Max values) -MBfsfree (279700, 279700) -MBfsused (15464, 15464) +MBfsfree (11154, 11154) +MBfsused (18247, 18247) 0. - -90000. - -180000. - -270000. + +6000. + +12000. + +18000. 13:20:09 @@ -13737,16 +13771,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/dev/sdf] (Min, Max values) -%ufsused (10.33, 10.33) -%fsused (5.24, 5.24) +%ufsused (67.22, 67.22) +%fsused (62.06, 62.06) 0. @@ -13781,10 +13815,10 @@ 13:54:29 UTC - + - + @@ -13792,16 +13826,16 @@ (Min, Max values) -Ifree/1000 (19201.59, 19201.59) -Iused/1000 (0.46, 0.46) +Ifree/1000 (1621.55, 1621.55) +Iused/1000 (299.81, 299.81) 0. - -6000. - -12000. - -18000. + +500. + +1000. + +1500. 13:20:09 @@ -13825,15 +13859,15 @@ 13:54:29 UTC - - + + Filesystems statistics (4) [/dev/sdf] (Min, Max values) -%Iused (0.00, 0.00) +%Iused (15.60, 15.60) 0. @@ -13868,7 +13902,7 @@ 13:54:29 UTC - + @@ -13878,18 +13912,16 @@ (Min, Max values) -MBfsfree (85582, 85582) -MBfsused (7774, 7774) +MBfsfree (279061, 279061) +MBfsused (16103, 16103) 0. - -20000. - -40000. - -60000. - -80000. + +90000. + +180000. + +270000. 13:20:09 @@ -13913,16 +13945,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/dev/sdg] (Min, Max values) -%ufsused (13.45, 13.45) -%fsused (8.33, 8.33) +%ufsused (10.54, 10.54) +%fsused (5.46, 5.46) 0. @@ -13957,10 +13989,10 @@ 13:54:29 UTC - + - + @@ -13968,16 +14000,16 @@ (Min, Max values) -Ifree/1000 (6008.41, 6008.41) -Iused/1000 (102.82, 102.82) +Ifree/1000 (19051.71, 19051.71) +Iused/1000 (150.34, 150.34) 0. - -2000. - -4000. - -6000. + +6000. + +12000. + +18000. 13:20:09 @@ -14001,15 +14033,15 @@ 13:54:29 UTC - - + + Filesystems statistics (4) [/dev/sdg] (Min, Max values) -%Iused (1.68, 1.68) +%Iused (0.78, 0.78) 0. @@ -14044,7 +14076,7 @@ 13:54:29 UTC - + diff --git a/tests/expected.sadf-g-cc b/tests/expected.sadf-g-cc index 241a75a..7d52113 100644 --- a/tests/expected.sadf-g-cc +++ b/tests/expected.sadf-g-cc @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) @@ -9,11 +9,11 @@ (Min, Max values) -%user (2.15, 6.53) -%nice (0.00, 23.20) -%system (1.93, 4.42) +%user (2.15, 6.80) +%nice (0.00, 23.08) +%system (1.93, 7.53) %iowait (0.12, 0.77) -%steal (0.00, 0.00) +%steal (0.00, 0.39) 0. @@ -48,16 +48,19 @@ 13:54:29 UTC - + - + - + - + + + + diff --git a/tests/expected.sadf-j b/tests/expected.sadf-j index a574459..58b7d44 100644 --- a/tests/expected.sadf-j +++ b/tests/expected.sadf-j @@ -5,7 +5,7 @@ "sysname": "Linux", "release": "1.2.3-TEST", "machine": "x86_64", - "number-of-cpus": 8, + "number-of-cpus": 9, "file-date": "2019-04-18", "file-utc-time": "13:20:09", "timezone": "GMT", @@ -603,7 +603,7 @@ }, "filesystems": [ {"filesystem": "/dev/sda9", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, - {"filesystem": "/dev/sda7", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, + {"filesystem": "/dev/sda7", "MBfsfree": 279061, "MBfsused": 16103, "%fsused": 5.46, "%ufsused": 10.54, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78}, {"filesystem": "/dev/sda12", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, {"filesystem": "/dev/sda6", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00} ], @@ -1203,12 +1203,12 @@ ] }, "filesystems": [ - {"filesystem": "/dev/sda9", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, - {"filesystem": "/dev/sda7", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, - {"filesystem": "/dev/sda12", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, - {"filesystem": "/dev/sda6", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, - {"filesystem": "/dev/sdf", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, - {"filesystem": "/dev/sdg", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68} + {"filesystem": "/dev/sda9", "MBfsfree": 11154, "MBfsused": 18247, "%fsused": 62.06, "%ufsused": 67.22, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, + {"filesystem": "/dev/sda7", "MBfsfree": 279061, "MBfsused": 16103, "%fsused": 5.46, "%ufsused": 10.54, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78}, + {"filesystem": "/dev/sda12", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, + {"filesystem": "/dev/sda6", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, + {"filesystem": "/dev/sdf", "MBfsfree": 11154, "MBfsused": 18247, "%fsused": 62.06, "%ufsused": 67.22, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, + {"filesystem": "/dev/sdg", "MBfsfree": 279061, "MBfsused": 16103, "%fsused": 5.46, "%ufsused": 10.54, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78} ], "psi": { "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_avg": 0.23}, @@ -1219,14 +1219,15 @@ { "timestamp": {"date": "2019-04-18", "time": "13:20:39", "utc": 1, "interval": 39}, "cpu-load": [ - {"cpu": "all", "usr": 2.66, "nice": 23.20, "sys": 1.74, "iowait": 0.17, "steal": 0.00, "irq": 0.33, "soft": 0.20, "guest": 0.00, "gnice": 0.00, "idle": 71.70}, + {"cpu": "all", "usr": 2.67, "nice": 23.08, "sys": 1.79, "iowait": 0.17, "steal": 0.00, "irq": 0.33, "soft": 0.28, "guest": 0.00, "gnice": 0.00, "idle": 71.68}, {"cpu": "0", "usr": 2.19, "nice": 52.01, "sys": 1.46, "iowait": 0.00, "steal": 0.00, "irq": 0.36, "soft": 0.39, "guest": 0.00, "gnice": 0.00, "idle": 43.59}, {"cpu": "1", "usr": 3.45, "nice": 0.00, "sys": 2.33, "iowait": 0.55, "steal": 0.00, "irq": 0.34, "soft": 0.39, "guest": 0.00, "gnice": 0.00, "idle": 92.94}, {"cpu": "2", "usr": 0.68, "nice": 16.81, "sys": 1.77, "iowait": 0.39, "steal": 0.00, "irq": 0.34, "soft": 0.08, "guest": 0.00, "gnice": 0.00, "idle": 79.93}, {"cpu": "3", "usr": 2.33, "nice": 44.73, "sys": 1.03, "iowait": 0.01, "steal": 0.00, "irq": 0.29, "soft": 0.16, "guest": 0.00, "gnice": 0.00, "idle": 51.44}, {"cpu": "4", "usr": 3.11, "nice": 31.18, "sys": 2.27, "iowait": 0.00, "steal": 0.00, "irq": 0.50, "soft": 0.18, "guest": 0.00, "gnice": 0.00, "idle": 62.76}, {"cpu": "5", "usr": 3.92, "nice": 0.00, "sys": 2.56, "iowait": 0.03, "steal": 0.00, "irq": 0.37, "soft": 0.10, "guest": 0.00, "gnice": 0.00, "idle": 93.02}, - {"cpu": "7", "usr": 3.23, "nice": 0.00, "sys": 1.35, "iowait": 0.36, "steal": 0.00, "irq": 0.13, "soft": 0.13, "guest": 0.00, "gnice": 0.00, "idle": 94.79} + {"cpu": "7", "usr": 3.23, "nice": 0.00, "sys": 1.35, "iowait": 0.36, "steal": 0.00, "irq": 0.13, "soft": 0.13, "guest": 0.00, "gnice": 0.00, "idle": 94.79}, + {"cpu": "8", "usr": 5.26, "nice": 0.00, "sys": 10.53, "iowait": 0.00, "steal": 0.00, "irq": 0.00, "soft": 16.45, "guest": 0.00, "gnice": 0.00, "idle": 67.76} ], "process-and-context-switch": {"proc": 3.66, "cswch": 64945.01}, "interrupts": [ @@ -1793,7 +1794,8 @@ {"cpu": "3", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, {"cpu": "4", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, {"cpu": "5", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, - {"cpu": "7", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00} + {"cpu": "7", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, + {"cpu": "8", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00} ] }, "power-management": { @@ -1810,12 +1812,12 @@ ] }, "filesystems": [ - {"filesystem": "/dev/sda9", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, - {"filesystem": "/dev/sda7", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, - {"filesystem": "/dev/sda12", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, - {"filesystem": "/dev/sda6", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, - {"filesystem": "/dev/sdf", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, - {"filesystem": "/dev/sdg", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68} + {"filesystem": "/dev/sda9", "MBfsfree": 11154, "MBfsused": 18247, "%fsused": 62.06, "%ufsused": 67.22, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, + {"filesystem": "/dev/sda7", "MBfsfree": 279061, "MBfsused": 16103, "%fsused": 5.46, "%ufsused": 10.54, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78}, + {"filesystem": "/dev/sda12", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, + {"filesystem": "/dev/sda6", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, + {"filesystem": "/dev/sdf", "MBfsfree": 11154, "MBfsused": 18247, "%fsused": 62.06, "%ufsused": 67.22, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, + {"filesystem": "/dev/sdg", "MBfsfree": 279061, "MBfsused": 16103, "%fsused": 5.46, "%ufsused": 10.54, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78} ], "psi": { "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_avg": 0.01}, @@ -1826,7 +1828,7 @@ { "timestamp": {"date": "2019-04-18", "time": "13:20:49", "utc": 1, "interval": 22}, "cpu-load": [ - {"cpu": "all", "usr": 6.53, "nice": 9.63, "sys": 3.44, "iowait": 0.54, "steal": 0.00, "irq": 0.60, "soft": 0.38, "guest": 0.00, "gnice": 0.00, "idle": 78.89}, + {"cpu": "all", "usr": 6.21, "nice": 8.70, "sys": 6.64, "iowait": 0.49, "steal": 0.39, "irq": 0.54, "soft": 0.34, "guest": 0.59, "gnice": 0.10, "idle": 75.90}, {"cpu": "0", "usr": 2.69, "nice": 47.44, "sys": 1.26, "iowait": 0.18, "steal": 0.00, "irq": 0.36, "soft": 0.85, "guest": 0.00, "gnice": 0.00, "idle": 47.22}, {"cpu": "1", "usr": 9.25, "nice": 0.00, "sys": 4.06, "iowait": 0.18, "steal": 0.00, "irq": 0.59, "soft": 0.95, "guest": 0.00, "gnice": 0.00, "idle": 84.97}, {"cpu": "2", "usr": 9.90, "nice": 0.04, "sys": 3.78, "iowait": 0.90, "steal": 0.00, "irq": 0.49, "soft": 0.49, "guest": 0.00, "gnice": 0.00, "idle": 84.39}, @@ -1834,7 +1836,8 @@ {"cpu": "4", "usr": 4.54, "nice": 52.40, "sys": 1.80, "iowait": 0.00, "steal": 0.00, "irq": 0.49, "soft": 0.27, "guest": 0.00, "gnice": 0.00, "idle": 40.50}, {"cpu": "5", "usr": 7.62, "nice": 0.00, "sys": 4.01, "iowait": 0.14, "steal": 0.00, "irq": 0.50, "soft": 0.23, "guest": 0.00, "gnice": 0.00, "idle": 87.51}, {"cpu": "6", "usr": 4.13, "nice": 0.01, "sys": 2.72, "iowait": 0.63, "steal": 0.00, "irq": 0.59, "soft": 0.13, "guest": 0.00, "gnice": 0.00, "idle": 91.79}, - {"cpu": "7", "usr": 7.81, "nice": 0.00, "sys": 4.38, "iowait": 0.32, "steal": 0.00, "irq": 0.63, "soft": 0.23, "guest": 0.00, "gnice": 0.00, "idle": 86.63} + {"cpu": "7", "usr": 7.81, "nice": 0.00, "sys": 4.38, "iowait": 0.32, "steal": 0.00, "irq": 0.63, "soft": 0.23, "guest": 0.00, "gnice": 0.00, "idle": 86.63}, + {"cpu": "8", "usr": 2.84, "nice": 0.00, "sys": 39.98, "iowait": 0.00, "steal": 4.50, "irq": 0.00, "soft": 0.00, "guest": 6.75, "gnice": 1.13, "idle": 44.80} ], "process-and-context-switch": {"proc": 5.27, "cswch": 108286.78}, "interrupts": [ @@ -2396,7 +2399,7 @@ {"fchost": "host1", "fch_rxf": 0.00, "fch_txf": 0.00, "fch_rxw": 0.00, "fch_txw": 0.00} ], "softnet": [ - {"cpu": "all", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, + {"cpu": "all", "total": 4.29, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, {"cpu": "0", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, {"cpu": "1", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, {"cpu": "2", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, @@ -2404,7 +2407,8 @@ {"cpu": "4", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, {"cpu": "5", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, {"cpu": "6", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, - {"cpu": "7", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00} + {"cpu": "7", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, + {"cpu": "8", "total": 4.29, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00} ] }, "power-management": { @@ -2423,8 +2427,8 @@ "filesystems": [ {"filesystem": "/dev/sda9", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, {"filesystem": "/dev/sda7", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, - {"filesystem": "/dev/sda12", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, - {"filesystem": "/dev/sda6", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00} + {"filesystem": "/dev/sda12", "MBfsfree": 11154, "MBfsused": 18247, "%fsused": 62.06, "%ufsused": 67.22, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, + {"filesystem": "/dev/sda6", "MBfsfree": 279061, "MBfsused": 16103, "%fsused": 5.46, "%ufsused": 10.54, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78} ], "psi": { "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_avg": 0.23}, @@ -3010,17 +3014,17 @@ {"fchost": "host0", "fch_rxf": 0.00, "fch_txf": 0.00, "fch_rxw": 0.00, "fch_txw": 0.00} ], "softnet": [ - {"cpu": "all", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, + {"cpu": "all", "total": 0.00, "dropd": 0.00, "squeezd": 394.13, "rx_rps": 0.00, "flw_lim": 0.00}, {"cpu": "0", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, - {"cpu": "1", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, - {"cpu": "2", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, - {"cpu": "3", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, - {"cpu": "4", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, - {"cpu": "5", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, - {"cpu": "6", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, - {"cpu": "7", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, - {"cpu": "8", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, - {"cpu": "9", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00} + {"cpu": "1", "total": 0.00, "dropd": 0.00, "squeezd": 8.76, "rx_rps": 0.00, "flw_lim": 0.00}, + {"cpu": "2", "total": 0.00, "dropd": 0.00, "squeezd": 17.52, "rx_rps": 0.00, "flw_lim": 0.00}, + {"cpu": "3", "total": 0.00, "dropd": 0.00, "squeezd": 26.28, "rx_rps": 0.00, "flw_lim": 0.00}, + {"cpu": "4", "total": 0.00, "dropd": 0.00, "squeezd": 35.03, "rx_rps": 0.00, "flw_lim": 0.00}, + {"cpu": "5", "total": 0.00, "dropd": 0.00, "squeezd": 43.79, "rx_rps": 0.00, "flw_lim": 0.00}, + {"cpu": "6", "total": 0.00, "dropd": 0.00, "squeezd": 52.55, "rx_rps": 0.00, "flw_lim": 0.00}, + {"cpu": "7", "total": 0.00, "dropd": 0.00, "squeezd": 61.31, "rx_rps": 0.00, "flw_lim": 0.00}, + {"cpu": "8", "total": 0.00, "dropd": 0.00, "squeezd": 70.07, "rx_rps": 0.00, "flw_lim": 0.00}, + {"cpu": "9", "total": 0.00, "dropd": 0.00, "squeezd": 78.83, "rx_rps": 0.00, "flw_lim": 0.00} ] }, "power-management": { @@ -3041,8 +3045,8 @@ "filesystems": [ {"filesystem": "/dev/sda9", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, {"filesystem": "/dev/sda7", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, - {"filesystem": "/dev/sda12", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, - {"filesystem": "/dev/sda6", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00} + {"filesystem": "/dev/sda12", "MBfsfree": 11154, "MBfsused": 18247, "%fsused": 62.06, "%ufsused": 67.22, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, + {"filesystem": "/dev/sda6", "MBfsfree": 279061, "MBfsused": 16103, "%fsused": 5.46, "%ufsused": 10.54, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78} ], "psi": { "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_avg": 0.00}, @@ -3053,7 +3057,7 @@ ], "restarts": [ { - "boot": {"date": "2019-04-18", "time": "13:37:29", "utc": 1, "cpu_count": 8} + "boot": {"date": "2019-04-18", "time": "13:37:29", "utc": 1, "cpu_count": 9} }, { "boot": {"date": "2019-04-18", "time": "13:54:09", "utc": 1, "cpu_count": 10} diff --git a/tests/expected.sadf-p b/tests/expected.sadf-p index 6a1f7b7..a1de12e 100644 --- a/tests/expected.sadf-p +++ b/tests/expected.sadf-p @@ -168,16 +168,16 @@ SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu7 %soft 0.06 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu7 %guest 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu7 %gnice 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu7 %idle 98.17 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC all %usr 2.66 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC all %nice 23.20 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC all %sys 1.74 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC all %usr 2.67 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC all %nice 23.08 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC all %sys 1.79 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC all %iowait 0.17 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC all %steal 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC all %irq 0.33 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC all %soft 0.20 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC all %soft 0.28 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC all %guest 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC all %gnice 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC all %idle 71.70 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC all %idle 71.68 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu0 %usr 2.19 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu0 %nice 52.01 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu0 %sys 1.46 @@ -248,16 +248,26 @@ SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu7 %soft 0.13 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu7 %guest 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu7 %gnice 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu7 %idle 94.79 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %usr 6.53 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %nice 9.63 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %sys 3.44 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %iowait 0.54 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %steal 0.00 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %irq 0.60 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %soft 0.38 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %guest 0.00 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %gnice 0.00 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %idle 78.89 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu8 %usr 5.26 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu8 %nice 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu8 %sys 10.53 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu8 %iowait 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu8 %steal 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu8 %irq 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu8 %soft 16.45 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu8 %guest 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu8 %gnice 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu8 %idle 67.76 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %usr 6.21 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %nice 8.70 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %sys 6.64 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %iowait 0.49 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %steal 0.39 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %irq 0.54 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %soft 0.34 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %guest 0.59 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %gnice 0.10 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all %idle 75.90 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu0 %usr 2.69 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu0 %nice 47.44 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu0 %sys 1.26 @@ -338,6 +348,16 @@ SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu7 %soft 0.23 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu7 %guest 0.00 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu7 %gnice 0.00 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu7 %idle 86.63 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu8 %usr 2.84 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu8 %nice 0.00 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu8 %sys 39.98 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu8 %iowait 0.00 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu8 %steal 4.50 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu8 %irq 0.00 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu8 %soft 0.00 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu8 %guest 6.75 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu8 %gnice 1.13 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu8 %idle 44.80 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC - proc/s 3.56 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC - cswch/s 68409.30 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC - proc/s 4.83 @@ -4110,7 +4130,12 @@ SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu7 dropd/s 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu7 squeezd/s 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu7 rx_rps/s 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu7 flw_lim/s 0.00 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all total/s 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu8 total/s 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu8 dropd/s 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu8 squeezd/s 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu8 rx_rps/s 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu8 flw_lim/s 0.00 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all total/s 4.29 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all dropd/s 0.00 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all squeezd/s 0.00 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC all rx_rps/s 0.00 @@ -4155,6 +4180,11 @@ SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu7 dropd/s 0.00 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu7 squeezd/s 0.00 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu7 rx_rps/s 0.00 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu7 flw_lim/s 0.00 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu8 total/s 4.29 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu8 dropd/s 0.00 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu8 squeezd/s 0.00 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu8 rx_rps/s 0.00 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu8 flw_lim/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC all MHz 3522.54 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC cpu0 MHz 3566.48 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC cpu1 MHz 3566.39 @@ -4198,13 +4228,13 @@ SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda9 %ufsused 13.45 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda9 Ifree 6008414 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda9 Iused 102818 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda9 %Iused 1.68 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 MBfsfree 279700 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 MBfsused 15464 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 %fsused 5.24 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 %ufsused 10.33 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 Ifree 19201593 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 Iused 455 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 %Iused 0.00 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 MBfsfree 279061 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 MBfsused 16103 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 %fsused 5.46 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 %ufsused 10.54 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 Ifree 19051710 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 Iused 150338 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 %Iused 0.78 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda12 MBfsfree 85582 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda12 MBfsused 7774 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda12 %fsused 8.33 @@ -4219,90 +4249,90 @@ SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda6 %ufsused 10.33 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda6 Ifree 19201593 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda6 Iused 455 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda6 %Iused 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 MBfsfree 279700 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 MBfsused 15464 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 %fsused 5.24 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 %ufsused 10.33 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 Ifree 19201593 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 Iused 455 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 %Iused 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 MBfsfree 85582 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 MBfsused 7774 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 %fsused 8.33 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 %ufsused 13.45 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 Ifree 6008414 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 Iused 102818 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 %Iused 1.68 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 MBfsfree 279700 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 MBfsused 15464 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 %fsused 5.24 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 %ufsused 10.33 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 Ifree 19201593 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 Iused 455 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 %Iused 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 MBfsfree 85582 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 MBfsused 7774 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 %fsused 8.33 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 %ufsused 13.45 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 Ifree 6008414 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 Iused 102818 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 %Iused 1.68 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf MBfsfree 279700 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf MBfsused 15464 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf %fsused 5.24 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf %ufsused 10.33 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf Ifree 19201593 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf Iused 455 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf %Iused 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg MBfsfree 85582 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg MBfsused 7774 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg %fsused 8.33 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg %ufsused 13.45 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg Ifree 6008414 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg Iused 102818 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg %Iused 1.68 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 MBfsfree 279700 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 MBfsused 15464 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 %fsused 5.24 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 %ufsused 10.33 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 Ifree 19201593 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 Iused 455 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 %Iused 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 MBfsfree 85582 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 MBfsused 7774 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 %fsused 8.33 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 %ufsused 13.45 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 Ifree 6008414 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 Iused 102818 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 %Iused 1.68 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 MBfsfree 279700 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 MBfsused 15464 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 %fsused 5.24 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 %ufsused 10.33 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 Ifree 19201593 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 Iused 455 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 %Iused 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 MBfsfree 85582 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 MBfsused 7774 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 %fsused 8.33 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 %ufsused 13.45 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 Ifree 6008414 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 Iused 102818 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 %Iused 1.68 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf MBfsfree 279700 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf MBfsused 15464 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf %fsused 5.24 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf %ufsused 10.33 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf Ifree 19201593 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf Iused 455 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf %Iused 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg MBfsfree 85582 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg MBfsused 7774 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg %fsused 8.33 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg %ufsused 13.45 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg Ifree 6008414 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg Iused 102818 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg %Iused 1.68 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 MBfsfree 11154 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 MBfsused 18247 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 %fsused 62.06 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 %ufsused 67.22 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 Ifree 1621550 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 Iused 299810 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 %Iused 15.60 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 MBfsfree 279061 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 MBfsused 16103 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 %fsused 5.46 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 %ufsused 10.54 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 Ifree 19051710 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 Iused 150338 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 %Iused 0.78 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 MBfsfree 85582 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 MBfsused 7774 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 %fsused 8.33 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 %ufsused 13.45 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 Ifree 6008414 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 Iused 102818 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 %Iused 1.68 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 MBfsfree 279700 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 MBfsused 15464 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 %fsused 5.24 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 %ufsused 10.33 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 Ifree 19201593 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 Iused 455 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 %Iused 0.00 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf MBfsfree 11154 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf MBfsused 18247 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf %fsused 62.06 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf %ufsused 67.22 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf Ifree 1621550 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf Iused 299810 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf %Iused 15.60 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg MBfsfree 279061 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg MBfsused 16103 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg %fsused 5.46 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg %ufsused 10.54 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg Ifree 19051710 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg Iused 150338 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg %Iused 0.78 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 MBfsfree 11154 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 MBfsused 18247 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 %fsused 62.06 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 %ufsused 67.22 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 Ifree 1621550 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 Iused 299810 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 %Iused 15.60 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 MBfsfree 279061 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 MBfsused 16103 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 %fsused 5.46 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 %ufsused 10.54 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 Ifree 19051710 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 Iused 150338 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 %Iused 0.78 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 MBfsfree 85582 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 MBfsused 7774 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 %fsused 8.33 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 %ufsused 13.45 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 Ifree 6008414 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 Iused 102818 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 %Iused 1.68 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 MBfsfree 279700 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 MBfsused 15464 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 %fsused 5.24 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 %ufsused 10.33 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 Ifree 19201593 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 Iused 455 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 %Iused 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf MBfsfree 11154 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf MBfsused 18247 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf %fsused 62.06 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf %ufsused 67.22 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf Ifree 1621550 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf Iused 299810 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf %Iused 15.60 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg MBfsfree 279061 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg MBfsused 16103 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg %fsused 5.46 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg %ufsused 10.54 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg Ifree 19051710 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg Iused 150338 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg %Iused 0.78 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda9 MBfsfree 85582 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda9 MBfsused 7774 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda9 %fsused 8.33 @@ -4317,20 +4347,20 @@ SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda7 %ufsused 10.33 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda7 Ifree 19201593 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda7 Iused 455 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda7 %Iused 0.00 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 MBfsfree 85582 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 MBfsused 7774 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 %fsused 8.33 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 %ufsused 13.45 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 Ifree 6008414 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 Iused 102818 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 %Iused 1.68 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 MBfsfree 279700 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 MBfsused 15464 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 %fsused 5.24 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 %ufsused 10.33 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 Ifree 19201593 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 Iused 455 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 %Iused 0.00 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 MBfsfree 11154 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 MBfsused 18247 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 %fsused 62.06 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 %ufsused 67.22 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 Ifree 1621550 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 Iused 299810 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 %Iused 15.60 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 MBfsfree 279061 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 MBfsused 16103 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 %fsused 5.46 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 %ufsused 10.54 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 Ifree 19051710 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 Iused 150338 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 %Iused 0.78 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC - %scpu-10 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC - %scpu-60 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC - %scpu-300 0.00 @@ -4411,7 +4441,7 @@ SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC - %fmem-10 0.00 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC - %fmem-60 0.00 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC - %fmem-300 0.00 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC - %fmem 0.15 -SYSSTAT.TEST -1 2019-04-18 13:37:29 UTC LINUX-RESTART (8 CPU) +SYSSTAT.TEST -1 2019-04-18 13:37:29 UTC LINUX-RESTART (9 CPU) SYSSTAT.TEST -1 2019-04-18 13:39:09 UTC COM Testing sysstat! SYSSTAT.TEST -1 2019-04-18 13:54:09 UTC LINUX-RESTART (10 CPU) SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC all %usr 2.47 @@ -5495,7 +5525,7 @@ SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC host0 fch_rxw/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC host0 fch_txw/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC all total/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC all dropd/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC all squeezd/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC all squeezd/s 394.13 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC all rx_rps/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC all flw_lim/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu0 total/s 0.00 @@ -5505,47 +5535,47 @@ SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu0 rx_rps/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu0 flw_lim/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu1 total/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu1 dropd/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu1 squeezd/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu1 squeezd/s 8.76 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu1 rx_rps/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu1 flw_lim/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu2 total/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu2 dropd/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu2 squeezd/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu2 squeezd/s 17.52 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu2 rx_rps/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu2 flw_lim/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu3 total/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu3 dropd/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu3 squeezd/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu3 squeezd/s 26.28 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu3 rx_rps/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu3 flw_lim/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu4 total/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu4 dropd/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu4 squeezd/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu4 squeezd/s 35.03 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu4 rx_rps/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu4 flw_lim/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu5 total/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu5 dropd/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu5 squeezd/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu5 squeezd/s 43.79 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu5 rx_rps/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu5 flw_lim/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu6 total/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu6 dropd/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu6 squeezd/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu6 squeezd/s 52.55 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu6 rx_rps/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu6 flw_lim/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu7 total/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu7 dropd/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu7 squeezd/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu7 squeezd/s 61.31 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu7 rx_rps/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu7 flw_lim/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu8 total/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu8 dropd/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu8 squeezd/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu8 squeezd/s 70.07 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu8 rx_rps/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu8 flw_lim/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu9 total/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu9 dropd/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu9 squeezd/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu9 squeezd/s 78.83 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu9 rx_rps/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu9 flw_lim/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC all MHz 3517.54 @@ -5573,20 +5603,20 @@ SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda7 %ufsused 10.33 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda7 Ifree 19201593 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda7 Iused 455 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda7 %Iused 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 MBfsfree 85582 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 MBfsused 7774 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 %fsused 8.33 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 %ufsused 13.45 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 Ifree 6008414 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 Iused 102818 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 %Iused 1.68 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 MBfsfree 279700 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 MBfsused 15464 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 %fsused 5.24 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 %ufsused 10.33 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 Ifree 19201593 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 Iused 455 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 %Iused 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 MBfsfree 11154 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 MBfsused 18247 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 %fsused 62.06 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 %ufsused 67.22 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 Ifree 1621550 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 Iused 299810 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 %Iused 15.60 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 MBfsfree 279061 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 MBfsused 16103 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 %fsused 5.46 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 %ufsused 10.54 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 Ifree 19051710 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 Iused 150338 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 %Iused 0.78 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - %scpu-10 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - %scpu-60 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - %scpu-300 0.00 diff --git a/tests/expected.sadf-r b/tests/expected.sadf-r index 9ef690f..6597f5f 100644 --- a/tests/expected.sadf-r +++ b/tests/expected.sadf-r @@ -1,7 +1,7 @@ # uptime_cs; 719255; ust_time; 1555593609; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:09 # uptime_cs; 722372; ust_time; 1555593619; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:19 -# name; A_CPU; nr_curr; 9; nr_alloc; 9; nr_ini; 9 -13:20:19 UTC; CPU; -1; %usr; 94591; 95124; %nice; 2578673; 2581777; %sys; 52404; 52861; %iowait; 58043; 58072; %steal; 0; 0; %irq; 27627; 27711; %soft; 25825; 25869; %guest; 0; 0; %gnice; 0; 0; %idle; 2906475; 2927065; +# name; A_CPU; nr_curr; 9; nr_alloc; 10; nr_ini; 10 +13:20:19 UTC; CPU; -1; %usr; 96005; 96538; %nice; 2578701; 2581805; %sys; 53845; 54302; %iowait; 60648; 60677; %steal; 0; 0; %irq; 27891; 27975; %soft; 25853; 25897; %guest; 0; 0; %gnice; 0; 0; %idle; 3617879; 3638469; 13:20:19 UTC; CPU; 0; %usr; 10600; 10684; %nice; 331675; 331676; %sys; 5802; 5869; %iowait; 4235; 4235; %steal; 0; 0; %irq; 3243; 3253; %soft; 9600; 9620; %guest; 0; 0; %gnice; 0; 0; %idle; 352894; 355816; 13:20:19 UTC; CPU; 1; %usr; 11041; 11129; %nice; 363180; 363180; %sys; 6237; 6369; %iowait; 5418; 5418; %steal; 0; 0; %irq; 3438; 3459; %soft; 4668; 4674; %guest; 0; 0; %gnice; 0; 0; %idle; 323953; 326789; 13:20:19 UTC; CPU; 2; %usr; 5839; 5909; %nice; 566300; 566301; %sys; 2858; 2905; %iowait; 7393; 7414; %steal; 0; 0; %irq; 4440; 4447; %soft; 1356; 1360; %guest; 0; 0; %gnice; 0; 0; %idle; 130672; 133632; @@ -10,9 +10,10 @@ 13:20:19 UTC; CPU; 5; %usr; 12407; 12458; %nice; 308545; 308545; %sys; 6676; 6748; %iowait; 7908; 7908; %steal; 0; 0; %irq; 3093; 3104; %soft; 1071; 1074; %guest; 0; 0; %gnice; 0; 0; %idle; 378302; 381259; 13:20:19 UTC; CPU; 6; %usr; 17865; 17940; %nice; 60354; 60354; %sys; 10138; 10201; %iowait; 10825; 10830; %steal; 0; 0; %irq; 3499; 3514; %soft; 1107; 1110; %guest; 0; 0; %gnice; 0; 0; %idle; 613356; 616306; 13:20:19 UTC; CPU; 7; %usr; 16279; 16369; %nice; 100925; 100925; %sys; 9075; 9098; %iowait; 7292; 7294; %steal; 0; 0; %irq; 2102; 2104; %soft; 977; 979; %guest; 0; 0; %gnice; 0; 0; %idle; 580654; 583650; +13:20:19 UTC; CPU [OFF]; 8; %usr [DEC]; 1414; 0; %nice [DEC]; 28; 0; %sys [DEC]; 1441; 0; %iowait [DEC]; 2605; 0; %steal; 0; 0; %irq [DEC]; 264; 0; %soft [DEC]; 28; 0; %guest; 0; 0; %gnice; 0; 0; %idle [DEC]; 711404; 0; # uptime_cs; 725496; ust_time; 1555593629; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:29 -# name; A_CPU; nr_curr; 9; nr_alloc; 9; nr_ini; 9 -13:20:29 UTC; CPU; -1; %usr; 95124; 95612; %nice; 2581777; 2584890; %sys; 52861; 53235; %iowait; 58072; 58198; %steal; 0; 0; %irq; 27711; 27773; %soft; 25869; 25908; %guest; 0; 0; %gnice; 0; 0; %idle; 2927065; 2947795; +# name; A_CPU; nr_curr; 9; nr_alloc; 10; nr_ini; 10 +13:20:29 UTC; CPU; -1; %usr; 96538; 97026; %nice; 2581805; 2584918; %sys; 54302; 54676; %iowait; 60677; 60803; %steal; 0; 0; %irq; 27975; 28037; %soft; 25897; 25936; %guest; 0; 0; %gnice; 0; 0; %idle; 3638469; 3659199; 13:20:29 UTC; CPU; 0; %usr; 10684; 10723; %nice; 331676; 331676; %sys; 5869; 5916; %iowait; 4235; 4246; %steal; 0; 0; %irq; 3253; 3259; %soft; 9620; 9638; %guest; 0; 0; %gnice; 0; 0; %idle; 355816; 358812; 13:20:29 UTC; CPU; 1; %usr; 11129; 11196; %nice; 363180; 363180; %sys; 6369; 6399; %iowait; 5418; 5442; %steal; 0; 0; %irq; 3459; 3462; %soft; 4674; 4679; %guest; 0; 0; %gnice; 0; 0; %idle; 326789; 329782; 13:20:29 UTC; CPU; 2; %usr; 5909; 6011; %nice; 566301; 566301; %sys; 2905; 2959; %iowait; 7414; 7438; %steal; 0; 0; %irq; 4447; 4454; %soft; 1360; 1363; %guest; 0; 0; %gnice; 0; 0; %idle; 133632; 136557; @@ -21,9 +22,10 @@ 13:20:29 UTC; CPU; 5; %usr; 12458; 12544; %nice; 308545; 308545; %sys; 6748; 6813; %iowait; 7908; 7913; %steal; 0; 0; %irq; 3104; 3110; %soft; 1074; 1077; %guest; 0; 0; %gnice; 0; 0; %idle; 381259; 384212; 13:20:29 UTC; CPU [OFF]; 6; %usr [DEC]; 17940; 0; %nice [DEC]; 60354; 0; %sys [DEC]; 10201; 0; %iowait [DEC]; 10830; 0; %steal; 0; 0; %irq [DEC]; 3514; 0; %soft [DEC]; 1110; 0; %guest; 0; 0; %gnice; 0; 0; %idle [DEC]; 616306; 0; 13:20:29 UTC; CPU; 7; %usr; 16369; 16395; %nice; 100925; 100925; %sys; 9098; 9124; %iowait; 7293; 7293; %steal; 0; 0; %irq; 2104; 2107; %soft; 979; 981; %guest; 0; 0; %gnice; 0; 0; %idle; 583650; 586713; +13:20:29 UTC; CPU [OFF]; 8; %usr; 0; 0; %nice; 0; 0; %sys; 0; 0; %iowait; 0; 0; %steal; 0; 0; %irq; 0; 0; %soft; 0; 0; %guest; 0; 0; %gnice; 0; 0; %idle; 0; 0; # uptime_cs; 729346; ust_time; 1555593639; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:39 -# name; A_CPU; nr_curr; 9; nr_alloc; 9; nr_ini; 9 -13:20:39 UTC; CPU; -1; %usr; 95612; 96528; %nice; 2584890; 2588725; %sys; 53235; 53830; %iowait; 58198; 58263; %steal; 0; 0; %irq; 27773; 27878; %soft; 25908; 25972; %guest; 0; 0; %gnice; 0; 0; %idle; 2947795; 2972869; +# name; A_CPU; nr_curr; 10; nr_alloc; 10; nr_ini; 10 +13:20:39 UTC; CPU; -1; %usr; 97026; 97950; %nice; 2584918; 2588753; %sys; 54676; 55287; %iowait [DEC]; 60803; 58263; %steal; 0; 0; %irq; 28037; 28142; %soft; 25936; 26025; %guest; 0; 0; %gnice; 0; 0; %idle [DEC]; 3659199; 2972972; 13:20:39 UTC; CPU; 0; %usr; 10723; 10807; %nice; 331676; 333672; %sys; 5916; 5972; %iowait; 4246; 4246; %steal; 0; 0; %irq; 3259; 3273; %soft; 9638; 9653; %guest; 0; 0; %gnice; 0; 0; %idle; 358812; 360485; 13:20:39 UTC; CPU; 1; %usr; 11196; 11328; %nice; 363180; 363180; %sys; 6399; 6488; %iowait; 5442; 5463; %steal; 0; 0; %irq; 3462; 3475; %soft; 4679; 4694; %guest; 0; 0; %gnice; 0; 0; %idle; 329782; 333338; 13:20:39 UTC; CPU; 2; %usr; 6011; 6037; %nice; 566301; 566945; %sys; 2959; 3027; %iowait; 7438; 7453; %steal; 0; 0; %irq; 4454; 4467; %soft; 1363; 1366; %guest; 0; 0; %gnice; 0; 0; %idle; 136557; 139619; @@ -32,9 +34,10 @@ 13:20:39 UTC; CPU; 5; %usr; 12544; 12694; %nice; 308545; 308545; %sys; 6813; 6911; %iowait; 7913; 7914; %steal; 0; 0; %irq; 3110; 3124; %soft; 1077; 1081; %guest; 0; 0; %gnice; 0; 0; %idle; 384212; 387770; 13:20:39 UTC; CPU [OFF]; 6; %usr; 0; 0; %nice; 0; 0; %sys; 0; 0; %iowait; 0; 0; %steal; 0; 0; %irq; 0; 0; %soft; 0; 0; %guest; 0; 0; %gnice; 0; 0; %idle; 0; 0; 13:20:39 UTC; CPU; 7; %usr; 16395; 16519; %nice; 100925; 100925; %sys; 9124; 9176; %iowait; 7293; 7307; %steal; 0; 0; %irq; 2107; 2112; %soft; 981; 986; %guest; 0; 0; %gnice; 0; 0; %idle; 586713; 590355; +13:20:39 UTC; CPU; 8; %usr; 0; 1422; %nice; 0; 28; %sys; 0; 1457; %iowait; 0; 0; %steal; 0; 0; %irq; 0; 264; %soft; 0; 53; %guest; 0; 0; %gnice; 0; 0; %idle; 0; 103; # uptime_cs; 731585; ust_time; 1555593649; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:49 -# name; A_CPU; nr_curr; 9; nr_alloc; 9; nr_ini; 9 -13:20:49 UTC; CPU; -1; %usr; 96528; 97862; %nice; 2588725; 2590952; %sys; 53830; 54469; %iowait; 58263; 58317; %steal; 0; 0; %irq; 27878; 27982; %soft; 25972; 26053; %guest; 0; 0; %gnice; 0; 0; %idle; 2972869; 2986198; +# name; A_CPU; nr_curr; 10; nr_alloc; 10; nr_ini; 10 +13:20:49 UTC; CPU; -1; %usr; 97950; 99347; %nice; 2588753; 2590960; %sys; 55287; 56814; %iowait; 58263; 58317; %steal; 0; 100; %irq; 28142; 28246; %soft; 26025; 26106; %guest; 0; 150; %gnice; 0; 25; %idle; 2972972; 2987296; 13:20:49 UTC; CPU; 0; %usr; 10807; 10867; %nice; 333672; 334730; %sys; 5972; 6000; %iowait; 4246; 4250; %steal; 0; 0; %irq; 3273; 3281; %soft; 9653; 9672; %guest; 0; 0; %gnice; 0; 0; %idle; 360485; 361538; 13:20:49 UTC; CPU; 1; %usr; 11328; 11533; %nice; 363180; 363180; %sys; 6488; 6578; %iowait; 5463; 5467; %steal; 0; 0; %irq; 3475; 3488; %soft; 4694; 4715; %guest; 0; 0; %gnice; 0; 0; %idle; 333338; 335221; 13:20:49 UTC; CPU; 2; %usr; 6037; 6257; %nice; 566945; 566946; %sys; 3027; 3111; %iowait; 7453; 7473; %steal; 0; 0; %irq; 4467; 4478; %soft; 1366; 1377; %guest; 0; 0; %gnice; 0; 0; %idle; 139619; 141495; @@ -43,6 +46,7 @@ 13:20:49 UTC; CPU; 5; %usr; 12694; 12863; %nice; 308545; 308545; %sys; 6911; 7000; %iowait; 7914; 7917; %steal; 0; 0; %irq; 3124; 3135; %soft; 1081; 1086; %guest; 0; 0; %gnice; 0; 0; %idle; 387770; 389710; 13:20:49 UTC; CPU; 6; %usr; 0; 18318; %nice; 0; 60355; %sys; 0; 10450; %iowait; 0; 10888; %steal; 0; 0; %irq; 0; 3568; %soft; 0; 1122; %guest; 0; 0; %gnice; 0; 0; %idle; 0; 624713; 13:20:49 UTC; CPU; 7; %usr; 16519; 16692; %nice; 100925; 100925; %sys; 9176; 9273; %iowait; 7307; 7314; %steal; 0; 0; %irq; 2112; 2126; %soft; 986; 991; %guest; 0; 0; %gnice; 0; 0; %idle; 590355; 592273; +13:20:49 UTC; CPU; 8; %usr; 1422; 1485; %nice [DEC]; 28; 8; %sys; 1457; 2345; %iowait; 0; 0; %steal; 0; 100; %irq; 264; 264; %soft; 53; 53; %guest; 0; 150; %gnice; 0; 25; %idle; 103; 1098; # uptime_cs; 0; ust_time; 1555594649; extra_next; 0; record_type; 2; HH:MM:SS; 13:37:29 # uptime_cs; 722372; ust_time; 1555593619; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:19 # name; A_PCSW; nr_curr; 1; nr_alloc; 1; nr_ini; 1 @@ -2498,7 +2502,7 @@ 13:20:49 UTC; FCHOST; host1; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2; # uptime_cs; 0; ust_time; 1555594649; extra_next; 0; record_type; 2; HH:MM:SS; 13:37:29 # uptime_cs; 722372; ust_time; 1555593619; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:19 -# name; A_NET_SOFT; nr_curr; 9; nr_alloc; 9; nr_ini; 9 +# name; A_NET_SOFT; nr_curr; 9; nr_alloc; 10; nr_ini; 10 13:20:19 UTC; CPU; 0; total/s; 11976; 11976; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; 13:20:19 UTC; CPU; 1; total/s; 10608; 10608; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; 13:20:19 UTC; CPU; 2; total/s; 3849; 3849; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; @@ -2507,8 +2511,9 @@ 13:20:19 UTC; CPU; 5; total/s; 13176; 13176; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; 13:20:19 UTC; CPU; 6; total/s; 21614; 21614; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; 13:20:19 UTC; CPU; 7; total/s; 18776; 18776; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; +13:20:19 UTC; CPU [OFF]; 8; total/s [DEC]; 34; 0; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; # uptime_cs; 725496; ust_time; 1555593629; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:29 -# name; A_NET_SOFT; nr_curr; 9; nr_alloc; 9; nr_ini; 9 +# name; A_NET_SOFT; nr_curr; 9; nr_alloc; 10; nr_ini; 10 13:20:29 UTC; CPU; 0; total/s; 11976; 11976; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; 13:20:29 UTC; CPU; 1; total/s; 10608; 10608; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; 13:20:29 UTC; CPU; 2; total/s; 3849; 3849; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; @@ -2517,8 +2522,9 @@ 13:20:29 UTC; CPU; 5; total/s; 13176; 13176; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; 13:20:29 UTC; CPU [OFF]; 6; total/s [DEC]; 21614; 0; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; 13:20:29 UTC; CPU; 7; total/s; 18776; 18776; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; +13:20:29 UTC; CPU [OFF]; 8; total/s; 0; 0; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; # uptime_cs; 729346; ust_time; 1555593639; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:39 -# name; A_NET_SOFT; nr_curr; 9; nr_alloc; 9; nr_ini; 9 +# name; A_NET_SOFT; nr_curr; 10; nr_alloc; 10; nr_ini; 10 13:20:39 UTC; CPU; 0; total/s; 11976; 11976; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; 13:20:39 UTC; CPU; 1; total/s; 10608; 10608; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; 13:20:39 UTC; CPU; 2; total/s; 3849; 3849; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; @@ -2527,8 +2533,9 @@ 13:20:39 UTC; CPU; 5; total/s; 13176; 13176; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; 13:20:39 UTC; CPU [OFF]; 6; total/s; 0; 0; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; 13:20:39 UTC; CPU; 7; total/s; 18776; 18776; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; +13:20:39 UTC; CPU; 8; total/s; 0; 34; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; # uptime_cs; 731585; ust_time; 1555593649; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:49 -# name; A_NET_SOFT; nr_curr; 9; nr_alloc; 9; nr_ini; 9 +# name; A_NET_SOFT; nr_curr; 10; nr_alloc; 10; nr_ini; 10 13:20:49 UTC; CPU; 0; total/s; 11976; 11976; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; 13:20:49 UTC; CPU; 1; total/s; 10608; 10608; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; 13:20:49 UTC; CPU; 2; total/s; 3849; 3849; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; @@ -2537,9 +2544,10 @@ 13:20:49 UTC; CPU; 5; total/s; 13176; 13176; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; 13:20:49 UTC; CPU; 6; total/s; 0; 21614; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; 13:20:49 UTC; CPU; 7; total/s; 18776; 18776; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; +13:20:49 UTC; CPU; 8; total/s; 34; 130; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; # uptime_cs; 0; ust_time; 1555594649; extra_next; 0; record_type; 2; HH:MM:SS; 13:37:29 # uptime_cs; 722372; ust_time; 1555593619; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:19 -# name; A_PWR_CPU; nr_curr; 9; nr_alloc; 9; nr_ini; 9 +# name; A_PWR_CPU; nr_curr; 9; nr_alloc; 10; nr_ini; 10 13:20:19 UTC; CPU; -1; MHz; 352254; 13:20:19 UTC; CPU; 0; MHz; 356648; 13:20:19 UTC; CPU; 1; MHz; 356639; @@ -2550,7 +2558,7 @@ 13:20:19 UTC; CPU; 6; MHz; 349222; 13:20:19 UTC; CPU; 7; MHz; 349756; # uptime_cs; 725496; ust_time; 1555593629; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:29 -# name; A_PWR_CPU; nr_curr; 9; nr_alloc; 9; nr_ini; 9 +# name; A_PWR_CPU; nr_curr; 9; nr_alloc; 10; nr_ini; 10 13:20:29 UTC; CPU; -1; MHz; 352254; 13:20:29 UTC; CPU; 0; MHz; 356648; 13:20:29 UTC; CPU; 1; MHz; 356639; @@ -2561,7 +2569,7 @@ 13:20:29 UTC; CPU; 6; MHz; 349222; 13:20:29 UTC; CPU; 7; MHz; 349756; # uptime_cs; 729346; ust_time; 1555593639; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:39 -# name; A_PWR_CPU; nr_curr; 9; nr_alloc; 9; nr_ini; 9 +# name; A_PWR_CPU; nr_curr; 9; nr_alloc; 10; nr_ini; 10 13:20:39 UTC; CPU; -1; MHz; 352254; 13:20:39 UTC; CPU; 0; MHz; 356648; 13:20:39 UTC; CPU; 1; MHz; 356639; @@ -2572,7 +2580,7 @@ 13:20:39 UTC; CPU; 6; MHz; 349222; 13:20:39 UTC; CPU; 7; MHz; 349756; # uptime_cs; 731585; ust_time; 1555593649; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:49 -# name; A_PWR_CPU; nr_curr; 9; nr_alloc; 9; nr_ini; 9 +# name; A_PWR_CPU; nr_curr; 9; nr_alloc; 10; nr_ini; 10 13:20:49 UTC; CPU; -1; MHz; 352254; 13:20:49 UTC; CPU; 0; MHz; 356648; 13:20:49 UTC; CPU; 1; MHz; 356639; @@ -2586,31 +2594,31 @@ # uptime_cs; 722372; ust_time; 1555593619; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:19 # name; A_FS; nr_curr; 4; nr_alloc; 8; nr_ini; 4 13:20:19 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; -13:20:19 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; +13:20:19 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 292616732672; f_blocks; 309502345216; f_bavail; 276871315456; Ifree; 19051710; f_files; 19202048; 13:20:19 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; 13:20:19 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; # uptime_cs; 725496; ust_time; 1555593629; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:29 # name; A_FS; nr_curr; 6; nr_alloc; 8; nr_ini; 4 -13:20:29 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; -13:20:29 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; -13:20:29 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; -13:20:29 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; -13:20:29 UTC; FILESYSTEM; "/dev/sdf"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; -13:20:29 UTC; FILESYSTEM; "/dev/sdg"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; +13:20:29 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 11696156672; f_blocks; 30829043712; f_bavail; 10106515456; Ifree; 1621550; f_files; 1921360; +13:20:29 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 292616732672; f_blocks; 309502345216; f_bavail; 276871315456; Ifree; 19051710; f_files; 19202048; +13:20:29 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; +13:20:29 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; +13:20:29 UTC; FILESYSTEM; "/dev/sdf"; f_bfree; 11696156672; f_blocks; 30829043712; f_bavail; 10106515456; Ifree; 1621550; f_files; 1921360; +13:20:29 UTC; FILESYSTEM; "/dev/sdg"; f_bfree; 292616732672; f_blocks; 309502345216; f_bavail; 276871315456; Ifree; 19051710; f_files; 19202048; # uptime_cs; 729346; ust_time; 1555593639; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:39 # name; A_FS; nr_curr; 6; nr_alloc; 8; nr_ini; 4 -13:20:39 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; -13:20:39 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; -13:20:39 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; -13:20:39 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; -13:20:39 UTC; FILESYSTEM; "/dev/sdf"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; -13:20:39 UTC; FILESYSTEM; "/dev/sdg"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; +13:20:39 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 11696156672; f_blocks; 30829043712; f_bavail; 10106515456; Ifree; 1621550; f_files; 1921360; +13:20:39 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 292616732672; f_blocks; 309502345216; f_bavail; 276871315456; Ifree; 19051710; f_files; 19202048; +13:20:39 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; +13:20:39 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; +13:20:39 UTC; FILESYSTEM; "/dev/sdf"; f_bfree; 11696156672; f_blocks; 30829043712; f_bavail; 10106515456; Ifree; 1621550; f_files; 1921360; +13:20:39 UTC; FILESYSTEM; "/dev/sdg"; f_bfree; 292616732672; f_blocks; 309502345216; f_bavail; 276871315456; Ifree; 19051710; f_files; 19202048; # uptime_cs; 731585; ust_time; 1555593649; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:49 # name; A_FS; nr_curr; 4; nr_alloc; 8; nr_ini; 4 13:20:49 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; 13:20:49 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; -13:20:49 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; -13:20:49 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; +13:20:49 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 11696156672; f_blocks; 30829043712; f_bavail; 10106515456; Ifree; 1621550; f_files; 1921360; +13:20:49 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 292616732672; f_blocks; 309502345216; f_bavail; 276871315456; Ifree; 19051710; f_files; 19202048; # uptime_cs; 0; ust_time; 1555594649; extra_next; 0; record_type; 2; HH:MM:SS; 13:37:29 # uptime_cs; 722372; ust_time; 1555593619; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:19 # name; A_PSI_CPU; nr_curr; 1; nr_alloc; 1; nr_ini; 1 @@ -2651,14 +2659,14 @@ # name; A_PSI_MEM; nr_curr; 1; nr_alloc; 1; nr_ini; 1 13:20:49 UTC; %smem-10; 2300; %smem-60; 300; %smem-300; 36; %smem; 56879; 103290; %fmem-10; 0; %fmem-60; 0; %fmem-300; 0; %fmem; 12037; 45780; # uptime_cs; 0; ust_time; 1555594649; extra_next; 0; record_type; 2; HH:MM:SS; 13:37:29 -13:37:29 UTC; LINUX-RESTART (8 CPU) +13:37:29 UTC; LINUX-RESTART (9 CPU) # uptime_cs; 0; ust_time; 1555594749; extra_next; 0; record_type; 4; HH:MM:SS; 13:39:09 13:39:09 UTC; COM Testing sysstat! # uptime_cs; 0; ust_time; 1555595649; extra_next; 0; record_type; 2; HH:MM:SS; 13:54:09 13:54:09 UTC; LINUX-RESTART (10 CPU) # uptime_cs; 719255; ust_time; 1555595655; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:15 # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35 -# name; A_CPU; nr_curr; 11; nr_alloc; 18; nr_ini; 11 +# name; A_CPU; nr_curr; 11; nr_alloc; 20; nr_ini; 11 13:54:35 UTC; CPU; -1; %usr; 94891; 95624; %nice; 2581673; 2586777; %sys; 52704; 53361; %iowait; 58343; 58572; %steal; 0; 0; %irq; 27927; 28211; %soft; 25855; 25969; %guest; 0; 0; %gnice; 0; 0; %idle; 2909475; 2932065; 13:54:35 UTC; CPU; 0; %usr; 10600; 10684; %nice; 331675; 331676; %sys; 5802; 5869; %iowait; 4235; 4235; %steal; 0; 0; %irq; 3243; 3253; %soft; 9600; 9620; %guest; 0; 0; %gnice; 0; 0; %idle; 352894; 355816; 13:54:35 UTC; CPU; 1; %usr; 11041; 11129; %nice; 363180; 363180; %sys; 6237; 6369; %iowait; 5418; 5418; %steal; 0; 0; %irq; 3438; 3459; %soft; 4668; 4674; %guest; 0; 0; %gnice; 0; 0; %idle; 323953; 326789; @@ -3283,19 +3291,19 @@ # name; A_NET_FC; nr_curr; 1; nr_alloc; 2; nr_ini; 1 13:54:35 UTC; FCHOST; host0; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2; # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35 -# name; A_NET_SOFT; nr_curr; 11; nr_alloc; 18; nr_ini; 11 +# name; A_NET_SOFT; nr_curr; 11; nr_alloc; 20; nr_ini; 11 13:54:35 UTC; CPU; 0; total/s; 11976; 11976; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; -13:54:35 UTC; CPU; 1; total/s; 10608; 10608; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; -13:54:35 UTC; CPU; 2; total/s; 3849; 3849; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; -13:54:35 UTC; CPU; 3; total/s; 66787; 66787; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; -13:54:35 UTC; CPU; 4; total/s; 11753; 11753; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; -13:54:35 UTC; CPU; 5; total/s; 13176; 13176; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; -13:54:35 UTC; CPU; 6; total/s; 21614; 21614; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; -13:54:35 UTC; CPU; 7; total/s; 18776; 18776; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; -13:54:35 UTC; CPU; 8; total/s; 11976; 11976; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; -13:54:35 UTC; CPU; 9; total/s; 10608; 10608; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; +13:54:35 UTC; CPU; 1; total/s; 10608; 10608; dropd/s; 0; 0; squeezd/s; 0; 273; rx_rps/s; 0; 0; flw_lim/s; 0; 0; +13:54:35 UTC; CPU; 2; total/s; 3849; 3849; dropd/s; 0; 0; squeezd/s; 0; 546; rx_rps/s; 0; 0; flw_lim/s; 0; 0; +13:54:35 UTC; CPU; 3; total/s; 66787; 66787; dropd/s; 0; 0; squeezd/s; 0; 819; rx_rps/s; 0; 0; flw_lim/s; 0; 0; +13:54:35 UTC; CPU; 4; total/s; 11753; 11753; dropd/s; 0; 0; squeezd/s; 0; 1092; rx_rps/s; 0; 0; flw_lim/s; 0; 0; +13:54:35 UTC; CPU; 5; total/s; 13176; 13176; dropd/s; 0; 0; squeezd/s; 0; 1365; rx_rps/s; 0; 0; flw_lim/s; 0; 0; +13:54:35 UTC; CPU; 6; total/s; 21614; 21614; dropd/s; 0; 0; squeezd/s; 0; 1638; rx_rps/s; 0; 0; flw_lim/s; 0; 0; +13:54:35 UTC; CPU; 7; total/s; 18776; 18776; dropd/s; 0; 0; squeezd/s; 0; 1911; rx_rps/s; 0; 0; flw_lim/s; 0; 0; +13:54:35 UTC; CPU; 8; total/s; 11976; 11976; dropd/s; 0; 0; squeezd/s; 0; 2184; rx_rps/s; 0; 0; flw_lim/s; 0; 0; +13:54:35 UTC; CPU; 9; total/s; 10608; 10608; dropd/s; 0; 0; squeezd/s; 0; 2457; rx_rps/s; 0; 0; flw_lim/s; 0; 0; # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35 -# name; A_PWR_CPU; nr_curr; 11; nr_alloc; 18; nr_ini; 9 +# name; A_PWR_CPU; nr_curr; 11; nr_alloc; 20; nr_ini; 10 13:54:35 UTC; CPU; -1; MHz; 351754; 13:54:35 UTC; CPU; 0; MHz; 356648; 13:54:35 UTC; CPU; 1; MHz; 356639; @@ -3311,8 +3319,8 @@ # name; A_FS; nr_curr; 4; nr_alloc; 8; nr_ini; 4 13:54:35 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; 13:54:35 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; -13:54:35 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; -13:54:35 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; +13:54:35 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 11696156672; f_blocks; 30829043712; f_bavail; 10106515456; Ifree; 1621550; f_files; 1921360; +13:54:35 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 292616732672; f_blocks; 309502345216; f_bavail; 276871315456; Ifree; 19051710; f_files; 19202048; # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35 # name; A_PSI_CPU; nr_curr; 1; nr_alloc; 1; nr_ini; 1 13:54:35 UTC; %scpu-10; 0; %scpu-60; 0; %scpu-300; 0; %scpu; 0; 0; diff --git a/tests/expected.sadf-se b/tests/expected.sadf-se index 9b953cb..de11f56 100644 --- a/tests/expected.sadf-se +++ b/tests/expected.sadf-se @@ -3,4 +3,4 @@ SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sda;1604.70;41499.97;10663.48;0.00;32.51 # hostname;interval;timestamp;IFACE;rxpck/s;txpck/s;rxkB/s;txkB/s;rxcmp/s;txcmp/s;rxmcst/s;%ifutil SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;enp6s1;1.90;1.17;0.23;0.21;0.00;0.00;2.31;0.00 # hostname;interval;timestamp;FILESYSTEM;MBfsfree;MBfsused;%fsused;%ufsused;Ifree;Iused;%Iused -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda6;85582;7774;8.33;13.45;6008414;102818;1.68 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda6;279700;15464;5.24;10.33;19201593;455;0.00 diff --git a/tests/expected.sadf-x b/tests/expected.sadf-x index 1416fb9..79594b4 100644 --- a/tests/expected.sadf-x +++ b/tests/expected.sadf-x @@ -10,7 +10,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> Linux 1.2.3-TEST x86_64 - 8 + 9 2019-04-18 13:20:09 GMT @@ -634,7 +634,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - + @@ -1260,12 +1260,12 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - - - - - - + + + + + + @@ -1275,7 +1275,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - + @@ -1283,6 +1283,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> + @@ -1878,6 +1879,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> + @@ -1893,12 +1895,12 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - - - - - - + + + + + + @@ -1908,7 +1910,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - + @@ -1917,6 +1919,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> + @@ -2506,7 +2509,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - + @@ -2515,6 +2518,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> + @@ -2532,8 +2536,8 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - - + + @@ -3146,17 +3150,17 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - + - - - - - - - - - + + + + + + + + + @@ -3176,8 +3180,8 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - - + + @@ -3187,7 +3191,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - + diff --git a/tests/expected.sar-0 b/tests/expected.sar-0 index 712c718..14d902f 100644 --- a/tests/expected.sar-0 +++ b/tests/expected.sar-0 @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 CPU %user %nice %system %iowait %steal %idle -00:00:00 all 1.65 44.90 1.84 1.01 0.00 50.60 +00:00:00 all 1.49 39.91 1.67 0.94 0.00 56.00 00:00:00 kbmemfree kbavail kbmemused %memused kbbuffers kbcached kbcommit %commit kbactive kbinact kbdirty 00:00:00 1437740 4389516 3179712 39.04 260172 2821596 12097852 48.54 4042384 1772396 396 diff --git a/tests/expected.sar-1 b/tests/expected.sar-1 index 43094fc..6eac21f 100644 --- a/tests/expected.sar-1 +++ b/tests/expected.sar-1 @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 05/01/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 05/01/19 _x86_64_ (9 CPU) 23:59:59 CPU %user %nice %system %iowait %steal %idle 00:00:00 all 2.15 12.50 2.36 0.12 0.00 82.88 diff --git a/tests/expected.sar-D b/tests/expected.sar-D index eaf3d71..8f7c657 100644 --- a/tests/expected.sar-D +++ b/tests/expected.sar-D @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 05/02/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 05/02/19 _x86_64_ (9 CPU) 00:00:03 CPU %user %nice %system %iowait %steal %idle 00:00:04 all 2.15 12.50 2.36 0.12 0.00 82.88 diff --git a/tests/expected.sar-ISO b/tests/expected.sar-ISO index ff0ca97..c705bdf 100644 --- a/tests/expected.sar-ISO +++ b/tests/expected.sar-ISO @@ -1,13 +1,13 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 2019-04-18 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 2019-04-18 _x86_64_ (9 CPU) 13:20:09 CPU %user %nice %system %iowait %steal %idle 13:20:19 all 2.15 12.50 2.36 0.12 0.00 82.88 13:20:29 all 2.28 0.00 1.93 0.48 0.00 95.31 -13:20:39 all 2.66 23.20 2.27 0.17 0.00 71.70 -13:20:49 all 6.53 9.63 4.42 0.54 0.00 78.89 -Average: all 3.51 13.20 2.85 0.31 0.00 80.13 +13:20:39 all 2.67 23.08 2.40 0.17 0.00 71.68 +13:20:49 all 6.80 8.80 7.53 0.49 0.39 75.90 +Average: all 3.66 12.87 3.75 0.31 0.10 79.29 -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) 13:39:09 COM Testing sysstat! 13:54:09 LINUX RESTART (10 CPU) diff --git a/tests/expected.sar-all b/tests/expected.sar-all index fb2a83f..d568dca 100644 --- a/tests/expected.sar-all +++ b/tests/expected.sar-all @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 CPU %usr %nice %sys %iowait %steal %irq %soft %guest %gnice %idle 13:20:19 all 2.15 12.50 1.84 0.12 0.00 0.34 0.19 0.00 0.00 82.88 @@ -18,7 +18,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:29 4 3.44 0.00 2.16 0.84 0.00 0.32 0.16 0.00 0.00 93.08 13:20:29 5 2.76 0.00 2.08 0.16 0.00 0.19 0.10 0.00 0.00 94.71 13:20:29 7 0.83 0.00 0.83 0.00 0.00 0.10 0.06 0.00 0.00 98.17 -13:20:39 all 2.66 23.20 1.74 0.17 0.00 0.33 0.20 0.00 0.00 71.70 +13:20:39 all 2.67 23.08 1.79 0.17 0.00 0.33 0.28 0.00 0.00 71.68 13:20:39 0 2.19 52.01 1.46 0.00 0.00 0.36 0.39 0.00 0.00 43.59 13:20:39 1 3.45 0.00 2.33 0.55 0.00 0.34 0.39 0.00 0.00 92.94 13:20:39 2 0.68 16.81 1.77 0.39 0.00 0.34 0.08 0.00 0.00 79.93 @@ -26,7 +26,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:39 4 3.11 31.18 2.27 0.00 0.00 0.50 0.18 0.00 0.00 62.76 13:20:39 5 3.92 0.00 2.56 0.03 0.00 0.37 0.10 0.00 0.00 93.02 13:20:39 7 3.23 0.00 1.35 0.36 0.00 0.13 0.13 0.00 0.00 94.79 -13:20:49 all 6.53 9.63 3.44 0.54 0.00 0.60 0.38 0.00 0.00 78.89 +13:20:39 8 5.26 0.00 10.53 0.00 0.00 0.00 16.45 0.00 0.00 67.76 +13:20:49 all 6.21 8.70 6.64 0.49 0.39 0.54 0.34 0.59 0.10 75.90 13:20:49 0 2.69 47.44 1.26 0.18 0.00 0.36 0.85 0.00 0.00 47.22 13:20:49 1 9.25 0.00 4.06 0.18 0.00 0.59 0.95 0.00 0.00 84.97 13:20:49 2 9.90 0.04 3.78 0.90 0.00 0.49 0.49 0.00 0.00 84.39 @@ -35,7 +36,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:49 5 7.62 0.00 4.01 0.14 0.00 0.50 0.23 0.00 0.00 87.51 13:20:49 6 4.13 0.01 2.72 0.63 0.00 0.59 0.13 0.00 0.00 91.79 13:20:49 7 7.81 0.00 4.38 0.32 0.00 0.63 0.23 0.00 0.00 86.63 -Average: all 3.51 13.20 2.22 0.31 0.00 0.38 0.25 0.00 0.00 80.13 +13:20:49 8 2.84 0.00 39.98 0.00 4.50 0.00 0.00 6.75 1.13 44.80 +Average: all 3.50 12.85 3.11 0.31 0.10 0.37 0.27 0.16 0.03 79.29 Average: 0 2.17 24.86 1.61 0.12 0.00 0.31 0.59 0.00 0.00 70.34 Average: 1 4.02 0.00 2.78 0.40 0.00 0.41 0.38 0.00 0.00 92.01 Average: 2 3.40 5.26 2.06 0.65 0.00 0.31 0.17 0.00 0.00 88.14 @@ -44,6 +46,7 @@ Average: 4 3.28 19.24 1.99 0.22 0.00 0.39 Average: 5 3.72 0.00 2.64 0.07 0.00 0.34 0.12 0.00 0.00 93.10 Average: 6 3.69 0.01 2.54 0.51 0.00 0.56 0.12 0.00 0.00 92.56 Average: 7 3.36 0.00 1.61 0.18 0.00 0.20 0.11 0.00 0.00 94.54 +Average: 8 2.99 0.00 38.10 0.00 4.21 0.00 1.05 6.32 1.05 46.27 13:20:09 proc/s cswch/s 13:20:19 3.56 68409.30 @@ -2854,7 +2857,8 @@ Average: 0.13 0.04 0.03 0.02 host1 13:20:39 4 0.00 0.00 0.00 0.00 0.00 13:20:39 5 0.00 0.00 0.00 0.00 0.00 13:20:39 7 0.00 0.00 0.00 0.00 0.00 -13:20:49 all 0.00 0.00 0.00 0.00 0.00 +13:20:39 8 0.00 0.00 0.00 0.00 0.00 +13:20:49 all 4.29 0.00 0.00 0.00 0.00 13:20:49 0 0.00 0.00 0.00 0.00 0.00 13:20:49 1 0.00 0.00 0.00 0.00 0.00 13:20:49 2 0.00 0.00 0.00 0.00 0.00 @@ -2863,7 +2867,8 @@ Average: 0.13 0.04 0.03 0.02 host1 13:20:49 5 0.00 0.00 0.00 0.00 0.00 13:20:49 6 0.00 0.00 0.00 0.00 0.00 13:20:49 7 0.00 0.00 0.00 0.00 0.00 -Average: all 0.00 0.00 0.00 0.00 0.00 +13:20:49 8 4.29 0.00 0.00 0.00 0.00 +Average: all 0.78 0.00 0.00 0.00 0.00 Average: 0 0.00 0.00 0.00 0.00 0.00 Average: 1 0.00 0.00 0.00 0.00 0.00 Average: 2 0.00 0.00 0.00 0.00 0.00 @@ -2872,6 +2877,7 @@ Average: 4 0.00 0.00 0.00 0.00 0.00 Average: 5 0.00 0.00 0.00 0.00 0.00 Average: 6 0.00 0.00 0.00 0.00 0.00 Average: 7 0.00 0.00 0.00 0.00 0.00 +Average: 8 0.78 0.00 0.00 0.00 0.00 13:20:09 CPU MHz 13:20:19 all 3522.54 @@ -2922,30 +2928,30 @@ Average: 7 3497.56 13:20:09 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM 13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -13:20:19 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 +13:20:19 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 13:20:19 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda9 -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda7 -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda12 -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda6 -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sdf -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sdg -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda9 -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda7 -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda12 -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda6 -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sdf -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sdg +13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda9 +13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 +13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 +13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf +13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg +13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda9 +13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 +13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 +13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf +13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg 13:20:49 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 13:20:49 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -13:20:49 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:20:49 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:20:49 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 +13:20:49 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sdf -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sdg +Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 +Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 +Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf +Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) diff --git a/tests/expected.sar-always b/tests/expected.sar-always index c079ea3..271e93d 100644 --- a/tests/expected.sar-always +++ b/tests/expected.sar-always @@ -1,13 +1,13 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 CPU %user %nice %system %iowait %steal %idle 13:20:19  all 2.15 12.50 2.36 0.12 0.00 82.88 13:20:29  all 2.28 0.00 1.93 0.48 0.00 95.31 -13:20:39  all 2.66 23.20 2.27 0.17 0.00 71.70 -13:20:49  all 6.53 9.63 4.42 0.54 0.00 78.89 -Average:  all 3.51 13.20 2.85 0.31 0.00 80.13 +13:20:39  all 2.67 23.08 2.40 0.17 0.00 71.68 +13:20:49  all 6.80 8.80 7.53 0.49 0.39 75.90 +Average:  all 3.66 12.87 3.75 0.31 0.10 79.29 -13:37:29  LINUX RESTART (8 CPU) +13:37:29  LINUX RESTART (9 CPU) 13:39:09  COM Testing sysstat!  13:54:09  LINUX RESTART (10 CPU) diff --git a/tests/expected.sar-autonever b/tests/expected.sar-autonever index ff0ca97..c705bdf 100644 --- a/tests/expected.sar-autonever +++ b/tests/expected.sar-autonever @@ -1,13 +1,13 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 2019-04-18 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 2019-04-18 _x86_64_ (9 CPU) 13:20:09 CPU %user %nice %system %iowait %steal %idle 13:20:19 all 2.15 12.50 2.36 0.12 0.00 82.88 13:20:29 all 2.28 0.00 1.93 0.48 0.00 95.31 -13:20:39 all 2.66 23.20 2.27 0.17 0.00 71.70 -13:20:49 all 6.53 9.63 4.42 0.54 0.00 78.89 -Average: all 3.51 13.20 2.85 0.31 0.00 80.13 +13:20:39 all 2.67 23.08 2.40 0.17 0.00 71.68 +13:20:49 all 6.80 8.80 7.53 0.49 0.39 75.90 +Average: all 3.66 12.87 3.75 0.31 0.10 79.29 -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) 13:39:09 COM Testing sysstat! 13:54:09 LINUX RESTART (10 CPU) diff --git a/tests/expected.sar-cpu6off b/tests/expected.sar-cpu6off new file mode 100644 index 0000000..93102a6 --- /dev/null +++ b/tests/expected.sar-cpu6off @@ -0,0 +1,87 @@ +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) + +00:00:00 CPU %user %nice %system %iowait %steal %idle +00:00:02 all 2.66 23.20 2.27 0.17 0.00 71.70 +00:00:02 0 2.19 52.01 2.21 0.00 0.00 43.59 +00:00:02 1 3.45 0.00 3.06 0.55 0.00 92.94 +00:00:02 2 0.68 16.81 2.19 0.39 0.00 79.93 +00:00:02 3 2.33 44.73 1.48 0.01 0.00 51.44 +00:00:02 4 3.11 31.18 2.95 0.00 0.00 62.76 +00:00:02 5 3.92 0.00 3.03 0.03 0.00 93.02 +00:00:02 7 3.23 0.00 1.61 0.36 0.00 94.79 + +00:00:00 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s +00:00:02 all 0.00 0.00 0.00 0.00 0.00 +00:00:02 0 0.00 0.00 0.00 0.00 0.00 +00:00:02 1 0.00 0.00 0.00 0.00 0.00 +00:00:02 2 0.00 0.00 0.00 0.00 0.00 +00:00:02 3 0.00 0.00 0.00 0.00 0.00 +00:00:02 4 0.00 0.00 0.00 0.00 0.00 +00:00:02 5 0.00 0.00 0.00 0.00 0.00 +00:00:02 7 0.00 0.00 0.00 0.00 0.00 + +00:00:02 CPU %user %nice %system %iowait %steal %idle +00:00:04 all 8.32 13.77 9.85 0.41 0.62 66.92 +00:00:04 0 2.69 47.44 2.47 0.18 0.00 47.22 +00:00:04 1 9.25 0.00 5.60 0.18 0.00 84.97 +00:00:04 2 9.90 0.04 4.77 0.90 0.00 84.39 +00:00:04 3 31.64 0.00 22.12 4.30 0.00 41.94 +00:00:04 4 4.54 52.40 2.56 0.00 0.00 40.50 +00:00:04 5 7.62 0.00 4.74 0.14 0.00 87.51 +00:00:04 7 7.81 0.00 5.24 0.32 0.00 86.63 +00:00:04 8 9.59 0.23 39.98 0.00 4.50 44.80 + +00:00:02 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s +00:00:04 all 4.29 0.00 0.00 0.00 0.00 +00:00:04 0 0.00 0.00 0.00 0.00 0.00 +00:00:04 1 0.00 0.00 0.00 0.00 0.00 +00:00:04 2 0.00 0.00 0.00 0.00 0.00 +00:00:04 3 0.00 0.00 0.00 0.00 0.00 +00:00:04 4 0.00 0.00 0.00 0.00 0.00 +00:00:04 5 0.00 0.00 0.00 0.00 0.00 +00:00:04 7 0.00 0.00 0.00 0.00 0.00 +00:00:04 8 4.29 0.00 0.00 0.00 0.00 + +00:00:04 CPU %user %nice %system %iowait %steal %idle +00:00:06 all 0.00 0.00 0.00 1.96 0.00 98.19 +00:00:06 0 0.00 0.00 0.00 1.19 0.00 98.90 +00:00:06 1 0.00 0.00 0.00 1.65 0.00 98.49 +00:00:06 2 0.00 0.00 0.00 5.37 0.00 94.86 +00:00:06 3 0.00 0.00 0.00 3.81 0.00 96.37 +00:00:06 4 0.00 0.00 0.00 2.37 0.00 97.71 +00:00:06 5 0.00 0.00 0.00 2.05 0.00 98.05 +00:00:06 6 0.00 0.00 0.00 1.74 0.00 98.33 +00:00:06 7 0.00 0.00 0.00 1.24 0.00 98.80 +00:00:06 8 0.00 0.00 0.00 0.00 0.00 0.00 + +00:00:04 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s +00:00:06 all 0.00 0.00 0.00 0.00 0.00 +00:00:06 0 0.00 0.00 0.00 0.00 0.00 +00:00:06 1 0.00 0.00 0.00 0.00 0.00 +00:00:06 2 0.00 0.00 0.00 0.00 0.00 +00:00:06 3 0.00 0.00 0.00 0.00 0.00 +00:00:06 4 0.00 0.00 0.00 0.00 0.00 +00:00:06 5 0.00 0.00 0.00 0.00 0.00 +00:00:06 6 0.00 0.00 0.00 0.00 0.00 +00:00:06 7 0.00 0.00 0.00 0.00 0.00 +00:00:06 8 0.00 0.00 0.00 0.00 0.00 + +Average: CPU %user %nice %system %iowait %steal %idle +Average: all 0.00 0.00 0.00 1.90 0.00 98.14 +Average: 0 0.00 0.00 0.00 1.19 0.00 98.86 +Average: 1 0.00 0.00 0.00 1.65 0.00 98.41 +Average: 2 0.00 0.00 0.00 5.36 0.00 94.73 +Average: 3 0.00 0.00 0.00 0.00 0.00 0.00 +Average: 4 0.00 0.00 0.00 2.37 0.00 97.66 +Average: 5 0.00 0.00 0.00 2.05 0.00 97.99 +Average: 7 0.00 0.00 0.00 1.24 0.00 98.77 + +Average: CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s +Average: all 0.00 0.00 0.00 0.00 0.00 +Average: 0 0.00 0.00 0.00 0.00 0.00 +Average: 1 0.00 0.00 0.00 0.00 0.00 +Average: 2 0.00 0.00 0.00 0.00 0.00 +Average: 3 0.00 0.00 0.00 0.00 0.00 +Average: 4 0.00 0.00 0.00 0.00 0.00 +Average: 5 0.00 0.00 0.00 0.00 0.00 +Average: 7 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected.sar-cpu8off b/tests/expected.sar-cpu8off new file mode 100644 index 0000000..904533c --- /dev/null +++ b/tests/expected.sar-cpu8off @@ -0,0 +1,87 @@ +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) + +00:00:00 CPU %user %nice %system %iowait %steal %idle +00:00:02 all 2.28 0.00 1.93 0.48 0.00 95.31 +00:00:02 0 1.25 0.00 2.28 0.35 0.00 96.12 +00:00:02 1 2.15 0.00 1.22 0.77 0.00 95.87 +00:00:02 2 3.27 0.00 2.05 0.77 0.00 93.90 +00:00:02 3 0.00 0.00 0.00 0.00 0.00 100.00 +00:00:02 4 3.44 0.00 2.64 0.84 0.00 93.08 +00:00:02 5 2.76 0.00 2.37 0.16 0.00 94.71 +00:00:02 7 0.83 0.00 0.99 0.00 0.00 98.17 + +00:00:00 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s +00:00:02 all 0.00 0.00 0.00 0.00 0.00 +00:00:02 0 0.00 0.00 0.00 0.00 0.00 +00:00:02 1 0.00 0.00 0.00 0.00 0.00 +00:00:02 2 0.00 0.00 0.00 0.00 0.00 +00:00:02 3 0.00 0.00 0.00 0.00 0.00 +00:00:02 4 0.00 0.00 0.00 0.00 0.00 +00:00:02 5 0.00 0.00 0.00 0.00 0.00 +00:00:02 7 0.00 0.00 0.00 0.00 0.00 + +00:00:02 CPU %user %nice %system %iowait %steal %idle +00:00:04 all 2.66 23.20 2.27 0.17 0.00 71.70 +00:00:04 0 2.19 52.01 2.21 0.00 0.00 43.59 +00:00:04 1 3.45 0.00 3.06 0.55 0.00 92.94 +00:00:04 2 0.68 16.81 2.19 0.39 0.00 79.93 +00:00:04 3 2.33 44.73 1.48 0.01 0.00 51.44 +00:00:04 4 3.11 31.18 2.95 0.00 0.00 62.76 +00:00:04 5 3.92 0.00 3.03 0.03 0.00 93.02 +00:00:04 7 3.23 0.00 1.61 0.36 0.00 94.79 + +00:00:02 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s +00:00:04 all 0.00 0.00 0.00 0.00 0.00 +00:00:04 0 0.00 0.00 0.00 0.00 0.00 +00:00:04 1 0.00 0.00 0.00 0.00 0.00 +00:00:04 2 0.00 0.00 0.00 0.00 0.00 +00:00:04 3 0.00 0.00 0.00 0.00 0.00 +00:00:04 4 0.00 0.00 0.00 0.00 0.00 +00:00:04 5 0.00 0.00 0.00 0.00 0.00 +00:00:04 7 0.00 0.00 0.00 0.00 0.00 + +00:00:04 CPU %user %nice %system %iowait %steal %idle +00:00:06 all 6.80 8.80 7.53 0.49 0.39 75.90 +00:00:06 0 2.69 47.44 2.47 0.18 0.00 47.22 +00:00:06 1 9.25 0.00 5.60 0.18 0.00 84.97 +00:00:06 2 9.90 0.04 4.77 0.90 0.00 84.39 +00:00:06 3 31.64 0.00 22.12 4.30 0.00 41.94 +00:00:06 4 4.54 52.40 2.56 0.00 0.00 40.50 +00:00:06 5 7.62 0.00 4.74 0.14 0.00 87.51 +00:00:06 6 4.13 0.01 3.44 0.63 0.00 91.79 +00:00:06 7 7.81 0.00 5.24 0.32 0.00 86.63 +00:00:06 8 9.59 0.23 39.98 0.00 4.50 44.80 + +00:00:04 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s +00:00:06 all 4.29 0.00 0.00 0.00 0.00 +00:00:06 0 0.00 0.00 0.00 0.00 0.00 +00:00:06 1 0.00 0.00 0.00 0.00 0.00 +00:00:06 2 0.00 0.00 0.00 0.00 0.00 +00:00:06 3 0.00 0.00 0.00 0.00 0.00 +00:00:06 4 0.00 0.00 0.00 0.00 0.00 +00:00:06 5 0.00 0.00 0.00 0.00 0.00 +00:00:06 6 0.00 0.00 0.00 0.00 0.00 +00:00:06 7 0.00 0.00 0.00 0.00 0.00 +00:00:06 8 4.29 0.00 0.00 0.00 0.00 + +Average: CPU %user %nice %system %iowait %steal %idle +Average: all 4.01 13.45 3.02 0.39 0.00 79.13 +Average: 0 1.99 33.25 2.30 0.16 0.00 62.30 +Average: 1 4.41 0.00 3.04 0.53 0.00 92.01 +Average: 2 3.80 7.03 2.77 0.64 0.00 85.76 +Average: 3 9.13 77.26 6.13 0.69 0.00 6.78 +Average: 4 3.57 25.76 2.75 0.28 0.00 67.63 +Average: 5 4.42 0.00 3.22 0.10 0.00 92.26 +Average: 6 4.13 0.01 3.44 0.63 0.00 91.79 +Average: 7 3.52 0.00 2.28 0.22 0.00 93.98 + +Average: CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s +Average: all 0.00 0.00 0.00 0.00 0.00 +Average: 0 0.00 0.00 0.00 0.00 0.00 +Average: 1 0.00 0.00 0.00 0.00 0.00 +Average: 2 0.00 0.00 0.00 0.00 0.00 +Average: 3 0.00 0.00 0.00 0.00 0.00 +Average: 4 0.00 0.00 0.00 0.00 0.00 +Average: 5 0.00 0.00 0.00 0.00 0.00 +Average: 6 0.00 0.00 0.00 0.00 0.00 +Average: 7 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected.sar-cpu8onoff b/tests/expected.sar-cpu8onoff new file mode 100644 index 0000000..e184d91 --- /dev/null +++ b/tests/expected.sar-cpu8onoff @@ -0,0 +1,89 @@ +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) + +00:00:00 CPU %user %nice %system %iowait %steal %idle +00:00:02 all 2.15 12.50 2.36 0.12 0.00 82.88 +00:00:02 0 2.71 0.03 3.12 0.00 0.00 94.14 +00:00:02 1 2.85 0.00 5.16 0.00 0.00 91.99 +00:00:02 2 2.25 0.03 1.86 0.68 0.00 95.18 +00:00:02 3 0.00 99.55 0.45 0.00 0.00 0.00 +00:00:02 4 2.41 0.00 2.06 0.03 0.00 95.50 +00:00:02 5 1.65 0.00 2.78 0.00 0.00 95.57 +00:00:02 6 2.41 0.00 2.60 0.16 0.00 94.82 +00:00:02 7 2.89 0.00 0.87 0.06 0.00 96.18 + +00:00:00 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s +00:00:02 all 0.00 0.00 0.00 0.00 0.00 +00:00:02 0 0.00 0.00 0.00 0.00 0.00 +00:00:02 1 0.00 0.00 0.00 0.00 0.00 +00:00:02 2 0.00 0.00 0.00 0.00 0.00 +00:00:02 3 0.00 0.00 0.00 0.00 0.00 +00:00:02 4 0.00 0.00 0.00 0.00 0.00 +00:00:02 5 0.00 0.00 0.00 0.00 0.00 +00:00:02 6 0.00 0.00 0.00 0.00 0.00 +00:00:02 7 0.00 0.00 0.00 0.00 0.00 + +00:00:02 CPU %user %nice %system %iowait %steal %idle +00:00:04 all 2.28 0.00 1.93 0.48 0.00 95.31 +00:00:04 0 1.25 0.00 2.28 0.35 0.00 96.12 +00:00:04 1 2.15 0.00 1.22 0.77 0.00 95.87 +00:00:04 2 3.27 0.00 2.05 0.77 0.00 93.90 +00:00:04 3 0.00 0.00 0.00 0.00 0.00 100.00 +00:00:04 4 3.44 0.00 2.64 0.84 0.00 93.08 +00:00:04 5 2.76 0.00 2.37 0.16 0.00 94.71 +00:00:04 7 0.83 0.00 0.99 0.00 0.00 98.17 + +00:00:02 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s +00:00:04 all 0.00 0.00 0.00 0.00 0.00 +00:00:04 0 0.00 0.00 0.00 0.00 0.00 +00:00:04 1 0.00 0.00 0.00 0.00 0.00 +00:00:04 2 0.00 0.00 0.00 0.00 0.00 +00:00:04 3 0.00 0.00 0.00 0.00 0.00 +00:00:04 4 0.00 0.00 0.00 0.00 0.00 +00:00:04 5 0.00 0.00 0.00 0.00 0.00 +00:00:04 7 0.00 0.00 0.00 0.00 0.00 + +00:00:04 CPU %user %nice %system %iowait %steal %idle +00:00:06 all 2.67 23.08 2.40 0.17 0.00 71.68 +00:00:06 0 2.19 52.01 2.21 0.00 0.00 43.59 +00:00:06 1 3.45 0.00 3.06 0.55 0.00 92.94 +00:00:06 2 0.68 16.81 2.19 0.39 0.00 79.93 +00:00:06 3 2.33 44.73 1.48 0.01 0.00 51.44 +00:00:06 4 3.11 31.18 2.95 0.00 0.00 62.76 +00:00:06 5 3.92 0.00 3.03 0.03 0.00 93.02 +00:00:06 7 3.23 0.00 1.61 0.36 0.00 94.79 +00:00:06 8 5.26 0.00 26.97 0.00 0.00 67.76 + +00:00:04 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s +00:00:06 all 0.00 0.00 0.00 0.00 0.00 +00:00:06 0 0.00 0.00 0.00 0.00 0.00 +00:00:06 1 0.00 0.00 0.00 0.00 0.00 +00:00:06 2 0.00 0.00 0.00 0.00 0.00 +00:00:06 3 0.00 0.00 0.00 0.00 0.00 +00:00:06 4 0.00 0.00 0.00 0.00 0.00 +00:00:06 5 0.00 0.00 0.00 0.00 0.00 +00:00:06 7 0.00 0.00 0.00 0.00 0.00 +00:00:06 8 0.00 0.00 0.00 0.00 0.00 + +Average: CPU %user %nice %system %iowait %steal %idle +Average: all 2.40 13.65 2.26 0.23 0.00 81.46 +Average: 0 2.06 19.85 2.52 0.11 0.00 75.46 +Average: 1 2.86 0.00 3.13 0.45 0.00 93.56 +Average: 2 1.97 6.41 2.05 0.60 0.00 88.97 +Average: 3 1.61 61.69 1.16 0.01 0.00 35.53 +Average: 4 3.00 11.88 2.58 0.27 0.00 82.27 +Average: 5 2.86 0.00 2.75 0.06 0.00 94.33 +Average: 6 2.41 0.00 2.60 0.16 0.00 94.82 +Average: 7 2.38 0.00 1.19 0.15 0.00 96.28 +Average: 8 5.26 0.00 26.97 0.00 0.00 67.76 + +Average: CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s +Average: all 0.00 0.00 0.00 0.00 0.00 +Average: 0 0.00 0.00 0.00 0.00 0.00 +Average: 1 0.00 0.00 0.00 0.00 0.00 +Average: 2 0.00 0.00 0.00 0.00 0.00 +Average: 3 0.00 0.00 0.00 0.00 0.00 +Average: 4 0.00 0.00 0.00 0.00 0.00 +Average: 5 0.00 0.00 0.00 0.00 0.00 +Average: 6 0.00 0.00 0.00 0.00 0.00 +Average: 7 0.00 0.00 0.00 0.00 0.00 +Average: 8 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec index 5691e1f..7a4f54d 100644 --- a/tests/expected.sar-dec +++ b/tests/expected.sar-dec @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 CPU %usr %nice %sys %iowait %steal %irq %soft %guest %gnice %idle 13:20:19 all 2 12 2 0 0 0 0 0 0 83 @@ -26,7 +26,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:39 4 3 31 2 0 0 0 0 0 0 63 13:20:39 5 4 0 3 0 0 0 0 0 0 93 13:20:39 7 3 0 1 0 0 0 0 0 0 95 -13:20:49 all 7 10 3 1 0 1 0 0 0 79 +13:20:39 8 5 0 11 0 0 0 16 0 0 68 +13:20:49 all 6 9 7 0 0 1 0 1 0 76 13:20:49 0 3 47 1 0 0 0 1 0 0 47 13:20:49 1 9 0 4 0 0 1 1 0 0 85 13:20:49 2 10 0 4 1 0 0 0 0 0 84 @@ -35,7 +36,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:49 5 8 0 4 0 0 0 0 0 0 88 13:20:49 6 4 0 3 1 0 1 0 0 0 92 13:20:49 7 8 0 4 0 0 1 0 0 0 87 -Average: all 4 13 2 0 0 0 0 0 0 80 +13:20:49 8 3 0 40 0 5 0 0 7 1 45 +Average: all 4 13 3 0 0 0 0 0 0 79 Average: 0 2 25 2 0 0 0 1 0 0 70 Average: 1 4 0 3 0 0 0 0 0 0 92 Average: 2 3 5 2 1 0 0 0 0 0 88 @@ -44,6 +46,7 @@ Average: 4 3 19 2 0 0 0 Average: 5 4 0 3 0 0 0 0 0 0 93 Average: 6 4 0 3 1 0 1 0 0 0 93 Average: 7 3 0 2 0 0 0 0 0 0 95 +Average: 8 3 0 38 0 4 0 1 6 1 46 13:20:09 proc/s cswch/s 13:20:19 4 68409 @@ -2854,7 +2857,8 @@ Average: 0 0 0 0 host1 13:20:39 4 0 0 0 0 0 13:20:39 5 0 0 0 0 0 13:20:39 7 0 0 0 0 0 -13:20:49 all 0 0 0 0 0 +13:20:39 8 0 0 0 0 0 +13:20:49 all 4 0 0 0 0 13:20:49 0 0 0 0 0 0 13:20:49 1 0 0 0 0 0 13:20:49 2 0 0 0 0 0 @@ -2863,7 +2867,8 @@ Average: 0 0 0 0 host1 13:20:49 5 0 0 0 0 0 13:20:49 6 0 0 0 0 0 13:20:49 7 0 0 0 0 0 -Average: all 0 0 0 0 0 +13:20:49 8 4 0 0 0 0 +Average: all 1 0 0 0 0 Average: 0 0 0 0 0 0 Average: 1 0 0 0 0 0 Average: 2 0 0 0 0 0 @@ -2872,6 +2877,7 @@ Average: 4 0 0 0 0 0 Average: 5 0 0 0 0 0 Average: 6 0 0 0 0 0 Average: 7 0 0 0 0 0 +Average: 8 1 0 0 0 0 13:20:09 CPU MHz 13:20:19 all 3523 @@ -2922,31 +2928,31 @@ Average: 7 3498 13:20:09 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM 13:20:19 85582 7774 8 13 6008414 102818 2 /dev/sda9 -13:20:19 279700 15464 5 10 19201593 455 0 /dev/sda7 +13:20:19 279061 16103 5 11 19051710 150338 1 /dev/sda7 13:20:19 85582 7774 8 13 6008414 102818 2 /dev/sda12 13:20:19 279700 15464 5 10 19201593 455 0 /dev/sda6 -13:20:29 279700 15464 5 10 19201593 455 0 /dev/sda9 -13:20:29 85582 7774 8 13 6008414 102818 2 /dev/sda7 -13:20:29 279700 15464 5 10 19201593 455 0 /dev/sda12 -13:20:29 85582 7774 8 13 6008414 102818 2 /dev/sda6 -13:20:29 279700 15464 5 10 19201593 455 0 /dev/sdf -13:20:29 85582 7774 8 13 6008414 102818 2 /dev/sdg -13:20:39 279700 15464 5 10 19201593 455 0 /dev/sda9 -13:20:39 85582 7774 8 13 6008414 102818 2 /dev/sda7 -13:20:39 279700 15464 5 10 19201593 455 0 /dev/sda12 -13:20:39 85582 7774 8 13 6008414 102818 2 /dev/sda6 -13:20:39 279700 15464 5 10 19201593 455 0 /dev/sdf -13:20:39 85582 7774 8 13 6008414 102818 2 /dev/sdg +13:20:29 11154 18247 62 67 1621550 299810 16 /dev/sda9 +13:20:29 279061 16103 5 11 19051710 150338 1 /dev/sda7 +13:20:29 85582 7774 8 13 6008414 102818 2 /dev/sda12 +13:20:29 279700 15464 5 10 19201593 455 0 /dev/sda6 +13:20:29 11154 18247 62 67 1621550 299810 16 /dev/sdf +13:20:29 279061 16103 5 11 19051710 150338 1 /dev/sdg +13:20:39 11154 18247 62 67 1621550 299810 16 /dev/sda9 +13:20:39 279061 16103 5 11 19051710 150338 1 /dev/sda7 +13:20:39 85582 7774 8 13 6008414 102818 2 /dev/sda12 +13:20:39 279700 15464 5 10 19201593 455 0 /dev/sda6 +13:20:39 11154 18247 62 67 1621550 299810 16 /dev/sdf +13:20:39 279061 16103 5 11 19051710 150338 1 /dev/sdg 13:20:49 85582 7774 8 13 6008414 102818 2 /dev/sda9 13:20:49 279700 15464 5 10 19201593 455 0 /dev/sda7 -13:20:49 85582 7774 8 13 6008414 102818 2 /dev/sda12 -13:20:49 279700 15464 5 10 19201593 455 0 /dev/sda6 +13:20:49 11154 18247 62 67 1621550 299810 16 /dev/sda12 +13:20:49 279061 16103 5 11 19051710 150338 1 /dev/sda6 Summary: 85582 7774 8 13 6008414 102818 2 /dev/sda9 Summary: 279700 15464 5 10 19201593 455 0 /dev/sda7 -Summary: 85582 7774 8 13 6008414 102818 2 /dev/sda12 -Summary: 279700 15464 5 10 19201593 455 0 /dev/sda6 -Summary: 279700 15464 5 10 19201593 455 0 /dev/sdf -Summary: 85582 7774 8 13 6008414 102818 2 /dev/sdg +Summary: 11154 18247 62 67 1621550 299810 16 /dev/sda12 +Summary: 279061 16103 5 11 19051710 150338 1 /dev/sda6 +Summary: 11154 18247 62 67 1621550 299810 16 /dev/sdf +Summary: 279061 16103 5 11 19051710 150338 1 /dev/sdg 13:20:09 %scpu-10 %scpu-60 %scpu-300 %scpu 13:20:19 0 0 0 0 @@ -2969,7 +2975,7 @@ Average: 1 0 0 1 1 0 13:20:49 23 3 0 0 0 0 0 0 Average: 37 22 11 0 0 0 0 0 -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) 13:54:09 LINUX RESTART (10 CPU) @@ -4160,28 +4166,28 @@ Average: 0 0 0 0 Average: 0 0 0 0 host0 13:54:15 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s -13:54:35 all 0 0 0 0 0 +13:54:35 all 0 0 394 0 0 13:54:35 0 0 0 0 0 0 -13:54:35 1 0 0 0 0 0 -13:54:35 2 0 0 0 0 0 -13:54:35 3 0 0 0 0 0 -13:54:35 4 0 0 0 0 0 -13:54:35 5 0 0 0 0 0 -13:54:35 6 0 0 0 0 0 -13:54:35 7 0 0 0 0 0 -13:54:35 8 0 0 0 0 0 -13:54:35 9 0 0 0 0 0 -Average: all 0 0 0 0 0 +13:54:35 1 0 0 9 0 0 +13:54:35 2 0 0 18 0 0 +13:54:35 3 0 0 26 0 0 +13:54:35 4 0 0 35 0 0 +13:54:35 5 0 0 44 0 0 +13:54:35 6 0 0 53 0 0 +13:54:35 7 0 0 61 0 0 +13:54:35 8 0 0 70 0 0 +13:54:35 9 0 0 79 0 0 +Average: all 0 0 394 0 0 Average: 0 0 0 0 0 0 -Average: 1 0 0 0 0 0 -Average: 2 0 0 0 0 0 -Average: 3 0 0 0 0 0 -Average: 4 0 0 0 0 0 -Average: 5 0 0 0 0 0 -Average: 6 0 0 0 0 0 -Average: 7 0 0 0 0 0 -Average: 8 0 0 0 0 0 -Average: 9 0 0 0 0 0 +Average: 1 0 0 9 0 0 +Average: 2 0 0 18 0 0 +Average: 3 0 0 26 0 0 +Average: 4 0 0 35 0 0 +Average: 5 0 0 44 0 0 +Average: 6 0 0 53 0 0 +Average: 7 0 0 61 0 0 +Average: 8 0 0 70 0 0 +Average: 9 0 0 79 0 0 13:54:15 CPU MHz 13:54:35 all 3518 @@ -4210,12 +4216,12 @@ Average: 9 3498 13:54:15 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM 13:54:35 85582 7774 8 13 6008414 102818 2 /dev/sda9 13:54:35 279700 15464 5 10 19201593 455 0 /dev/sda7 -13:54:35 85582 7774 8 13 6008414 102818 2 /dev/sda12 -13:54:35 279700 15464 5 10 19201593 455 0 /dev/sda6 +13:54:35 11154 18247 62 67 1621550 299810 16 /dev/sda12 +13:54:35 279061 16103 5 11 19051710 150338 1 /dev/sda6 Summary: 85582 7774 8 13 6008414 102818 2 /dev/sda9 Summary: 279700 15464 5 10 19201593 455 0 /dev/sda7 -Summary: 85582 7774 8 13 6008414 102818 2 /dev/sda12 -Summary: 279700 15464 5 10 19201593 455 0 /dev/sda6 +Summary: 11154 18247 62 67 1621550 299810 16 /dev/sda12 +Summary: 279061 16103 5 11 19051710 150338 1 /dev/sda6 13:54:15 %scpu-10 %scpu-60 %scpu-300 %scpu 13:54:35 0 0 0 0 diff --git a/tests/expected.sar-dev b/tests/expected.sar-dev index eb71e74..95e2b12 100644 --- a/tests/expected.sar-dev +++ b/tests/expected.sar-dev @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 tps rkB/s wkB/s dkB/s areq-sz aqu-sz await %util DEV 13:20:19 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 sda @@ -7,7 +7,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:49 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 sda Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 sda -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) 13:54:09 LINUX RESTART (10 CPU) diff --git a/tests/expected.sar-fs b/tests/expected.sar-fs index c4ec3cf..2113e61 100644 --- a/tests/expected.sar-fs +++ b/tests/expected.sar-fs @@ -1,16 +1,16 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM 13:20:19 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda6 -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda6 -13:20:49 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:20:49 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 +Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) 13:54:09 LINUX RESTART (10 CPU) 13:54:15 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:54:35 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:54:35 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 +Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 diff --git a/tests/expected.sar-human b/tests/expected.sar-human index 4e5fe84..6449b4c 100644 --- a/tests/expected.sar-human +++ b/tests/expected.sar-human @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 CPU %usr %nice %sys %iowait %steal %irq %soft %guest %gnice %idle 13:20:19 all 2.1% 12.5% 1.8% 0.1% 0.0% 0.3% 0.2% 0.0% 0.0% 82.9% @@ -18,7 +18,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:29 4 3.4% 0.0% 2.2% 0.8% 0.0% 0.3% 0.2% 0.0% 0.0% 93.1% 13:20:29 5 2.8% 0.0% 2.1% 0.2% 0.0% 0.2% 0.1% 0.0% 0.0% 94.7% 13:20:29 7 0.8% 0.0% 0.8% 0.0% 0.0% 0.1% 0.1% 0.0% 0.0% 98.2% -13:20:39 all 2.7% 23.2% 1.7% 0.2% 0.0% 0.3% 0.2% 0.0% 0.0% 71.7% +13:20:39 all 2.7% 23.1% 1.8% 0.2% 0.0% 0.3% 0.3% 0.0% 0.0% 71.7% 13:20:39 0 2.2% 52.0% 1.5% 0.0% 0.0% 0.4% 0.4% 0.0% 0.0% 43.6% 13:20:39 1 3.5% 0.0% 2.3% 0.5% 0.0% 0.3% 0.4% 0.0% 0.0% 92.9% 13:20:39 2 0.7% 16.8% 1.8% 0.4% 0.0% 0.3% 0.1% 0.0% 0.0% 79.9% @@ -26,7 +26,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:39 4 3.1% 31.2% 2.3% 0.0% 0.0% 0.5% 0.2% 0.0% 0.0% 62.8% 13:20:39 5 3.9% 0.0% 2.6% 0.0% 0.0% 0.4% 0.1% 0.0% 0.0% 93.0% 13:20:39 7 3.2% 0.0% 1.4% 0.4% 0.0% 0.1% 0.1% 0.0% 0.0% 94.8% -13:20:49 all 6.5% 9.6% 3.4% 0.5% 0.0% 0.6% 0.4% 0.0% 0.0% 78.9% +13:20:39 8 5.3% 0.0% 10.5% 0.0% 0.0% 0.0% 16.4% 0.0% 0.0% 67.8% +13:20:49 all 6.2% 8.7% 6.6% 0.5% 0.4% 0.5% 0.3% 0.6% 0.1% 75.9% 13:20:49 0 2.7% 47.4% 1.3% 0.2% 0.0% 0.4% 0.9% 0.0% 0.0% 47.2% 13:20:49 1 9.3% 0.0% 4.1% 0.2% 0.0% 0.6% 0.9% 0.0% 0.0% 85.0% 13:20:49 2 9.9% 0.0% 3.8% 0.9% 0.0% 0.5% 0.5% 0.0% 0.0% 84.4% @@ -35,7 +36,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:49 5 7.6% 0.0% 4.0% 0.1% 0.0% 0.5% 0.2% 0.0% 0.0% 87.5% 13:20:49 6 4.1% 0.0% 2.7% 0.6% 0.0% 0.6% 0.1% 0.0% 0.0% 91.8% 13:20:49 7 7.8% 0.0% 4.4% 0.3% 0.0% 0.6% 0.2% 0.0% 0.0% 86.6% -Average: all 3.5% 13.2% 2.2% 0.3% 0.0% 0.4% 0.2% 0.0% 0.0% 80.1% +13:20:49 8 2.8% 0.0% 40.0% 0.0% 4.5% 0.0% 0.0% 6.8% 1.1% 44.8% +Average: all 3.5% 12.8% 3.1% 0.3% 0.1% 0.4% 0.3% 0.2% 0.0% 79.3% Average: 0 2.2% 24.9% 1.6% 0.1% 0.0% 0.3% 0.6% 0.0% 0.0% 70.3% Average: 1 4.0% 0.0% 2.8% 0.4% 0.0% 0.4% 0.4% 0.0% 0.0% 92.0% Average: 2 3.4% 5.3% 2.1% 0.7% 0.0% 0.3% 0.2% 0.0% 0.0% 88.1% @@ -44,6 +46,7 @@ Average: 4 3.3% 19.2% 2.0% 0.2% 0.0% 0.4% Average: 5 3.7% 0.0% 2.6% 0.1% 0.0% 0.3% 0.1% 0.0% 0.0% 93.1% Average: 6 3.7% 0.0% 2.5% 0.5% 0.0% 0.6% 0.1% 0.0% 0.0% 92.6% Average: 7 3.4% 0.0% 1.6% 0.2% 0.0% 0.2% 0.1% 0.0% 0.0% 94.5% +Average: 8 3.0% 0.0% 38.1% 0.0% 4.2% 0.0% 1.1% 6.3% 1.1% 46.3% 13:20:09 proc/s cswch/s 13:20:19 3.56 68409.30 @@ -2854,7 +2857,8 @@ Average: 0.13 0.04 0.03 0.02 host1 13:20:39 4 0.00 0.00 0.00 0.00 0.00 13:20:39 5 0.00 0.00 0.00 0.00 0.00 13:20:39 7 0.00 0.00 0.00 0.00 0.00 -13:20:49 all 0.00 0.00 0.00 0.00 0.00 +13:20:39 8 0.00 0.00 0.00 0.00 0.00 +13:20:49 all 4.29 0.00 0.00 0.00 0.00 13:20:49 0 0.00 0.00 0.00 0.00 0.00 13:20:49 1 0.00 0.00 0.00 0.00 0.00 13:20:49 2 0.00 0.00 0.00 0.00 0.00 @@ -2863,7 +2867,8 @@ Average: 0.13 0.04 0.03 0.02 host1 13:20:49 5 0.00 0.00 0.00 0.00 0.00 13:20:49 6 0.00 0.00 0.00 0.00 0.00 13:20:49 7 0.00 0.00 0.00 0.00 0.00 -Average: all 0.00 0.00 0.00 0.00 0.00 +13:20:49 8 4.29 0.00 0.00 0.00 0.00 +Average: all 0.78 0.00 0.00 0.00 0.00 Average: 0 0.00 0.00 0.00 0.00 0.00 Average: 1 0.00 0.00 0.00 0.00 0.00 Average: 2 0.00 0.00 0.00 0.00 0.00 @@ -2872,6 +2877,7 @@ Average: 4 0.00 0.00 0.00 0.00 0.00 Average: 5 0.00 0.00 0.00 0.00 0.00 Average: 6 0.00 0.00 0.00 0.00 0.00 Average: 7 0.00 0.00 0.00 0.00 0.00 +Average: 8 0.78 0.00 0.00 0.00 0.00 13:20:09 CPU MHz 13:20:19 all 3522.54 @@ -2922,31 +2928,31 @@ Average: 7 3497.56 13:20:09 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM 13:20:19 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda9 -13:20:19 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda7 +13:20:19 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sda7 13:20:19 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda12 13:20:19 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda6 -13:20:29 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda9 -13:20:29 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda7 -13:20:29 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda12 -13:20:29 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda6 -13:20:29 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sdf -13:20:29 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sdg -13:20:39 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda9 -13:20:39 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda7 -13:20:39 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda12 -13:20:39 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda6 -13:20:39 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sdf -13:20:39 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sdg +13:20:29 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sda9 +13:20:29 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sda7 +13:20:29 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda12 +13:20:29 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda6 +13:20:29 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sdf +13:20:29 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sdg +13:20:39 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sda9 +13:20:39 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sda7 +13:20:39 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda12 +13:20:39 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda6 +13:20:39 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sdf +13:20:39 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sdg 13:20:49 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda9 13:20:49 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda7 -13:20:49 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda12 -13:20:49 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda6 +13:20:49 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sda12 +13:20:49 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sda6 Summary: 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda9 Summary: 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda7 -Summary: 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda12 -Summary: 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda6 -Summary: 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sdf -Summary: 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sdg +Summary: 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sda12 +Summary: 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sda6 +Summary: 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sdf +Summary: 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sdg 13:20:09 %scpu-10 %scpu-60 %scpu-300 %scpu 13:20:19 0.0% 0.0% 0.0% 0.0% @@ -2969,7 +2975,7 @@ Average: 0.8% 0.3% 0.2% 1.1% 0.8% 0.3% 0.2 13:20:49 23.0% 3.0% 0.4% 0.2% 0.0% 0.0% 0.0% 0.2% Average: 36.7% 22.2% 10.7% 0.1% 0.0% 0.0% 0.0% 0.0% -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) 13:54:09 LINUX RESTART (10 CPU) @@ -4160,28 +4166,28 @@ Average: 0.00 0.00 0.00 0.00 Average: 0.00 0.00 0.00 0.00 host0 13:54:15 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s -13:54:35 all 0.00 0.00 0.00 0.00 0.00 +13:54:35 all 0.00 0.00 394.13 0.00 0.00 13:54:35 0 0.00 0.00 0.00 0.00 0.00 -13:54:35 1 0.00 0.00 0.00 0.00 0.00 -13:54:35 2 0.00 0.00 0.00 0.00 0.00 -13:54:35 3 0.00 0.00 0.00 0.00 0.00 -13:54:35 4 0.00 0.00 0.00 0.00 0.00 -13:54:35 5 0.00 0.00 0.00 0.00 0.00 -13:54:35 6 0.00 0.00 0.00 0.00 0.00 -13:54:35 7 0.00 0.00 0.00 0.00 0.00 -13:54:35 8 0.00 0.00 0.00 0.00 0.00 -13:54:35 9 0.00 0.00 0.00 0.00 0.00 -Average: all 0.00 0.00 0.00 0.00 0.00 +13:54:35 1 0.00 0.00 8.76 0.00 0.00 +13:54:35 2 0.00 0.00 17.52 0.00 0.00 +13:54:35 3 0.00 0.00 26.28 0.00 0.00 +13:54:35 4 0.00 0.00 35.03 0.00 0.00 +13:54:35 5 0.00 0.00 43.79 0.00 0.00 +13:54:35 6 0.00 0.00 52.55 0.00 0.00 +13:54:35 7 0.00 0.00 61.31 0.00 0.00 +13:54:35 8 0.00 0.00 70.07 0.00 0.00 +13:54:35 9 0.00 0.00 78.83 0.00 0.00 +Average: all 0.00 0.00 394.13 0.00 0.00 Average: 0 0.00 0.00 0.00 0.00 0.00 -Average: 1 0.00 0.00 0.00 0.00 0.00 -Average: 2 0.00 0.00 0.00 0.00 0.00 -Average: 3 0.00 0.00 0.00 0.00 0.00 -Average: 4 0.00 0.00 0.00 0.00 0.00 -Average: 5 0.00 0.00 0.00 0.00 0.00 -Average: 6 0.00 0.00 0.00 0.00 0.00 -Average: 7 0.00 0.00 0.00 0.00 0.00 -Average: 8 0.00 0.00 0.00 0.00 0.00 -Average: 9 0.00 0.00 0.00 0.00 0.00 +Average: 1 0.00 0.00 8.76 0.00 0.00 +Average: 2 0.00 0.00 17.52 0.00 0.00 +Average: 3 0.00 0.00 26.28 0.00 0.00 +Average: 4 0.00 0.00 35.03 0.00 0.00 +Average: 5 0.00 0.00 43.79 0.00 0.00 +Average: 6 0.00 0.00 52.55 0.00 0.00 +Average: 7 0.00 0.00 61.31 0.00 0.00 +Average: 8 0.00 0.00 70.07 0.00 0.00 +Average: 9 0.00 0.00 78.83 0.00 0.00 13:54:15 CPU MHz 13:54:35 all 3517.54 @@ -4210,12 +4216,12 @@ Average: 9 3497.56 13:54:15 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM 13:54:35 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda9 13:54:35 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda7 -13:54:35 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda12 -13:54:35 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda6 +13:54:35 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sda12 +13:54:35 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sda6 Summary: 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda9 Summary: 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda7 -Summary: 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda12 -Summary: 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda6 +Summary: 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sda12 +Summary: 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sda6 13:54:15 %scpu-10 %scpu-60 %scpu-300 %scpu 13:54:35 0.0% 0.0% 0.0% 0.0% diff --git a/tests/expected.sar-i b/tests/expected.sar-i index 1f1aee2..a2167fe 100644 --- a/tests/expected.sar-i +++ b/tests/expected.sar-i @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 CPU %user %nice %system %iowait %steal %idle 13:20:29 all 2.19 7.68 2.14 0.28 0.00 87.71 @@ -9,7 +9,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:29 4 2.93 0.00 2.35 0.43 0.00 94.29 13:20:29 5 2.21 0.00 2.58 0.08 0.00 95.14 13:20:29 7 1.86 0.00 0.93 0.02 0.00 97.19 -13:20:39 all 2.66 23.20 2.27 0.17 0.00 71.70 +13:20:39 all 2.67 23.08 2.40 0.17 0.00 71.68 13:20:39 0 2.19 52.01 2.21 0.00 0.00 43.59 13:20:39 1 3.45 0.00 3.06 0.55 0.00 92.94 13:20:39 2 0.68 16.81 2.19 0.39 0.00 79.93 @@ -17,7 +17,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:39 4 3.11 31.18 2.95 0.00 0.00 62.76 13:20:39 5 3.92 0.00 3.03 0.03 0.00 93.02 13:20:39 7 3.23 0.00 1.61 0.36 0.00 94.79 -13:20:49 all 6.05 8.48 4.20 0.49 0.00 80.78 +13:20:39 8 5.26 0.00 26.97 0.00 0.00 67.76 +13:20:49 all 6.32 7.84 6.99 0.45 0.35 77.97 13:20:49 0 2.69 47.44 2.47 0.18 0.00 47.22 13:20:49 1 9.25 0.00 5.60 0.18 0.00 84.97 13:20:49 2 9.90 0.04 4.77 0.90 0.00 84.39 @@ -26,7 +27,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:49 5 7.62 0.00 4.74 0.14 0.00 87.51 13:20:49 6 3.69 0.01 3.23 0.51 0.00 92.56 13:20:49 7 7.81 0.00 5.24 0.32 0.00 86.63 -Average: all 3.51 13.20 2.85 0.31 0.00 80.13 +13:20:49 8 9.59 0.23 39.98 0.00 4.50 44.80 +Average: all 3.66 12.87 3.75 0.31 0.10 79.29 Average: 0 2.17 24.86 2.51 0.12 0.00 70.34 Average: 1 4.02 0.00 3.58 0.40 0.00 92.01 Average: 2 3.40 5.26 2.54 0.65 0.00 88.14 @@ -35,6 +37,7 @@ Average: 4 3.28 19.24 2.57 0.22 0.00 74.69 Average: 5 3.72 0.00 3.11 0.07 0.00 93.10 Average: 6 3.69 0.01 3.23 0.51 0.00 92.56 Average: 7 3.36 0.00 1.92 0.18 0.00 94.54 +Average: 8 9.31 0.21 39.15 0.00 4.21 46.27 13:20:09 proc/s cswch/s 13:20:29 4.20 57336.12 @@ -42,6 +45,6 @@ Average: 7 3.36 0.00 1.92 0.18 0.00 94.54 13:20:49 5.27 108286.78 Average: 4.23 68964.08 -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) 13:54:09 LINUX RESTART (10 CPU) diff --git a/tests/expected.sar-iface b/tests/expected.sar-iface index af753ec..63940d9 100644 --- a/tests/expected.sar-iface +++ b/tests/expected.sar-iface @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 IFACE rxpck/s txpck/s rxkB/s txkB/s rxcmp/s txcmp/s rxmcst/s %ifutil 13:20:19 lo 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 @@ -24,7 +24,7 @@ Average: enp6s0 0.00 0.00 0.00 0.00 0.00 0.0 Average: lo 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: enp6s0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) 13:54:09 LINUX RESTART (10 CPU) diff --git a/tests/expected.sar-jID b/tests/expected.sar-jID index 40f2c2e..ef1b0dd 100644 --- a/tests/expected.sar-jID +++ b/tests/expected.sar-jID @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 tps rkB/s wkB/s dkB/s areq-sz aqu-sz await %util DEV 13:20:19 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% ata-Hitachi_HDS723020BLA642_MN1240F33J1XND @@ -75,7 +75,7 @@ Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.0 Average: 0.38 17.0k 0.0k 0.0k 44.5k 0.02 62.51 0.0% wwn-0x5438850077615869953x Average: 1.08 39.9k 0.1k 0.0k 37.2k 0.03 21.82 0.1% sdg -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) 13:54:09 LINUX RESTART (10 CPU) diff --git a/tests/expected.sar-jSID b/tests/expected.sar-jSID index 44d86c0..7cee878 100644 --- a/tests/expected.sar-jSID +++ b/tests/expected.sar-jSID @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 tps rkB/s wkB/s dkB/s areq-sz aqu-sz await %util DEV 13:20:19 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 0x5000cca369f193ac @@ -75,7 +75,7 @@ Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.0 Average: 0.38 17.0k 0.0k 0.0k 44.5k 0.02 62.51 0.0% 0x600605b00a2bdf00242b28c10dcb1999 Average: 1.08 39.9k 0.1k 0.0k 37.2k 0.03 21.82 0.1% 0x600605b00a2bdf00000028c10dcb2000 -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) 13:54:09 LINUX RESTART (10 CPU) diff --git a/tests/expected.sar-jUUID b/tests/expected.sar-jUUID index 48c9e1a..4a26cc9 100644 --- a/tests/expected.sar-jUUID +++ b/tests/expected.sar-jUUID @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 tps rkB/s wkB/s dkB/s areq-sz aqu-sz await %util DEV 13:20:19 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% sda @@ -75,7 +75,7 @@ Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.0 Average: 0.38 17.0k 0.0k 0.0k 44.5k 0.02 62.51 0.0% sdf Average: 1.08 39.9k 0.1k 0.0k 37.2k 0.03 21.82 0.1% sdg -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) 13:54:09 LINUX RESTART (10 CPU) diff --git a/tests/expected.sar-m-freq b/tests/expected.sar-m-freq index 99ae977..e354bf1 100644 --- a/tests/expected.sar-m-freq +++ b/tests/expected.sar-m-freq @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 CPU wghMHz -13:20:10 all 1160.30 +13:20:10 all 1123.35 13:20:10 0 1200.33 13:20:10 1 872.73 13:20:10 2 1200.33 @@ -10,6 +10,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:10 5 1200.33 13:20:10 6 1200.33 13:20:10 7 1200.33 +13:20:10 8 0.00 13:20:11 all 2001.00 13:20:11 0 0.00 13:20:11 1 2001.00 @@ -19,7 +20,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:11 5 0.00 13:20:11 6 0.00 13:20:11 7 0.00 -Average: all 1337.29 +13:20:11 8 0.00 +Average: all 1329.85 Average: 0 1200.33 Average: 1 1639.51 Average: 2 1200.33 @@ -28,3 +30,4 @@ Average: 4 1200.33 Average: 5 1200.33 Average: 6 1200.33 Average: 7 1200.33 +Average: 8 0.00 diff --git a/tests/expected.sar-pretty b/tests/expected.sar-pretty index 7516235..a9c56f9 100644 --- a/tests/expected.sar-pretty +++ b/tests/expected.sar-pretty @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 tps rkB/s wkB/s dkB/s areq-sz aqu-sz await %util DEV 13:20:19 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 sda @@ -75,7 +75,7 @@ Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.0 Average: 0.38 16.97 0.00 0.00 44.51 0.02 62.51 0.03 sdf Average: 1.08 39.94 0.14 0.00 37.15 0.03 21.82 0.08 sdg -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) 13:54:09 LINUX RESTART (10 CPU) diff --git a/tests/expected.sar-qALL b/tests/expected.sar-qALL index 3e02763..59245bb 100644 --- a/tests/expected.sar-qALL +++ b/tests/expected.sar-qALL @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 runq-sz plist-sz ldavg-1 ldavg-5 ldavg-15 blocked 00:00:00 3 956 3.16 3.24 3.43 0 diff --git a/tests/expected.sar-qIO b/tests/expected.sar-qIO index d2057fc..16fba69 100644 --- a/tests/expected.sar-qIO +++ b/tests/expected.sar-qIO @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 %sio-10 %sio-60 %sio-300 %sio %fio-10 %fio-60 %fio-300 %fio 00:00:00 0.45 0.34 0.20 1.34 0.45 0.33 0.20 1.29 diff --git a/tests/expected.sar-qMEMIO b/tests/expected.sar-qMEMIO index b578cd8..efd640e 100644 --- a/tests/expected.sar-qMEMIO +++ b/tests/expected.sar-qMEMIO @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 %sio-10 %sio-60 %sio-300 %sio %fio-10 %fio-60 %fio-300 %fio 00:00:00 0.45 0.34 0.20 1.34 0.45 0.33 0.20 1.29 diff --git a/tests/expected.sar-qPSI b/tests/expected.sar-qPSI index 5d9adc2..fa02b5b 100644 --- a/tests/expected.sar-qPSI +++ b/tests/expected.sar-qPSI @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 %scpu-10 %scpu-60 %scpu-300 %scpu 00:00:00 0.00 0.00 0.00 0.02 diff --git a/tests/expected.sar-qu b/tests/expected.sar-qu index c00bc58..445583f 100644 --- a/tests/expected.sar-qu +++ b/tests/expected.sar-qu @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 CPU %user %nice %system %iowait %steal %idle -00:00:00 all 1.65 44.90 1.84 1.01 0.00 50.60 +00:00:00 all 1.49 39.91 1.67 0.94 0.00 56.00 00:00:00 runq-sz plist-sz ldavg-1 ldavg-5 ldavg-15 blocked 00:00:00 3 956 3.16 3.24 3.43 0 diff --git a/tests/expected.sar-se b/tests/expected.sar-se index 558d91f..8edf7a6 100644 --- a/tests/expected.sar-se +++ b/tests/expected.sar-se @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:29 CPU %user %nice %system %iowait %steal %idle 13:20:39 all 2.66 23.20 2.27 0.17 0.00 71.70 diff --git a/tests/expected.sar-sigint b/tests/expected.sar-sigint index cbb56d8..d0f3947 100644 --- a/tests/expected.sar-sigint +++ b/tests/expected.sar-sigint @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 05/02/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 05/02/19 _x86_64_ (9 CPU) 00:00:03 CPU MHz 00:00:04 all 3522.54 diff --git a/tests/expected.sar-u b/tests/expected.sar-u index 85d2a8b..9144ade 100644 --- a/tests/expected.sar-u +++ b/tests/expected.sar-u @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 CPU %user %nice %system %iowait %steal %idle 13:20:19 all 2.15 12.50 2.36 0.12 0.00 82.88 @@ -18,7 +18,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:29 4 3.44 0.00 2.64 0.84 0.00 93.08 13:20:29 5 2.76 0.00 2.37 0.16 0.00 94.71 13:20:29 7 0.83 0.00 0.99 0.00 0.00 98.17 -13:20:39 all 2.66 23.20 2.27 0.17 0.00 71.70 +13:20:39 all 2.67 23.08 2.40 0.17 0.00 71.68 13:20:39 0 2.19 52.01 2.21 0.00 0.00 43.59 13:20:39 1 3.45 0.00 3.06 0.55 0.00 92.94 13:20:39 2 0.68 16.81 2.19 0.39 0.00 79.93 @@ -26,7 +26,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:39 4 3.11 31.18 2.95 0.00 0.00 62.76 13:20:39 5 3.92 0.00 3.03 0.03 0.00 93.02 13:20:39 7 3.23 0.00 1.61 0.36 0.00 94.79 -13:20:49 all 6.53 9.63 4.42 0.54 0.00 78.89 +13:20:39 8 5.26 0.00 26.97 0.00 0.00 67.76 +13:20:49 all 6.80 8.80 7.53 0.49 0.39 75.90 13:20:49 0 2.69 47.44 2.47 0.18 0.00 47.22 13:20:49 1 9.25 0.00 5.60 0.18 0.00 84.97 13:20:49 2 9.90 0.04 4.77 0.90 0.00 84.39 @@ -35,7 +36,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:49 5 7.62 0.00 4.74 0.14 0.00 87.51 13:20:49 6 4.13 0.01 3.44 0.63 0.00 91.79 13:20:49 7 7.81 0.00 5.24 0.32 0.00 86.63 -Average: all 3.51 13.20 2.85 0.31 0.00 80.13 +13:20:49 8 9.59 0.23 39.98 0.00 4.50 44.80 +Average: all 3.66 12.87 3.75 0.31 0.10 79.29 Average: 0 2.17 24.86 2.51 0.12 0.00 70.34 Average: 1 4.02 0.00 3.58 0.40 0.00 92.01 Average: 2 3.40 5.26 2.54 0.65 0.00 88.14 @@ -44,6 +46,7 @@ Average: 4 3.28 19.24 2.57 0.22 0.00 74.69 Average: 5 3.72 0.00 3.11 0.07 0.00 93.10 Average: 6 3.69 0.01 3.23 0.51 0.00 92.56 Average: 7 3.36 0.00 1.92 0.18 0.00 94.54 +Average: 8 9.31 0.21 39.15 0.00 4.21 46.27 -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) 13:39:09 COM Testing sysstat! diff --git a/tests/expected.sar-z b/tests/expected.sar-z index 3303c5f..935d895 100644 --- a/tests/expected.sar-z +++ b/tests/expected.sar-z @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 tps rkB/s wkB/s dkB/s areq-sz aqu-sz await %util DEV diff --git a/tests/expected.sar1 b/tests/expected.sar1 index 1ae5d18..663191d 100644 --- a/tests/expected.sar1 +++ b/tests/expected.sar1 @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 CPU %user %nice %system %iowait %steal %idle 00:00:01 all 2.15 12.50 2.36 0.12 0.00 82.88 diff --git a/tests/expected.tapestat b/tests/expected.tapestat index 3ad842a..43f4a16 100644 --- a/tests/expected.tapestat +++ b/tests/expected.tapestat @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Tape: r/s w/s kB_read/s kB_wrtn/s %Rd %Wr %Oa Rs/s Ot/s st0 1 139 24 2673 0 4 6 1 0 diff --git a/tests/expected.tapestat-m b/tests/expected.tapestat-m index 854f61e..77fd0c4 100644 --- a/tests/expected.tapestat-m +++ b/tests/expected.tapestat-m @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Tape: r/s w/s MB_read/s MB_wrtn/s %Rd %Wr %Oa Rs/s Ot/s st0 1 139 0 2 0 4 6 1 0 diff --git a/tests/expected.tapestat-t b/tests/expected.tapestat-t index 57577b4..930158b 100644 --- a/tests/expected.tapestat-t +++ b/tests/expected.tapestat-t @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 01/01/70 00:00:02 Tape: r/s w/s kB_read/s kB_wrtn/s %Rd %Wr %Oa Rs/s Ot/s diff --git a/tests/expected.tapestat-y b/tests/expected.tapestat-y index ad6dbe0..60565f1 100644 --- a/tests/expected.tapestat-y +++ b/tests/expected.tapestat-y @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Tape: r/s w/s kB_read/s kB_wrtn/s %Rd %Wr %Oa Rs/s Ot/s st0 3 26 0.0k 0.0k 0% 0% 0% 6 0 diff --git a/tests/expected.tapestat-z b/tests/expected.tapestat-z index 4f1925a..22594ec 100644 --- a/tests/expected.tapestat-z +++ b/tests/expected.tapestat-z @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) Tape: r/s w/s kB_read/s kB_wrtn/s %Rd %Wr %Oa Rs/s Ot/s st0 1 139 24 2673 0 4 6 1 0 diff --git a/tests/expected0.sadf b/tests/expected0.sadf index 5b61efb..3388c69 100644 --- a/tests/expected0.sadf +++ b/tests/expected0.sadf @@ -1 +1 @@ -SYSSTAT.TEST -1 2019-04-18 13:20:09 UTC LINUX-RESTART (8 CPU) +SYSSTAT.TEST -1 2019-04-18 13:20:09 UTC LINUX-RESTART (9 CPU) diff --git a/tests/expected0.sadf-g b/tests/expected0.sadf-g index 6a27f9d..d12e89a 100644 --- a/tests/expected0.sadf-g +++ b/tests/expected0.sadf-g @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) No data! diff --git a/tests/expected0.sadf-x b/tests/expected0.sadf-x index bfe26fb..d280e64 100644 --- a/tests/expected0.sadf-x +++ b/tests/expected0.sadf-x @@ -10,14 +10,14 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> Linux 1.2.3-TEST x86_64 - 8 + 9 2019-04-18 13:20:09 GMT - + diff --git a/tests/expected0.sar-A b/tests/expected0.sar-A index fd362cc..7b19338 100644 --- a/tests/expected0.sar-A +++ b/tests/expected0.sar-A @@ -1,3 +1,3 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) -13:20:09 LINUX RESTART (8 CPU) +13:20:09 LINUX RESTART (9 CPU) diff --git a/tests/expected01.sadf-H b/tests/expected01.sadf-H index 7d0c485..271b492 100644 --- a/tests/expected01.sadf-H +++ b/tests/expected01.sadf-H @@ -1,7 +1,7 @@ System activity data file: tests/data0.tmp (0x2175) File created by sar/sadc from sysstat version 99.9.9 Genuine sa datafile: yes (0) -Host: Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Host: Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) File date: 2019-04-18 File time: 13:20:09 UTC (1555593609) Timezone: GMT diff --git a/tests/expected01.sadf-d b/tests/expected01.sadf-d index 9a605d5..fb7800f 100644 --- a/tests/expected01.sadf-d +++ b/tests/expected01.sadf-d @@ -1,3 +1,3 @@ -SYSSTAT.TEST;-1;2019-04-18 13:20:09 UTC;LINUX-RESTART (8 CPU) +SYSSTAT.TEST;-1;2019-04-18 13:20:09 UTC;LINUX-RESTART (9 CPU) SYSSTAT.TEST;-1;2019-04-18 13:20:30 UTC;LINUX-RESTART (10 CPU) # hostname;interval;timestamp;proc/s;cswch/s diff --git a/tests/expected01.sadf-g b/tests/expected01.sadf-g index a12ec79..f63df5a 100644 --- a/tests/expected01.sadf-g +++ b/tests/expected01.sadf-g @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) diff --git a/tests/expected01.sar-A b/tests/expected01.sar-A index d667c53..90161dc 100644 --- a/tests/expected01.sar-A +++ b/tests/expected01.sar-A @@ -1,5 +1,5 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) -13:20:09 LINUX RESTART (8 CPU) +13:20:09 LINUX RESTART (9 CPU) 13:20:30 LINUX RESTART (10 CPU) diff --git a/tests/expected1.pidstat b/tests/expected1.pidstat index a612d98..6376a8d 100644 --- a/tests/expected1.pidstat +++ b/tests/expected1.pidstat @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID %usr %system %guest %wait %CPU CPU Command 00:00:01 1000 7900 359.42 53.55 0.00 8.47 412.96 2 gnome-shell diff --git a/tests/expected1.pidstat-A-TCHILD b/tests/expected1.pidstat-A-TCHILD index aeeb19c..92b2642 100644 --- a/tests/expected1.pidstat-A-TCHILD +++ b/tests/expected1.pidstat-A-TCHILD @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID usr-ms system-ms guest-ms Command 00:00:02 1000 7900 112090 16710 0 gnome-shell diff --git a/tests/expected1.pidstat-A-TTASK b/tests/expected1.pidstat-A-TTASK index dde083e..ae579e7 100644 --- a/tests/expected1.pidstat-A-TTASK +++ b/tests/expected1.pidstat-A-TTASK @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID %usr %system %guest %wait %CPU CPU Command 00:00:02 1000 7900 359.42 53.55 0.00 8.47 412.96 2 gnome-shell diff --git a/tests/expected1.pidstat-At b/tests/expected1.pidstat-At index bb9efc2..a83950f 100644 --- a/tests/expected1.pidstat-At +++ b/tests/expected1.pidstat-At @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:02 1000 7900 - 359.42 53.55 0.00 8.47 412.96 2 gnome-shell diff --git a/tests/expected1.pidstat-At-TALL-ALL b/tests/expected1.pidstat-At-TALL-ALL index 2102cdb..c5aba88 100644 --- a/tests/expected1.pidstat-At-TALL-ALL +++ b/tests/expected1.pidstat-At-TALL-ALL @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:02 1000 7900 - 359.42 53.55 0.00 8.47 412.96 2 gnome-shell diff --git a/tests/expected1.pidstat-At-TCHILD b/tests/expected1.pidstat-At-TCHILD index 5c46319..946226f 100644 --- a/tests/expected1.pidstat-At-TCHILD +++ b/tests/expected1.pidstat-At-TCHILD @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID usr-ms system-ms guest-ms Command 00:00:02 1000 7900 - 112090 16710 0 gnome-shell diff --git a/tests/expected1.pidstat-At-TCHILD-ALL b/tests/expected1.pidstat-At-TCHILD-ALL index 19ac38d..1784678 100644 --- a/tests/expected1.pidstat-At-TCHILD-ALL +++ b/tests/expected1.pidstat-At-TCHILD-ALL @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID usr-ms system-ms guest-ms Command 00:00:02 1000 7900 - 112090 16710 0 gnome-shell diff --git a/tests/expected1.pidstat-At-TTASK b/tests/expected1.pidstat-At-TTASK index bb9efc2..a83950f 100644 --- a/tests/expected1.pidstat-At-TTASK +++ b/tests/expected1.pidstat-At-TTASK @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:02 1000 7900 - 359.42 53.55 0.00 8.47 412.96 2 gnome-shell diff --git a/tests/expected1.pidstat-At-TTASK-ALL b/tests/expected1.pidstat-At-TTASK-ALL index b15296a..ea077d5 100644 --- a/tests/expected1.pidstat-At-TTASK-ALL +++ b/tests/expected1.pidstat-At-TTASK-ALL @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:02 1000 7900 - 359.42 53.55 0.00 8.47 412.96 2 gnome-shell diff --git a/tests/expected1.pidstat-C b/tests/expected1.pidstat-C index 434022b..71c1120 100644 --- a/tests/expected1.pidstat-C +++ b/tests/expected1.pidstat-C @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID %usr %system %guest %wait %CPU CPU Command diff --git a/tests/expected1.pidstat-G b/tests/expected1.pidstat-G index 434022b..71c1120 100644 --- a/tests/expected1.pidstat-G +++ b/tests/expected1.pidstat-G @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID %usr %system %guest %wait %CPU CPU Command diff --git a/tests/expected1.pidstat-d-TTASK b/tests/expected1.pidstat-d-TTASK index 6cfef64..066ce8c 100644 --- a/tests/expected1.pidstat-d-TTASK +++ b/tests/expected1.pidstat-d-TTASK @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID kB_rd/s kB_wr/s kB_ccwr/s iodelay Command 00:00:01 1000 7900 411.81 2.82 0.00 253 gnome-shell diff --git a/tests/expected1.pidstat-p b/tests/expected1.pidstat-p index dbcaecf..9ea71d9 100644 --- a/tests/expected1.pidstat-p +++ b/tests/expected1.pidstat-p @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID %usr %system %guest %wait %CPU CPU Command 00:00:01 1000 7900 359.42 53.55 0.00 8.47 412.96 2 gnome-shell diff --git a/tests/expected1.sadf-g b/tests/expected1.sadf-g index 5b21276..c60efc4 100644 --- a/tests/expected1.sadf-g +++ b/tests/expected1.sadf-g @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) @@ -9,16 +9,18 @@ (Min, Max values) -MBfsfree (85582, 279700) -MBfsused (7774, 15464) +MBfsfree (11154, 85582) +MBfsused (7774, 18247) 0. - -90000. - -180000. - -270000. + +20000. + +40000. + +60000. + +80000. 13:20:09 @@ -42,16 +44,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/] (Min, Max values) -%ufsused (10.33, 13.45) -%fsused (5.24, 8.33) +%ufsused (13.45, 67.22) +%fsused (8.33, 62.06) 0. @@ -86,10 +88,10 @@ 13:54:29 UTC - + - + @@ -97,16 +99,16 @@ (Min, Max values) -Ifree/1000 (6008.41, 19201.59) -Iused/1000 (0.46, 102.82) +Ifree/1000 (1621.55, 6008.41) +Iused/1000 (102.82, 299.81) 0. - -6000. - -12000. - -18000. + +2000. + +4000. + +6000. 13:20:09 @@ -130,15 +132,15 @@ 13:54:29 UTC - - + + Filesystems statistics (4) [/] (Min, Max values) -%Iused (0.00, 1.68) +%Iused (1.68, 15.60) 0. @@ -173,7 +175,7 @@ 13:54:29 UTC - + @@ -183,8 +185,8 @@ (Min, Max values) -MBfsfree (85582, 279700) -MBfsused (7774, 15464) +MBfsfree (279061, 279700) +MBfsused (15464, 16103) 0. @@ -216,16 +218,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/opt] (Min, Max values) -%ufsused (10.33, 13.45) -%fsused (5.24, 8.33) +%ufsused (10.33, 10.54) +%fsused (5.24, 5.46) 0. @@ -260,10 +262,10 @@ 13:54:29 UTC - + - + @@ -271,8 +273,8 @@ (Min, Max values) -Ifree/1000 (6008.41, 19201.59) -Iused/1000 (0.46, 102.82) +Ifree/1000 (19051.71, 19201.59) +Iused/1000 (0.46, 150.34) 0. @@ -304,15 +306,15 @@ 13:54:29 UTC - - + + Filesystems statistics (4) [/opt] (Min, Max values) -%Iused (0.00, 1.68) +%Iused (0.00, 0.78) 0. @@ -347,7 +349,7 @@ 13:54:29 UTC - + @@ -357,16 +359,18 @@ (Min, Max values) -MBfsfree (85582, 279700) -MBfsused (7774, 15464) +MBfsfree (11154, 85582) +MBfsused (7774, 18247) 0. - -90000. - -180000. - -270000. + +20000. + +40000. + +60000. + +80000. 13:20:09 @@ -390,16 +394,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/home] (Min, Max values) -%ufsused (10.33, 13.45) -%fsused (5.24, 8.33) +%ufsused (13.45, 67.22) +%fsused (8.33, 62.06) 0. @@ -434,10 +438,10 @@ 13:54:29 UTC - + - + @@ -445,16 +449,16 @@ (Min, Max values) -Ifree/1000 (6008.41, 19201.59) -Iused/1000 (0.46, 102.82) +Ifree/1000 (1621.55, 6008.41) +Iused/1000 (102.82, 299.81) 0. - -6000. - -12000. - -18000. + +2000. + +4000. + +6000. 13:20:09 @@ -478,15 +482,15 @@ 13:54:29 UTC - - + + Filesystems statistics (4) [/home] (Min, Max values) -%Iused (0.00, 1.68) +%Iused (1.68, 15.60) 0. @@ -521,7 +525,7 @@ 13:54:29 UTC - + @@ -531,8 +535,8 @@ (Min, Max values) -MBfsfree (85582, 279700) -MBfsused (7774, 15464) +MBfsfree (279061, 279700) +MBfsused (15464, 16103) 0. @@ -564,16 +568,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/data] (Min, Max values) -%ufsused (10.33, 13.45) -%fsused (5.24, 8.33) +%ufsused (10.33, 10.54) +%fsused (5.24, 5.46) 0. @@ -608,10 +612,10 @@ 13:54:29 UTC - + - + @@ -619,8 +623,8 @@ (Min, Max values) -Ifree/1000 (6008.41, 19201.59) -Iused/1000 (0.46, 102.82) +Ifree/1000 (19051.71, 19201.59) +Iused/1000 (0.46, 150.34) 0. @@ -652,15 +656,15 @@ 13:54:29 UTC - - + + Filesystems statistics (4) [/data] (Min, Max values) -%Iused (0.00, 1.68) +%Iused (0.00, 0.78) 0. @@ -695,7 +699,7 @@ 13:54:29 UTC - + @@ -705,16 +709,16 @@ (Min, Max values) -MBfsfree (279700, 279700) -MBfsused (15464, 15464) +MBfsfree (11154, 11154) +MBfsused (18247, 18247) 0. - -90000. - -180000. - -270000. + +6000. + +12000. + +18000. 13:20:09 @@ -738,16 +742,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/foo] (Min, Max values) -%ufsused (10.33, 10.33) -%fsused (5.24, 5.24) +%ufsused (67.22, 67.22) +%fsused (62.06, 62.06) 0. @@ -782,10 +786,10 @@ 13:54:29 UTC - + - + @@ -793,16 +797,16 @@ (Min, Max values) -Ifree/1000 (19201.59, 19201.59) -Iused/1000 (0.46, 0.46) +Ifree/1000 (1621.55, 1621.55) +Iused/1000 (299.81, 299.81) 0. - -6000. - -12000. - -18000. + +500. + +1000. + +1500. 13:20:09 @@ -826,15 +830,15 @@ 13:54:29 UTC - - + + Filesystems statistics (4) [/foo] (Min, Max values) -%Iused (0.00, 0.00) +%Iused (15.60, 15.60) 0. @@ -869,7 +873,7 @@ 13:54:29 UTC - + @@ -879,18 +883,16 @@ (Min, Max values) -MBfsfree (85582, 85582) -MBfsused (7774, 7774) +MBfsfree (279061, 279061) +MBfsused (16103, 16103) 0. - -20000. - -40000. - -60000. - -80000. + +90000. + +180000. + +270000. 13:20:09 @@ -914,16 +916,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/bar] (Min, Max values) -%ufsused (13.45, 13.45) -%fsused (8.33, 8.33) +%ufsused (10.54, 10.54) +%fsused (5.46, 5.46) 0. @@ -958,10 +960,10 @@ 13:54:29 UTC - + - + @@ -969,16 +971,16 @@ (Min, Max values) -Ifree/1000 (6008.41, 6008.41) -Iused/1000 (102.82, 102.82) +Ifree/1000 (19051.71, 19051.71) +Iused/1000 (150.34, 150.34) 0. - -2000. - -4000. - -6000. + +6000. + +12000. + +18000. 13:20:09 @@ -1002,15 +1004,15 @@ 13:54:29 UTC - - + + Filesystems statistics (4) [/bar] (Min, Max values) -%Iused (1.68, 1.68) +%Iused (0.78, 0.78) 0. @@ -1045,7 +1047,7 @@ 13:54:29 UTC - + diff --git a/tests/expected2.iostat+f-alt-list-ms b/tests/expected2.iostat+f-alt-list-ms index 10e068a..49ccb27 100644 --- a/tests/expected2.iostat+f-alt-list-ms +++ b/tests/expected2.iostat+f-alt-list-ms @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda1 0.01 0.29 0.00 0.00 2108 0 0 diff --git a/tests/expected2.iostat-f-alt-list-ms b/tests/expected2.iostat-f-alt-list-ms index 92fe8f1..8cdc9f5 100644 --- a/tests/expected2.iostat-f-alt-list-ms +++ b/tests/expected2.iostat-f-alt-list-ms @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda13 0.03 0.69 0.00 0.00 4937 17 0 diff --git a/tests/expected2.iostat-gpALL b/tests/expected2.iostat-gpALL index 4c82b40..8b3f520 100644 --- a/tests/expected2.iostat-gpALL +++ b/tests/expected2.iostat-gpALL @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda9 6.60 193.17 19.89 0.00 1389369 143040 0 diff --git a/tests/expected2.pidstat-C b/tests/expected2.pidstat-C index b5aca1a..54fcc69 100644 --- a/tests/expected2.pidstat-C +++ b/tests/expected2.pidstat-C @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID %usr %system %guest %wait %CPU CPU Command diff --git a/tests/expected2.pidstat-G b/tests/expected2.pidstat-G index 37d5962..b8e22b3 100644 --- a/tests/expected2.pidstat-G +++ b/tests/expected2.pidstat-G @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command diff --git a/tests/expected2.pidstat-p-unkwn b/tests/expected2.pidstat-p-unkwn index b61c5d7..913fd32 100644 --- a/tests/expected2.pidstat-p-unkwn +++ b/tests/expected2.pidstat-p-unkwn @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID StkSize StkRef Command 00:00:01 1000 8741 132 52 firefox diff --git a/tests/expected2.sadf-g b/tests/expected2.sadf-g index 5c7baf3..eefba0f 100644 --- a/tests/expected2.sadf-g +++ b/tests/expected2.sadf-g @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) CPU utilization @@ -79,16 +79,16 @@ (Min, Max values) -%usr (2.15, 6.53) -%nice (0.00, 23.20) -%sys (1.55, 3.44) +%usr (2.15, 6.21) +%nice (0.00, 23.08) +%sys (1.55, 6.64) %iowait (0.12, 0.77) -%steal (0.00, 0.00) +%steal (0.00, 0.39) %irq (0.19, 0.96) -%soft (0.19, 0.38) -%guest (0.00, 0.00) -%gnice (0.00, 0.00) -%idle (71.70, 95.31) +%soft (0.19, 0.34) +%guest (0.00, 0.59) +%gnice (0.00, 0.10) +%idle (71.68, 95.31) SYSSTAT.TEST 04/18/19 @@ -129,25 +129,34 @@ 0:00 - + - + - + - + + + + - + - + + + + + + + - + @@ -772,16 +781,16 @@ (Min, Max values) -%usr (4.15, 4.15) -%nice (41.49, 41.49) -%sys (4.15, 4.15) -%iowait (4.15, 4.15) -%steal (0.00, 0.00) -%irq (4.15, 4.15) -%soft (0.41, 0.41) -%guest (0.00, 0.00) -%gnice (0.00, 0.00) -%idle (41.49, 41.49) +%usr (2.84, 5.26) +%nice (0.00, 41.49) +%sys (4.15, 39.98) +%iowait (0.00, 4.15) +%steal (0.00, 4.50) +%irq (0.00, 4.15) +%soft (0.00, 16.45) +%guest (0.00, 6.75) +%gnice (0.00, 1.13) +%idle (41.49, 67.76) SYSSTAT.TEST 04/18/19 @@ -822,25 +831,34 @@ 0:00 - + - + + + + - + + + + + + + - + @@ -4567,24 +4585,27 @@ - + -CPU clock frequency [all] +Software-based network processing statistics (1) [all] (Min, Max values) -MHz (3517.54, 3522.54) +total/s (0.00, 4.29) +dropd/s (0.00, 0.00) SYSSTAT.TEST 04/18/19 0. - -1000. - -2000. - -3000. + +1. + +2. + +3. + +4. 0:00 @@ -4611,27 +4632,28 @@ 22:00 0:00 - + + - - - -CPU clock frequency [0] -(Min, Max values) + +Software-based network processing statistics (2) [all] +(Min, Max values) - -MHz (3566.48, 3566.48) -SYSSTAT.TEST -04/18/19 + +squeezd/s (0.00, 394.13) +rx_rps/s (0.00, 0.00) +flw_lim/s (0.00, 0.00) +SYSSTAT.TEST +04/18/19 - + 0. - -1000. - -2000. - -3000. + +100. + +200. + +300. 0:00 @@ -4658,27 +4680,33 @@ 22:00 0:00 - + + + - + -CPU clock frequency [1] +Software-based network processing statistics (2) [1] (Min, Max values) -MHz (3566.39, 3566.39) +squeezd/s (0.00, 8.76) +rx_rps/s (0.00, 0.00) +flw_lim/s (0.00, 0.00) SYSSTAT.TEST 04/18/19 0. - -1000. - -2000. - -3000. + +2. + +4. + +6. + +8. 0:00 @@ -4705,27 +4733,31 @@ 22:00 0:00 - + + + - + -CPU clock frequency [2] +Software-based network processing statistics (2) [2] (Min, Max values) -MHz (3492.11, 3492.11) +squeezd/s (0.00, 17.52) +rx_rps/s (0.00, 0.00) +flw_lim/s (0.00, 0.00) SYSSTAT.TEST 04/18/19 0. - -1000. - -2000. - -3000. + +5. + +10. + +15. 0:00 @@ -4752,27 +4784,31 @@ 22:00 0:00 - + + + - + -CPU clock frequency [3] +Software-based network processing statistics (2) [3] (Min, Max values) -MHz (3566.22, 3566.22) +squeezd/s (0.00, 26.28) +rx_rps/s (0.00, 0.00) +flw_lim/s (0.00, 0.00) SYSSTAT.TEST 04/18/19 0. - -1000. - -2000. - -3000. + +8. + +16. + +24. 0:00 @@ -4799,27 +4835,31 @@ 22:00 0:00 - + + + - + -CPU clock frequency [4] +Software-based network processing statistics (2) [4] (Min, Max values) -MHz (3505.84, 3505.84) +squeezd/s (0.00, 35.03) +rx_rps/s (0.00, 0.00) +flw_lim/s (0.00, 0.00) SYSSTAT.TEST 04/18/19 0. - -1000. - -2000. - -3000. + +10. + +20. + +30. 0:00 @@ -4846,27 +4886,33 @@ 22:00 0:00 - + + + - + -CPU clock frequency [5] +Software-based network processing statistics (2) [5] (Min, Max values) -MHz (3493.55, 3493.55) +squeezd/s (0.00, 43.79) +rx_rps/s (0.00, 0.00) +flw_lim/s (0.00, 0.00) SYSSTAT.TEST 04/18/19 0. - -1000. - -2000. - -3000. + +10. + +20. + +30. + +40. 0:00 @@ -4893,27 +4939,35 @@ 22:00 0:00 - + + + - + -CPU clock frequency [6] +Software-based network processing statistics (2) [6] (Min, Max values) -MHz (3492.22, 3492.22) +squeezd/s (0.00, 52.55) +rx_rps/s (0.00, 0.00) +flw_lim/s (0.00, 0.00) SYSSTAT.TEST 04/18/19 0. - -1000. - -2000. - -3000. + +10. + +20. + +30. + +40. + +50. 0:00 @@ -4940,27 +4994,31 @@ 22:00 0:00 - + + + - + -CPU clock frequency [7] +Software-based network processing statistics (2) [7] (Min, Max values) -MHz (3497.56, 3497.56) +squeezd/s (0.00, 61.31) +rx_rps/s (0.00, 0.00) +flw_lim/s (0.00, 0.00) SYSSTAT.TEST 04/18/19 0. - -1000. - -2000. - -3000. + +20. + +40. + +60. 0:00 @@ -4987,27 +5045,32 @@ 22:00 0:00 - + + + - + -CPU clock frequency [8] +Software-based network processing statistics (1) [8] (Min, Max values) -MHz (3497.56, 3497.56) +total/s (0.00, 4.29) +dropd/s (0.00, 0.00) SYSSTAT.TEST 04/18/19 0. - -1000. - -2000. - -3000. + +1. + +2. + +3. + +4. 0:00 @@ -5034,27 +5097,28 @@ 22:00 0:00 - + + - - - -CPU clock frequency [9] -(Min, Max values) + +Software-based network processing statistics (2) [8] +(Min, Max values) - -MHz (3497.56, 3497.56) -SYSSTAT.TEST -04/18/19 + +squeezd/s (0.00, 70.07) +rx_rps/s (0.00, 0.00) +flw_lim/s (0.00, 0.00) +SYSSTAT.TEST +04/18/19 - + 0. - -1000. - -2000. - -3000. + +20. + +40. + +60. 0:00 @@ -5081,28 +5145,31 @@ 22:00 0:00 - + + + - + -Filesystems statistics (1) [/dev/sda9] +Software-based network processing statistics (2) [9] (Min, Max values) -MBfsfree (85582, 279700) -MBfsused x10 (77742, 154645) +squeezd/s (78.83, 78.83) +rx_rps/s (0.00, 0.00) +flw_lim/s (0.00, 0.00) SYSSTAT.TEST 04/18/19 0. - -90000. - -180000. - -270000. + +20. + +40. + +60. 0:00 @@ -5129,29 +5196,29 @@ 22:00 0:00 - - + + + - -Filesystems statistics (2) [/dev/sda9] -(Min, Max values) + + + +CPU clock frequency [all] +(Min, Max values) - -%ufsused (10.33, 13.45) -%fsused (5.24, 8.33) -SYSSTAT.TEST -04/18/19 + +MHz (3517.54, 3522.54) +SYSSTAT.TEST +04/18/19 - + 0. - -25. - -50. - -75. - -100. + +1000. + +2000. + +3000. 0:00 @@ -5178,31 +5245,27 @@ 22:00 0:00 - - - - - + - -Filesystems statistics (3) [/dev/sda9] -(Min, Max values) + + +CPU clock frequency [0] +(Min, Max values) - -Ifree/1000 (6008.41, 19201.59) -Iused/1000 x100 (45.50, 10281.80) -SYSSTAT.TEST -04/18/19 + +MHz (3566.48, 3566.48) +SYSSTAT.TEST +04/18/19 - + 0. - -6000. - -12000. - -18000. + +1000. + +2000. + +3000. 0:00 @@ -5229,28 +5292,27 @@ 22:00 0:00 - - + - -Filesystems statistics (4) [/dev/sda9] -(Min, Max values) + + + +CPU clock frequency [1] +(Min, Max values) - -%Iused (0.00, 1.68) -SYSSTAT.TEST -04/18/19 + +MHz (3566.39, 3566.39) +SYSSTAT.TEST +04/18/19 - + 0. - -25. - -50. - -75. - -100. + +1000. + +2000. + +3000. 0:00 @@ -5277,25 +5339,599 @@ 22:00 0:00 - - - + - + -Filesystems statistics (1) [/dev/sda7] +CPU clock frequency [2] (Min, Max values) -MBfsfree (85582, 279700) -MBfsused x10 (77742, 154645) +MHz (3492.11, 3492.11) SYSSTAT.TEST 04/18/19 0. - + +1000. + +2000. + +3000. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +CPU clock frequency [3] +(Min, Max values) + + +MHz (3566.22, 3566.22) +SYSSTAT.TEST +04/18/19 + + +0. + +1000. + +2000. + +3000. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +CPU clock frequency [4] +(Min, Max values) + + +MHz (3505.84, 3505.84) +SYSSTAT.TEST +04/18/19 + + +0. + +1000. + +2000. + +3000. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +CPU clock frequency [5] +(Min, Max values) + + +MHz (3493.55, 3493.55) +SYSSTAT.TEST +04/18/19 + + +0. + +1000. + +2000. + +3000. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +CPU clock frequency [6] +(Min, Max values) + + +MHz (3492.22, 3492.22) +SYSSTAT.TEST +04/18/19 + + +0. + +1000. + +2000. + +3000. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +CPU clock frequency [7] +(Min, Max values) + + +MHz (3497.56, 3497.56) +SYSSTAT.TEST +04/18/19 + + +0. + +1000. + +2000. + +3000. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +CPU clock frequency [8] +(Min, Max values) + + +MHz (3497.56, 3497.56) +SYSSTAT.TEST +04/18/19 + + +0. + +1000. + +2000. + +3000. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +CPU clock frequency [9] +(Min, Max values) + + +MHz (3497.56, 3497.56) +SYSSTAT.TEST +04/18/19 + + +0. + +1000. + +2000. + +3000. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +Filesystems statistics (1) [/dev/sda9] +(Min, Max values) + + +MBfsfree (11154, 85582) +MBfsused (7774, 18247) +SYSSTAT.TEST +04/18/19 + + +0. + +20000. + +40000. + +60000. + +80000. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + +Filesystems statistics (2) [/dev/sda9] +(Min, Max values) + + +%ufsused (13.45, 67.22) +%fsused (8.33, 62.06) +SYSSTAT.TEST +04/18/19 + + +0. + +25. + +50. + +75. + +100. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + + + + +Filesystems statistics (3) [/dev/sda9] +(Min, Max values) + + +Ifree/1000 (1621.55, 6008.41) +Iused/1000 x10 (1028.18, 2998.10) +SYSSTAT.TEST +04/18/19 + + +0. + +2000. + +4000. + +6000. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + +Filesystems statistics (4) [/dev/sda9] +(Min, Max values) + + +%Iused (1.68, 15.60) +SYSSTAT.TEST +04/18/19 + + +0. + +25. + +50. + +75. + +100. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + + + +Filesystems statistics (1) [/dev/sda7] +(Min, Max values) + + +MBfsfree (279061, 279700) +MBfsused x10 (154645, 161034) +SYSSTAT.TEST +04/18/19 + + +0. + 90000. 180000. @@ -5327,16 +5963,16 @@ 22:00 0:00 - - + + Filesystems statistics (2) [/dev/sda7] (Min, Max values) -%ufsused (10.33, 13.45) -%fsused (5.24, 8.33) +%ufsused (10.33, 10.54) +%fsused (5.24, 5.46) SYSSTAT.TEST 04/18/19 @@ -5377,10 +6013,10 @@ 0:00 - + - + @@ -5388,8 +6024,8 @@ (Min, Max values) -Ifree/1000 (6008.41, 19201.59) -Iused/1000 x100 (45.50, 10281.80) +Ifree/1000 (19051.71, 19201.59) +Iused/1000 x100 (45.50, 15033.80) SYSSTAT.TEST 04/18/19 @@ -5427,15 +6063,15 @@ 22:00 0:00 - - + + Filesystems statistics (4) [/dev/sda7] (Min, Max values) -%Iused (0.00, 1.68) +%Iused (0.00, 0.78) SYSSTAT.TEST 04/18/19 @@ -5476,29 +6112,31 @@ 0:00 - + - + Filesystems statistics (1) [/dev/sda12] (Min, Max values) -MBfsfree (85582, 279700) -MBfsused x10 (77742, 154645) +MBfsfree (11154, 85582) +MBfsused (7774, 18247) SYSSTAT.TEST 04/18/19 0. - -90000. - -180000. - -270000. + +20000. + +40000. + +60000. + +80000. 0:00 @@ -5525,16 +6163,16 @@ 22:00 0:00 - - + + Filesystems statistics (2) [/dev/sda12] (Min, Max values) -%ufsused (10.33, 13.45) -%fsused (5.24, 8.33) +%ufsused (13.45, 67.22) +%fsused (8.33, 62.06) SYSSTAT.TEST 04/18/19 @@ -5575,10 +6213,10 @@ 0:00 - + - + @@ -5586,19 +6224,19 @@ (Min, Max values) -Ifree/1000 (6008.41, 19201.59) -Iused/1000 x100 (45.50, 10281.80) +Ifree/1000 (1621.55, 6008.41) +Iused/1000 x10 (1028.18, 2998.10) SYSSTAT.TEST 04/18/19 0. - -6000. - -12000. - -18000. + +2000. + +4000. + +6000. 0:00 @@ -5625,15 +6263,15 @@ 22:00 0:00 - - + + Filesystems statistics (4) [/dev/sda12] (Min, Max values) -%Iused (0.00, 1.68) +%Iused (1.68, 15.60) SYSSTAT.TEST 04/18/19 @@ -5674,18 +6312,18 @@ 0:00 - + - + Filesystems statistics (1) [/dev/sda6] (Min, Max values) -MBfsfree (85582, 279700) -MBfsused x10 (77742, 154645) +MBfsfree (279061, 279700) +MBfsused x10 (154645, 161034) SYSSTAT.TEST 04/18/19 @@ -5723,16 +6361,16 @@ 22:00 0:00 - - + + Filesystems statistics (2) [/dev/sda6] (Min, Max values) -%ufsused (10.33, 13.45) -%fsused (5.24, 8.33) +%ufsused (10.33, 10.54) +%fsused (5.24, 5.46) SYSSTAT.TEST 04/18/19 @@ -5773,10 +6411,10 @@ 0:00 - + - + @@ -5784,8 +6422,8 @@ (Min, Max values) -Ifree/1000 (6008.41, 19201.59) -Iused/1000 x100 (45.50, 10281.80) +Ifree/1000 (19051.71, 19201.59) +Iused/1000 x100 (45.50, 15033.80) SYSSTAT.TEST 04/18/19 @@ -5823,15 +6461,15 @@ 22:00 0:00 - - + + Filesystems statistics (4) [/dev/sda6] (Min, Max values) -%Iused (0.00, 1.68) +%Iused (0.00, 0.78) SYSSTAT.TEST 04/18/19 @@ -5872,29 +6510,29 @@ 0:00 - + - + Filesystems statistics (1) [/dev/sdf] (Min, Max values) -MBfsfree (279700, 279700) -MBfsused x10 (154645, 154645) +MBfsfree (11154, 11154) +MBfsused (18247, 18247) SYSSTAT.TEST 04/18/19 0. - -90000. - -180000. - -270000. + +6000. + +12000. + +18000. 0:00 @@ -5921,16 +6559,16 @@ 22:00 0:00 - - + + Filesystems statistics (2) [/dev/sdf] (Min, Max values) -%ufsused (10.33, 10.33) -%fsused (5.24, 5.24) +%ufsused (67.22, 67.22) +%fsused (62.06, 62.06) SYSSTAT.TEST 04/18/19 @@ -5971,10 +6609,10 @@ 0:00 - + - + @@ -5982,19 +6620,67 @@ (Min, Max values) -Ifree/1000 (19201.59, 19201.59) -Iused/1000 x10000 (4550.00, 4550.00) +Ifree/1000 (1621.55, 1621.55) +Iused/1000 (299.81, 299.81) SYSSTAT.TEST 04/18/19 0. - -6000. - -12000. - -18000. + +500. + +1000. + +1500. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + +Filesystems statistics (4) [/dev/sdf] +(Min, Max values) + + +%Iused (15.60, 15.60) +SYSSTAT.TEST +04/18/19 + + +0. + +25. + +50. + +75. + +100. 0:00 @@ -6021,31 +6707,30 @@ 22:00 0:00 - - + + - + + Filesystems statistics (1) [/dev/sdg] (Min, Max values) -MBfsfree (85582, 85582) -MBfsused x10 (77742, 77742) +MBfsfree (279061, 279061) +MBfsused x10 (161034, 161034) SYSSTAT.TEST 04/18/19 0. - -20000. - -40000. - -60000. - -80000. + +90000. + +180000. + +270000. 0:00 @@ -6072,16 +6757,16 @@ 22:00 0:00 - - + + Filesystems statistics (2) [/dev/sdg] (Min, Max values) -%ufsused (13.45, 13.45) -%fsused (8.33, 8.33) +%ufsused (10.54, 10.54) +%fsused (5.46, 5.46) SYSSTAT.TEST 04/18/19 @@ -6122,10 +6807,10 @@ 0:00 - + - + @@ -6133,19 +6818,19 @@ (Min, Max values) -Ifree/1000 (6008.41, 6008.41) -Iused/1000 x10 (1028.18, 1028.18) +Ifree/1000 (19051.71, 19051.71) +Iused/1000 x100 (15033.80, 15033.80) SYSSTAT.TEST 04/18/19 0. - -2000. - -4000. - -6000. + +6000. + +12000. + +18000. 0:00 @@ -6172,15 +6857,15 @@ 22:00 0:00 - - + + Filesystems statistics (4) [/dev/sdg] (Min, Max values) -%Iused (1.68, 1.68) +%Iused (0.78, 0.78) SYSSTAT.TEST 04/18/19 @@ -6221,11 +6906,11 @@ 0:00 - + - + CPU stall time (some tasks) (Min, Max values) @@ -6276,7 +6961,7 @@ - + I/O pressure trends (some tasks) (Min, Max values) @@ -6474,7 +7159,7 @@ - + Memory pressure trends (some tasks) (Min, Max values) @@ -6623,5 +7308,5 @@ - + diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all index cdb564c..0ff9873 100644 --- a/tests/expected2.sar-all +++ b/tests/expected2.sar-all @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 CPU %usr %nice %sys %iowait %steal %irq %soft %guest %gnice %idle 13:20:19 all 2.15 12.50 1.84 0.12 0.00 0.34 0.19 0.00 0.00 82.88 @@ -18,7 +18,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:29 4 3.44 0.00 2.16 0.84 0.00 0.32 0.16 0.00 0.00 93.08 13:20:29 5 2.76 0.00 2.08 0.16 0.00 0.19 0.10 0.00 0.00 94.71 13:20:29 7 0.83 0.00 0.83 0.00 0.00 0.10 0.06 0.00 0.00 98.17 -13:20:39 all 2.66 23.20 1.74 0.17 0.00 0.33 0.20 0.00 0.00 71.70 +13:20:39 all 2.67 23.08 1.79 0.17 0.00 0.33 0.28 0.00 0.00 71.68 13:20:39 0 2.19 52.01 1.46 0.00 0.00 0.36 0.39 0.00 0.00 43.59 13:20:39 1 3.45 0.00 2.33 0.55 0.00 0.34 0.39 0.00 0.00 92.94 13:20:39 2 0.68 16.81 1.77 0.39 0.00 0.34 0.08 0.00 0.00 79.93 @@ -26,7 +26,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:39 4 3.11 31.18 2.27 0.00 0.00 0.50 0.18 0.00 0.00 62.76 13:20:39 5 3.92 0.00 2.56 0.03 0.00 0.37 0.10 0.00 0.00 93.02 13:20:39 7 3.23 0.00 1.35 0.36 0.00 0.13 0.13 0.00 0.00 94.79 -13:20:49 all 6.53 9.63 3.44 0.54 0.00 0.60 0.38 0.00 0.00 78.89 +13:20:39 8 5.26 0.00 10.53 0.00 0.00 0.00 16.45 0.00 0.00 67.76 +13:20:49 all 6.21 8.70 6.64 0.49 0.39 0.54 0.34 0.59 0.10 75.90 13:20:49 0 2.69 47.44 1.26 0.18 0.00 0.36 0.85 0.00 0.00 47.22 13:20:49 1 9.25 0.00 4.06 0.18 0.00 0.59 0.95 0.00 0.00 84.97 13:20:49 2 9.90 0.04 3.78 0.90 0.00 0.49 0.49 0.00 0.00 84.39 @@ -35,7 +36,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:49 5 7.62 0.00 4.01 0.14 0.00 0.50 0.23 0.00 0.00 87.51 13:20:49 6 4.13 0.01 2.72 0.63 0.00 0.59 0.13 0.00 0.00 91.79 13:20:49 7 7.81 0.00 4.38 0.32 0.00 0.63 0.23 0.00 0.00 86.63 -Average: all 3.51 13.20 2.22 0.31 0.00 0.38 0.25 0.00 0.00 80.13 +13:20:49 8 2.84 0.00 39.98 0.00 4.50 0.00 0.00 6.75 1.13 44.80 +Average: all 3.50 12.85 3.11 0.31 0.10 0.37 0.27 0.16 0.03 79.29 Average: 0 2.17 24.86 1.61 0.12 0.00 0.31 0.59 0.00 0.00 70.34 Average: 1 4.02 0.00 2.78 0.40 0.00 0.41 0.38 0.00 0.00 92.01 Average: 2 3.40 5.26 2.06 0.65 0.00 0.31 0.17 0.00 0.00 88.14 @@ -44,6 +46,7 @@ Average: 4 3.28 19.24 1.99 0.22 0.00 0.39 Average: 5 3.72 0.00 2.64 0.07 0.00 0.34 0.12 0.00 0.00 93.10 Average: 6 3.69 0.01 2.54 0.51 0.00 0.56 0.12 0.00 0.00 92.56 Average: 7 3.36 0.00 1.61 0.18 0.00 0.20 0.11 0.00 0.00 94.54 +Average: 8 2.99 0.00 38.10 0.00 4.21 0.00 1.05 6.32 1.05 46.27 13:20:09 proc/s cswch/s 13:20:19 3.56 68409.30 @@ -2854,7 +2857,8 @@ Average: 0.13 0.04 0.03 0.02 host1 13:20:39 4 0.00 0.00 0.00 0.00 0.00 13:20:39 5 0.00 0.00 0.00 0.00 0.00 13:20:39 7 0.00 0.00 0.00 0.00 0.00 -13:20:49 all 0.00 0.00 0.00 0.00 0.00 +13:20:39 8 0.00 0.00 0.00 0.00 0.00 +13:20:49 all 4.29 0.00 0.00 0.00 0.00 13:20:49 0 0.00 0.00 0.00 0.00 0.00 13:20:49 1 0.00 0.00 0.00 0.00 0.00 13:20:49 2 0.00 0.00 0.00 0.00 0.00 @@ -2863,7 +2867,8 @@ Average: 0.13 0.04 0.03 0.02 host1 13:20:49 5 0.00 0.00 0.00 0.00 0.00 13:20:49 6 0.00 0.00 0.00 0.00 0.00 13:20:49 7 0.00 0.00 0.00 0.00 0.00 -Average: all 0.00 0.00 0.00 0.00 0.00 +13:20:49 8 4.29 0.00 0.00 0.00 0.00 +Average: all 0.78 0.00 0.00 0.00 0.00 Average: 0 0.00 0.00 0.00 0.00 0.00 Average: 1 0.00 0.00 0.00 0.00 0.00 Average: 2 0.00 0.00 0.00 0.00 0.00 @@ -2872,6 +2877,7 @@ Average: 4 0.00 0.00 0.00 0.00 0.00 Average: 5 0.00 0.00 0.00 0.00 0.00 Average: 6 0.00 0.00 0.00 0.00 0.00 Average: 7 0.00 0.00 0.00 0.00 0.00 +Average: 8 0.78 0.00 0.00 0.00 0.00 13:20:09 CPU MHz 13:20:19 all 3522.54 @@ -2922,31 +2928,31 @@ Average: 7 3497.56 13:20:09 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM 13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -13:20:19 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 +13:20:19 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 13:20:19 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda9 -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda7 -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda12 -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda6 -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sdf -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sdg -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda9 -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda7 -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda12 -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda6 -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sdf -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sdg +13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda9 +13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 +13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 +13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf +13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg +13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda9 +13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 +13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 +13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf +13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg 13:20:49 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 13:20:49 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -13:20:49 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:20:49 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:20:49 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 +13:20:49 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sdf -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sdg +Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 +Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 +Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf +Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg 13:20:09 %scpu-10 %scpu-60 %scpu-300 %scpu 13:20:19 0.00 0.00 0.00 0.03 @@ -2969,7 +2975,7 @@ Average: 0.80 0.34 0.25 1.12 0.80 0.34 0.2 13:20:49 23.00 3.00 0.36 0.21 0.00 0.00 0.00 0.15 Average: 36.74 22.22 10.72 0.08 0.00 0.00 0.00 0.04 -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) 13:54:09 LINUX RESTART (10 CPU) @@ -4160,28 +4166,28 @@ Average: 0.00 0.00 0.00 0.00 Average: 0.00 0.00 0.00 0.00 host0 13:54:15 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s -13:54:35 all 0.00 0.00 0.00 0.00 0.00 +13:54:35 all 0.00 0.00 394.13 0.00 0.00 13:54:35 0 0.00 0.00 0.00 0.00 0.00 -13:54:35 1 0.00 0.00 0.00 0.00 0.00 -13:54:35 2 0.00 0.00 0.00 0.00 0.00 -13:54:35 3 0.00 0.00 0.00 0.00 0.00 -13:54:35 4 0.00 0.00 0.00 0.00 0.00 -13:54:35 5 0.00 0.00 0.00 0.00 0.00 -13:54:35 6 0.00 0.00 0.00 0.00 0.00 -13:54:35 7 0.00 0.00 0.00 0.00 0.00 -13:54:35 8 0.00 0.00 0.00 0.00 0.00 -13:54:35 9 0.00 0.00 0.00 0.00 0.00 -Average: all 0.00 0.00 0.00 0.00 0.00 +13:54:35 1 0.00 0.00 8.76 0.00 0.00 +13:54:35 2 0.00 0.00 17.52 0.00 0.00 +13:54:35 3 0.00 0.00 26.28 0.00 0.00 +13:54:35 4 0.00 0.00 35.03 0.00 0.00 +13:54:35 5 0.00 0.00 43.79 0.00 0.00 +13:54:35 6 0.00 0.00 52.55 0.00 0.00 +13:54:35 7 0.00 0.00 61.31 0.00 0.00 +13:54:35 8 0.00 0.00 70.07 0.00 0.00 +13:54:35 9 0.00 0.00 78.83 0.00 0.00 +Average: all 0.00 0.00 394.13 0.00 0.00 Average: 0 0.00 0.00 0.00 0.00 0.00 -Average: 1 0.00 0.00 0.00 0.00 0.00 -Average: 2 0.00 0.00 0.00 0.00 0.00 -Average: 3 0.00 0.00 0.00 0.00 0.00 -Average: 4 0.00 0.00 0.00 0.00 0.00 -Average: 5 0.00 0.00 0.00 0.00 0.00 -Average: 6 0.00 0.00 0.00 0.00 0.00 -Average: 7 0.00 0.00 0.00 0.00 0.00 -Average: 8 0.00 0.00 0.00 0.00 0.00 -Average: 9 0.00 0.00 0.00 0.00 0.00 +Average: 1 0.00 0.00 8.76 0.00 0.00 +Average: 2 0.00 0.00 17.52 0.00 0.00 +Average: 3 0.00 0.00 26.28 0.00 0.00 +Average: 4 0.00 0.00 35.03 0.00 0.00 +Average: 5 0.00 0.00 43.79 0.00 0.00 +Average: 6 0.00 0.00 52.55 0.00 0.00 +Average: 7 0.00 0.00 61.31 0.00 0.00 +Average: 8 0.00 0.00 70.07 0.00 0.00 +Average: 9 0.00 0.00 78.83 0.00 0.00 13:54:15 CPU MHz 13:54:35 all 3517.54 @@ -4210,12 +4216,12 @@ Average: 9 3497.56 13:54:15 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM 13:54:35 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 13:54:35 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -13:54:35 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:54:35 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:54:35 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 +13:54:35 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 +Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 13:54:15 %scpu-10 %scpu-60 %scpu-300 %scpu 13:54:35 0.00 0.00 0.00 0.00 diff --git a/tests/expected2.sar-q b/tests/expected2.sar-q index 46c3268..a5e106e 100644 --- a/tests/expected2.sar-q +++ b/tests/expected2.sar-q @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 runq-sz plist-sz ldavg-1 ldavg-5 ldavg-15 blocked 13:20:19 3 956 3.16 3.24 3.43 0 @@ -16,7 +16,7 @@ Average: 3.19 1.14 0.43 2.33 3.19 1.14 0.4 13:20:19 3.12 1.40 0.03 0.05 0.00 0.00 0.00 0.02 Average: 3.12 1.40 0.03 0.05 0.00 0.00 0.00 0.02 -13:20:23 LINUX RESTART (8 CPU) +13:20:23 LINUX RESTART (9 CPU) 13:20:29 runq-sz plist-sz ldavg-1 ldavg-5 ldavg-15 blocked 13:20:39 3 956 3.16 3.24 3.43 0 diff --git a/tests/expected2.sar-qALL b/tests/expected2.sar-qALL index 15dccb2..05094f2 100644 --- a/tests/expected2.sar-qALL +++ b/tests/expected2.sar-qALL @@ -4,7 +4,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (10 CPU) 13:20:19 3 956 3.16 3.24 3.43 0 Average: 3 956 3.16 3.24 3.43 0 -13:20:23 LINUX RESTART (8 CPU) +13:20:23 LINUX RESTART (9 CPU) 13:20:29 runq-sz plist-sz ldavg-1 ldavg-5 ldavg-15 blocked 13:20:39 3 956 3.16 3.24 3.43 0 diff --git a/tests/expected2.sar-u b/tests/expected2.sar-u index d7a199e..176860e 100644 --- a/tests/expected2.sar-u +++ b/tests/expected2.sar-u @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 CPU %user %nice %system %iowait %steal %idle 13:20:19 all 2.15 12.50 2.36 0.12 0.00 82.88 @@ -18,7 +18,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:29 4 3.44 0.00 2.64 0.84 0.00 93.08 13:20:29 5 2.76 0.00 2.37 0.16 0.00 94.71 13:20:29 7 0.83 0.00 0.99 0.00 0.00 98.17 -13:20:39 all 2.66 23.20 2.27 0.17 0.00 71.70 +13:20:39 all 2.67 23.08 2.40 0.17 0.00 71.68 13:20:39 0 2.19 52.01 2.21 0.00 0.00 43.59 13:20:39 1 3.45 0.00 3.06 0.55 0.00 92.94 13:20:39 2 0.68 16.81 2.19 0.39 0.00 79.93 @@ -26,7 +26,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:39 4 3.11 31.18 2.95 0.00 0.00 62.76 13:20:39 5 3.92 0.00 3.03 0.03 0.00 93.02 13:20:39 7 3.23 0.00 1.61 0.36 0.00 94.79 -13:20:49 all 6.53 9.63 4.42 0.54 0.00 78.89 +13:20:39 8 5.26 0.00 26.97 0.00 0.00 67.76 +13:20:49 all 6.80 8.80 7.53 0.49 0.39 75.90 13:20:49 0 2.69 47.44 2.47 0.18 0.00 47.22 13:20:49 1 9.25 0.00 5.60 0.18 0.00 84.97 13:20:49 2 9.90 0.04 4.77 0.90 0.00 84.39 @@ -35,7 +36,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:49 5 7.62 0.00 4.74 0.14 0.00 87.51 13:20:49 6 4.13 0.01 3.44 0.63 0.00 91.79 13:20:49 7 7.81 0.00 5.24 0.32 0.00 86.63 -Average: all 3.51 13.20 2.85 0.31 0.00 80.13 +13:20:49 8 9.59 0.23 39.98 0.00 4.50 44.80 +Average: all 3.66 12.87 3.75 0.31 0.10 79.29 Average: 0 2.17 24.86 2.51 0.12 0.00 70.34 Average: 1 4.02 0.00 3.58 0.40 0.00 92.01 Average: 2 3.40 5.26 2.54 0.65 0.00 88.14 @@ -44,8 +46,9 @@ Average: 4 3.28 19.24 2.57 0.22 0.00 74.69 Average: 5 3.72 0.00 3.11 0.07 0.00 93.10 Average: 6 3.69 0.01 3.23 0.51 0.00 92.56 Average: 7 3.36 0.00 1.92 0.18 0.00 94.54 +Average: 8 9.31 0.21 39.15 0.00 4.21 46.27 -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) 13:39:09 COM Testing sysstat! 13:54:09 LINUX RESTART (10 CPU) diff --git a/tests/expected3.iostat-gpALL b/tests/expected3.iostat-gpALL index 90b346b..d6d3261 100644 --- a/tests/expected3.iostat-gpALL +++ b/tests/expected3.iostat-gpALL @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) avg-cpu: %user %nice %system %iowait %steal %idle - 1.65 44.90 1.84 1.01 0.00 50.60 + 1.49 39.91 1.67 0.94 0.00 56.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd total 0.00 0.00 0.00 0.00 0 0 0 diff --git a/tests/expected3.pidstat-C b/tests/expected3.pidstat-C index 88cd6b2..0eb5724 100644 --- a/tests/expected3.pidstat-C +++ b/tests/expected3.pidstat-C @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:02 1000 9009 9009 0.03 0.00 0.00 0.00 0.03 3 (WebExtensions)__WebExtensions diff --git a/tests/expected3.pidstat-G b/tests/expected3.pidstat-G index 96ce210..6dff8e6 100644 --- a/tests/expected3.pidstat-G +++ b/tests/expected3.pidstat-G @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID PID %usr %system %guest %wait %CPU CPU Command 00:00:02 1000 8741 0.00 0.00 0.00 0.00 0.00 0 firefox diff --git a/tests/expected3.sadf b/tests/expected3.sadf index f5e8770..6cd787c 100644 --- a/tests/expected3.sadf +++ b/tests/expected3.sadf @@ -1 +1 @@ -SYSSTAT.TEST -1 1970-01-01 00:00:00 UTC LINUX-RESTART (8 CPU) +SYSSTAT.TEST -1 1970-01-01 00:00:00 UTC LINUX-RESTART (9 CPU) diff --git a/tests/expected3.sadf-g b/tests/expected3.sadf-g index 4834dc1..bc1ea09 100644 --- a/tests/expected3.sadf-g +++ b/tests/expected3.sadf-g @@ -1,7 +1,7 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) @@ -9,11 +9,11 @@ (Min, Max values) -%user (2.15, 6.53) -%nice (0.00, 23.20) -%system (1.93, 4.42) +%user (2.15, 6.80) +%nice (0.00, 23.08) +%system (1.93, 7.53) %iowait (0.12, 0.77) -%steal (0.00, 0.00) +%steal (0.00, 0.39) 0. @@ -48,16 +48,19 @@ 13:54:29 UTC - + - + - + - + + + + diff --git a/tests/expected3.sar-all b/tests/expected3.sar-all index 8a4f0fb..031f85c 100644 --- a/tests/expected3.sar-all +++ b/tests/expected3.sar-all @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 CPU %usr %nice %sys %iowait %steal %irq %soft %guest %gnice %idle 13:20:19 3 0.00 99.55 0.06 0.00 0.00 0.32 0.06 0.00 0.00 0.00 @@ -381,31 +381,31 @@ Average: 3 3566.22 13:20:09 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM 13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -13:20:19 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 +13:20:19 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 13:20:19 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda9 -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda7 -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda12 -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda6 -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sdf -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sdg -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda9 -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda7 -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda12 -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda6 -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sdf -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sdg +13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda9 +13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 +13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 +13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf +13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg +13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda9 +13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 +13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 +13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf +13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg 13:20:49 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 13:20:49 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -13:20:49 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:20:49 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:20:49 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 +13:20:49 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sdf -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sdg +Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 +Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 +Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf +Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg 13:20:09 %scpu-10 %scpu-60 %scpu-300 %scpu 13:20:19 0.00 0.00 0.00 0.03 @@ -428,4 +428,4 @@ Average: 0.80 0.34 0.25 1.12 0.80 0.34 0.2 13:20:49 23.00 3.00 0.36 0.21 0.00 0.00 0.00 0.15 Average: 36.74 22.22 10.72 0.08 0.00 0.00 0.00 0.04 -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) diff --git a/tests/expected3.sar-i b/tests/expected3.sar-i index 4c5a418..4e7abbf 100644 --- a/tests/expected3.sar-i +++ b/tests/expected3.sar-i @@ -1,10 +1,10 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 CPU %user %nice %system %iowait %steal %idle 13:20:29 all 2.19 7.68 2.14 0.28 0.00 87.71 -13:20:39 all 2.66 23.20 2.27 0.17 0.00 71.70 -Average: all 2.39 14.28 2.20 0.23 0.00 80.90 +13:20:39 all 2.67 23.08 2.40 0.17 0.00 71.68 +Average: all 2.40 14.25 2.25 0.23 0.00 80.87 -13:37:29 LINUX RESTART (8 CPU) +13:37:29 LINUX RESTART (9 CPU) 13:54:09 LINUX RESTART (10 CPU) diff --git a/tests/expected3.sar-u b/tests/expected3.sar-u index a367867..28a496c 100644 --- a/tests/expected3.sar-u +++ b/tests/expected3.sar-u @@ -1 +1 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) diff --git a/tests/expected32.sar-u b/tests/expected32.sar-u index ce244f8..32867f7 100644 --- a/tests/expected32.sar-u +++ b/tests/expected32.sar-u @@ -1,3 +1,3 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) -00:00:00 LINUX RESTART (8 CPU) +00:00:00 LINUX RESTART (9 CPU) diff --git a/tests/expected33.sar-u b/tests/expected33.sar-u index 4012fc3..6eae99e 100644 --- a/tests/expected33.sar-u +++ b/tests/expected33.sar-u @@ -1,9 +1,9 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 05/01/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 05/01/19 _x86_64_ (9 CPU) 23:59:59 CPU %user %nice %system %iowait %steal %idle 00:00:00 all 2.15 12.50 2.36 0.12 0.00 82.88 Average: all 2.15 12.50 2.36 0.12 0.00 82.88 -Linux 1.2.3-TEST (SYSSTAT.TEST) 05/02/19 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 05/02/19 _x86_64_ (9 CPU) 00:00:00 CPU %user %nice %system %iowait %steal %idle 00:00:01 all 2.28 0.00 1.93 0.48 0.00 95.31 diff --git a/tests/expected4.pidstat-C b/tests/expected4.pidstat-C index 1ba19c7..ced9235 100644 --- a/tests/expected4.pidstat-C +++ b/tests/expected4.pidstat-C @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:02 1000 7900 - 359.42 53.55 0.00 8.47 412.96 2 gnome-shell diff --git a/tests/expected4.pidstat-G b/tests/expected4.pidstat-G index f97de0b..c83f5da 100644 --- a/tests/expected4.pidstat-G +++ b/tests/expected4.pidstat-G @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:02 1000 8741 - 0.00 0.00 0.00 0.00 0.00 0 firefox diff --git a/tests/expected5.pidstat-C b/tests/expected5.pidstat-C index 9fb8c20..c97423f 100644 --- a/tests/expected5.pidstat-C +++ b/tests/expected5.pidstat-C @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:02 1000 21342 - 0.00 0.00 0.00 0.00 0.00 5 soffice.bin diff --git a/tests/expected6.pidstat-C b/tests/expected6.pidstat-C index d42e2b8..53489bd 100644 --- a/tests/expected6.pidstat-C +++ b/tests/expected6.pidstat-C @@ -1,4 +1,4 @@ -Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (9 CPU) 00:00:00 UID TGID TID %usr %system %guest %wait %CPU CPU Command 00:00:02 0 8407 - 0.35 0.03 0.00 0.00 0.38 0 gnome-terminal- diff --git a/tests/root.README b/tests/root.README index 8a5f724..4515c02 100644 --- a/tests/root.README +++ b/tests/root.README @@ -12,6 +12,9 @@ PID: 8407[8407] ==========root2: +/proc/stat: +CPU#8: offline + tape statistics available CIFS SMB1 statistics available. New share added. @@ -29,6 +32,7 @@ PID: CPU#3: tickless CPU#6: offline CPU#7: iowait decremented +CPU#8: offline /proc/diskstats sda, sda1: counters increase @@ -53,6 +57,7 @@ PID: ==========root4: /proc/stat CPU#6: offline +CPU#8: online /proc/diskstats sda, sda1: counters decrease @@ -94,7 +99,7 @@ PID: ==========root6: /proc/stat -#CPU: 8 > 10 +#CPU: 9 > 10 Old kernel format, with no steal/guest/guest_nice fields. /proc/diskstats diff --git a/tests/root1/proc/net/softnet_stat b/tests/root1/proc/net/softnet_stat index edbdc42..2e1da4a 100644 --- a/tests/root1/proc/net/softnet_stat +++ b/tests/root1/proc/net/softnet_stat @@ -6,3 +6,4 @@ 00003378 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 0000546e 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00004958 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +00000022 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 diff --git a/tests/root1/proc/stat b/tests/root1/proc/stat index 9e21239..1235f67 100644 --- a/tests/root1/proc/stat +++ b/tests/root1/proc/stat @@ -1,4 +1,4 @@ -cpu 94591 2578673 52404 2906475 58043 27627 25825 0 0 0 +cpu 96005 2578701 53845 3617879 60648 27891 25853 0 0 0 cpu0 10600 331675 5802 352894 4235 3243 9600 0 0 0 cpu1 11041 363180 6237 323953 5418 3438 4668 0 0 0 cpu2 5839 566300 2858 130672 7393 4440 1356 0 0 0 @@ -7,6 +7,7 @@ cpu4 12752 293975 7935 384804 9349 3464 5332 0 0 0 cpu5 12407 308545 6676 378302 7908 3093 1071 0 0 0 cpu6 17865 60354 10138 613356 10825 3499 1107 0 0 0 cpu7 16279 100925 9075 580654 7292 2102 977 0 0 0 +cpu8 1414 28 1441 711404 2605 264 28 0 0 0 intr 95105080 8 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 10536 807 0 180401 0 0 0 146110 220950 0 0 0 0 0 0 0 0 53442 756140 15 15162 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ctxt 130465866 btime 1555568347 diff --git a/tests/root1/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state b/tests/root1/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state new file mode 100644 index 0000000..518de13 --- /dev/null +++ b/tests/root1/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state @@ -0,0 +1,5 @@ +2003000 60803 +2001000 5734 +1600000 6996 +1200000 8219 +800000 215211 diff --git a/tests/root1/sys/devices/system/cpu/cpu8/node1 b/tests/root1/sys/devices/system/cpu/cpu8/node1 new file mode 100644 index 0000000..e69de29 diff --git a/tests/root1/sys/devices/system/cpu/cpu8/topology/physical_package_id b/tests/root1/sys/devices/system/cpu/cpu8/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/root1/sys/devices/system/cpu/cpu8/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/root1/sys/devices/system/cpu/cpu8/topology/thread_siblings_list b/tests/root1/sys/devices/system/cpu/cpu8/topology/thread_siblings_list new file mode 100644 index 0000000..b98ebe0 --- /dev/null +++ b/tests/root1/sys/devices/system/cpu/cpu8/topology/thread_siblings_list @@ -0,0 +1 @@ +0,7 diff --git a/tests/root2/proc/stat b/tests/root2/proc/stat index f4be9c0..85dbd52 100644 --- a/tests/root2/proc/stat +++ b/tests/root2/proc/stat @@ -1,4 +1,4 @@ -cpu 95124 2581777 52861 2927065 58072 27711 25869 0 0 0 +cpu 96538 2581805 54302 3638469 60677 27975 25897 0 0 0 cpu0 10684 331676 5869 355816 4235 3253 9620 0 0 0 cpu1 11129 363180 6369 326789 5418 3459 4674 0 0 0 cpu2 5909 566301 2905 133632 7414 4447 1360 0 0 0 diff --git a/tests/root2/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state b/tests/root2/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state new file mode 100644 index 0000000..518de13 --- /dev/null +++ b/tests/root2/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state @@ -0,0 +1,5 @@ +2003000 60803 +2001000 5734 +1600000 6996 +1200000 8219 +800000 215211 diff --git a/tests/root2/sys/devices/system/cpu/cpu8/node1 b/tests/root2/sys/devices/system/cpu/cpu8/node1 new file mode 100644 index 0000000..e69de29 diff --git a/tests/root2/sys/devices/system/cpu/cpu8/topology/physical_package_id b/tests/root2/sys/devices/system/cpu/cpu8/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/root2/sys/devices/system/cpu/cpu8/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/root2/sys/devices/system/cpu/cpu8/topology/thread_siblings_list b/tests/root2/sys/devices/system/cpu/cpu8/topology/thread_siblings_list new file mode 100644 index 0000000..b98ebe0 --- /dev/null +++ b/tests/root2/sys/devices/system/cpu/cpu8/topology/thread_siblings_list @@ -0,0 +1 @@ +0,7 diff --git a/tests/root3/proc/stat b/tests/root3/proc/stat index 13baf20..19b8ad6 100644 --- a/tests/root3/proc/stat +++ b/tests/root3/proc/stat @@ -1,4 +1,4 @@ -cpu 95612 2584890 53235 2947795 58198 27773 25908 0 0 0 +cpu 97026 2584918 54676 3659199 60803 28037 25936 0 0 0 cpu0 10723 331676 5916 358812 4246 3259 9638 0 0 0 cpu1 11196 363180 6399 329782 5442 3462 4679 0 0 0 cpu2 6011 566301 2959 136557 7438 4454 1363 0 0 0 diff --git a/tests/root3/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state b/tests/root3/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state new file mode 100644 index 0000000..518de13 --- /dev/null +++ b/tests/root3/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state @@ -0,0 +1,5 @@ +2003000 60803 +2001000 5734 +1600000 6996 +1200000 8219 +800000 215211 diff --git a/tests/root3/sys/devices/system/cpu/cpu8/node1 b/tests/root3/sys/devices/system/cpu/cpu8/node1 new file mode 100644 index 0000000..e69de29 diff --git a/tests/root3/sys/devices/system/cpu/cpu8/topology/physical_package_id b/tests/root3/sys/devices/system/cpu/cpu8/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/root3/sys/devices/system/cpu/cpu8/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/root3/sys/devices/system/cpu/cpu8/topology/thread_siblings_list b/tests/root3/sys/devices/system/cpu/cpu8/topology/thread_siblings_list new file mode 100644 index 0000000..b98ebe0 --- /dev/null +++ b/tests/root3/sys/devices/system/cpu/cpu8/topology/thread_siblings_list @@ -0,0 +1 @@ +0,7 diff --git a/tests/root4/proc/net/softnet_stat b/tests/root4/proc/net/softnet_stat index 2de06d4..bac8512 100644 --- a/tests/root4/proc/net/softnet_stat +++ b/tests/root4/proc/net/softnet_stat @@ -5,3 +5,4 @@ 00002de9 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00003378 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00004958 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +00000022 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 diff --git a/tests/root4/proc/stat b/tests/root4/proc/stat index bff9659..1502638 100644 --- a/tests/root4/proc/stat +++ b/tests/root4/proc/stat @@ -1,4 +1,4 @@ -cpu 96528 2588725 53830 2972869 58263 27878 25972 0 0 0 +cpu 97950 2588753 55287 2972972 58263 28142 26025 0 0 0 cpu0 10807 333672 5972 360485 4246 3273 9653 0 0 0 cpu1 11328 363180 6488 333338 5463 3475 4694 0 0 0 cpu2 6037 566945 3027 139619 7453 4467 1366 0 0 0 @@ -6,6 +6,7 @@ cpu3 7968 559931 3755 145416 5621 4374 1722 0 0 0 cpu4 13053 295169 8139 393070 9376 3501 5350 0 0 0 cpu5 12694 308545 6911 387770 7914 3124 1081 0 0 0 cpu7 16519 100925 9176 590355 7307 2112 986 0 0 0 +cpu8 1422 28 1457 103 0 264 53 0 0 0 intr 98268434 8 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 10536 807 0 182813 0 0 0 149146 222016 0 0 0 0 0 0 0 0 56608 770984 15 15162 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ctxt 136544596 btime 1555568347 diff --git a/tests/root4/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state b/tests/root4/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state new file mode 100644 index 0000000..518de13 --- /dev/null +++ b/tests/root4/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state @@ -0,0 +1,5 @@ +2003000 60803 +2001000 5734 +1600000 6996 +1200000 8219 +800000 215211 diff --git a/tests/root4/sys/devices/system/cpu/cpu8/node1 b/tests/root4/sys/devices/system/cpu/cpu8/node1 new file mode 100644 index 0000000..e69de29 diff --git a/tests/root4/sys/devices/system/cpu/cpu8/topology/physical_package_id b/tests/root4/sys/devices/system/cpu/cpu8/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/root4/sys/devices/system/cpu/cpu8/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/root4/sys/devices/system/cpu/cpu8/topology/thread_siblings_list b/tests/root4/sys/devices/system/cpu/cpu8/topology/thread_siblings_list new file mode 100644 index 0000000..b98ebe0 --- /dev/null +++ b/tests/root4/sys/devices/system/cpu/cpu8/topology/thread_siblings_list @@ -0,0 +1 @@ +0,7 diff --git a/tests/root5/proc/net/softnet_stat b/tests/root5/proc/net/softnet_stat index edbdc42..4820edc 100644 --- a/tests/root5/proc/net/softnet_stat +++ b/tests/root5/proc/net/softnet_stat @@ -6,3 +6,4 @@ 00003378 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 0000546e 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00004958 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +00000082 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 diff --git a/tests/root5/proc/stat b/tests/root5/proc/stat index 6e50911..b8996f6 100644 --- a/tests/root5/proc/stat +++ b/tests/root5/proc/stat @@ -1,4 +1,4 @@ -cpu 97862 2590952 54469 2986198 58317 27982 26053 0 0 0 +cpu 99497 2590985 56814 2987296 58317 28246 26106 100 150 25 cpu0 10867 334730 6000 361538 4250 3281 9672 0 0 0 cpu1 11533 363180 6578 335221 5467 3488 4715 0 0 0 cpu2 6257 566946 3111 141495 7473 4478 1377 0 0 0 @@ -7,6 +7,7 @@ cpu4 13154 296336 8179 393972 9376 3512 5356 0 0 0 cpu5 12863 308545 7000 389710 7917 3135 1086 0 0 0 cpu6 18318 60355 10450 624713 10888 3568 1122 0 0 0 cpu7 16692 100925 9273 592273 7314 2126 991 0 0 0 +cpu8 1635 33 2345 1098 0 264 53 100 150 25 intr 99525101 8 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 10536 807 0 183412 0 0 0 149539 222355 0 0 0 0 0 0 0 0 57105 775353 15 15162 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ctxt 138969137 btime 1555568347 diff --git a/tests/root5/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state b/tests/root5/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state new file mode 100644 index 0000000..518de13 --- /dev/null +++ b/tests/root5/sys/devices/system/cpu/cpu8/cpufreq/stats/time_in_state @@ -0,0 +1,5 @@ +2003000 60803 +2001000 5734 +1600000 6996 +1200000 8219 +800000 215211 diff --git a/tests/root5/sys/devices/system/cpu/cpu8/node1 b/tests/root5/sys/devices/system/cpu/cpu8/node1 new file mode 100644 index 0000000..e69de29 diff --git a/tests/root5/sys/devices/system/cpu/cpu8/topology/physical_package_id b/tests/root5/sys/devices/system/cpu/cpu8/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/root5/sys/devices/system/cpu/cpu8/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/root5/sys/devices/system/cpu/cpu8/topology/thread_siblings_list b/tests/root5/sys/devices/system/cpu/cpu8/topology/thread_siblings_list new file mode 100644 index 0000000..b98ebe0 --- /dev/null +++ b/tests/root5/sys/devices/system/cpu/cpu8/topology/thread_siblings_list @@ -0,0 +1 @@ +0,7 diff --git a/tests/root7/proc/net/softnet_stat b/tests/root7/proc/net/softnet_stat index 57c41c2..6223b1f 100644 --- a/tests/root7/proc/net/softnet_stat +++ b/tests/root7/proc/net/softnet_stat @@ -1,10 +1,10 @@ 00002ec8 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 -00002970 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 -00000f09 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 -000104e3 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 -00002de9 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 -00003378 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 -0000546e 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 -00004958 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 -00002ec8 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 -00002970 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +00002970 00000000 00000111 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +00000f09 00000000 00000222 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +000104e3 00000000 00000333 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +00002de9 00000000 00000444 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +00003378 00000000 00000555 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +0000546e 00000000 00000666 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +00004958 00000000 00000777 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +00002ec8 00000000 00000888 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +00002970 00000000 00000999 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 -- 2.40.0