From c79c131d9c91c4c2969c2c0d4266399d2630ab4d Mon Sep 17 00:00:00 2001 From: Sebastien GODARD Date: Wed, 2 Sep 2020 18:26:39 +0200 Subject: [PATCH] Add non regression test based on iowait being decremented Signed-off-by: Sebastien GODARD --- tests/expected.data-ini | 8 ++--- tests/expected.iostat | 2 +- tests/expected.iostat-ALL | 2 +- tests/expected.iostat-gpy | 4 +-- tests/expected.iostat-list | 2 +- tests/expected.iostat-p-sda | 2 +- tests/expected.iostat-sigint | 4 +-- tests/expected.iostat-x-ALL-flush | 2 +- tests/expected.iostat-xs | 2 +- tests/expected.iostat-xs-list-part | 2 +- tests/expected.iostat-ym | 2 +- tests/expected.mpstat-A | 16 +++++----- tests/expected.mpstat-T | 8 ++--- tests/expected.sa1 | 4 +-- tests/expected.sa2 | 8 ++--- tests/expected.sadf-d | 8 ++--- tests/expected.sadf-d-qu | 4 +-- tests/expected.sadf-g | 40 ++++++++++++------------- tests/expected.sadf-g-cc | 12 ++++---- tests/expected.sadf-j | 8 ++--- tests/expected.sadf-p | 32 ++++++++++---------- tests/expected.sadf-r | 8 ++--- tests/expected.sadf-x | 8 ++--- tests/expected.sar-D | 4 +-- tests/expected.sar-ISO | 4 +-- tests/expected.sar-all | 8 ++--- tests/expected.sar-always | 4 +-- tests/expected.sar-autonever | 4 +-- tests/expected.sar-dec | 4 +-- tests/expected.sar-human | 6 ++-- tests/expected.sar-i | 8 ++--- tests/expected.sar-se | 4 +-- tests/expected.sar-u | 8 ++--- tests/expected.sar1 | 4 +-- tests/expected2.sadf-g | 48 +++++++++++++++--------------- tests/expected2.sar-all | 8 ++--- tests/expected2.sar-u | 8 ++--- tests/expected3.sadf-g | 12 ++++---- tests/expected3.sar-i | 4 +-- tests/expected33.sar-u | 4 +-- tests/root.README | 1 + tests/root3/proc/stat | 4 +-- 42 files changed, 168 insertions(+), 167 deletions(-) diff --git a/tests/expected.data-ini b/tests/expected.data-ini index afcf4f9..d727f31 100644 --- a/tests/expected.data-ini +++ b/tests/expected.data-ini @@ -10,22 +10,22 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:19 5 1.65 0.00 2.33 0.00 0.00 0.36 0.10 0.00 0.00 95.57 13:20:19 6 2.41 0.00 2.03 0.16 0.00 0.48 0.10 0.00 0.00 94.82 13:20:19 7 2.89 0.00 0.74 0.06 0.00 0.06 0.06 0.00 0.00 96.18 -13:20:29 all 2.28 0.00 1.55 0.50 0.00 0.19 0.19 0.00 0.00 95.29 +13:20:29 all 1.64 0.00 1.11 28.40 0.00 0.13 0.14 0.00 0.00 68.57 13:20:29 0 1.25 0.00 1.51 0.35 0.00 0.19 0.58 0.00 0.00 96.12 13:20:29 1 2.15 0.00 0.96 0.77 0.00 0.10 0.16 0.00 0.00 95.87 13:20:29 2 3.27 0.00 1.73 0.77 0.00 0.22 0.10 0.00 0.00 93.90 13:20:29 3 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 100.00 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.10 0.00 0.10 0.06 0.00 0.00 98.08 -13:20:39 all 2.66 23.20 1.74 0.16 0.00 0.33 0.20 0.00 0.00 71.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 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 13:20:39 3 2.33 44.73 1.03 0.01 0.00 0.29 0.16 0.00 0.00 51.44 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.26 0.00 0.13 0.13 0.00 0.00 94.90 +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: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 diff --git a/tests/expected.iostat b/tests/expected.iostat index a91df30..45baf2f 100644 --- a/tests/expected.iostat +++ b/tests/expected.iostat @@ -17,7 +17,7 @@ sdb 0.00 0.00 0.00 0.00 0 avg-cpu: %user %nice %system %iowait %steal %idle - 1.96 12.49 1.91 0.52 0.00 83.13 + 1.96 12.49 1.91 0.51 0.00 83.15 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 6.40 1.60 1.60 0.00 50 50 0 diff --git a/tests/expected.iostat-ALL b/tests/expected.iostat-ALL index 0ad107b..ebb20ea 100644 --- a/tests/expected.iostat-ALL +++ b/tests/expected.iostat-ALL @@ -26,7 +26,7 @@ sr0 0.00 0.00 0.00 0.00 0 avg-cpu: %user %nice %system %iowait %steal %idle - 1.96 12.49 1.91 0.52 0.00 83.13 + 1.96 12.49 1.91 0.51 0.00 83.15 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 6.40 1.60 1.60 0.00 50 50 0 diff --git a/tests/expected.iostat-gpy b/tests/expected.iostat-gpy index 7cd2748..9fa4491 100644 --- a/tests/expected.iostat-gpy +++ b/tests/expected.iostat-gpy @@ -22,7 +22,7 @@ sda9 0.00 0.00 0.00 0.00 0 avg-cpu: %user %nice %system %iowait %steal %idle - 1.96 12.49 1.91 0.52 0.00 83.13 + 1.96 12.49 1.91 0.51 0.00 83.15 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 6.40 1.60 1.60 0.00 50 50 0 @@ -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.20 0.00 81.81 + 2.99 12.51 2.49 0.21 0.00 81.80 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-list b/tests/expected.iostat-list index a758f0e..950be91 100644 --- a/tests/expected.iostat-list +++ b/tests/expected.iostat-list @@ -17,7 +17,7 @@ sdc 0.00 0.00 0.00 0.00 0 avg-cpu: %user %nice %system %iowait %steal %idle - 1.96 12.49 1.91 0.52 0.00 83.13 + 1.96 12.49 1.91 0.51 0.00 83.15 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 6.40 1.60 1.60 0.00 50 50 0 diff --git a/tests/expected.iostat-p-sda b/tests/expected.iostat-p-sda index 3337003..81b3f86 100644 --- a/tests/expected.iostat-p-sda +++ b/tests/expected.iostat-p-sda @@ -39,7 +39,7 @@ sda9 0.00 0.00 0.00 0.00 0 avg-cpu: %user %nice %system %iowait %steal %idle - 1.96 12.49 1.91 0.52 0.00 83.13 + 1.96 12.49 1.91 0.51 0.00 83.15 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 6.40 1.60 1.60 0.00 50 50 0 diff --git a/tests/expected.iostat-sigint b/tests/expected.iostat-sigint index 812e56c..b7e76a2 100644 --- a/tests/expected.iostat-sigint +++ b/tests/expected.iostat-sigint @@ -17,7 +17,7 @@ sdb 0.00 0.00 0.00 0.00 0 avg-cpu: %user %nice %system %iowait %steal %idle - 1.96 12.49 1.91 0.52 0.00 83.13 + 1.96 12.49 1.91 0.51 0.00 83.15 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 6.40 1.60 1.60 0.00 50 50 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.20 0.00 81.81 + 2.99 12.51 2.49 0.21 0.00 81.80 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-x-ALL-flush b/tests/expected.iostat-x-ALL-flush index c2247a7..350e5c4 100644 --- a/tests/expected.iostat-x-ALL-flush +++ b/tests/expected.iostat-x-ALL-flush @@ -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.20 0.00 81.81 + 2.99 12.51 2.49 0.21 0.00 81.80 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 diff --git a/tests/expected.iostat-xs b/tests/expected.iostat-xs index 5b03826..04c0369 100644 --- a/tests/expected.iostat-xs +++ b/tests/expected.iostat-xs @@ -17,7 +17,7 @@ sdb 0.00 0.00 0.00 0.00 0.00 0.00 0.00 avg-cpu: %user %nice %system %iowait %steal %idle - 1.96 12.49 1.91 0.52 0.00 83.13 + 1.96 12.49 1.91 0.51 0.00 83.15 Device tps kB/s rqm/s await areq-sz aqu-sz %util sda 6.40 3.20 6.40 1.00 0.50 0.00 0.32 diff --git a/tests/expected.iostat-xs-list-part b/tests/expected.iostat-xs-list-part index e8b7349..07bc045 100644 --- a/tests/expected.iostat-xs-list-part +++ b/tests/expected.iostat-xs-list-part @@ -17,7 +17,7 @@ sda3 0.00 0.00 0.00 0.00 0.00 0.00 0.00 avg-cpu: %user %nice %system %iowait %steal %idle - 1.96 12.49 1.91 0.52 0.00 83.13 + 1.96 12.49 1.91 0.51 0.00 83.15 Device tps kB/s rqm/s await areq-sz aqu-sz %util sda1 6.40 3.20 6.40 1.00 0.50 0.00 0.32 diff --git a/tests/expected.iostat-ym b/tests/expected.iostat-ym index 77f7876..2608c6e 100644 --- a/tests/expected.iostat-ym +++ b/tests/expected.iostat-ym @@ -10,7 +10,7 @@ sdb 0.00 0.00 0.00 0.00 0 avg-cpu: %user %nice %system %iowait %steal %idle - 1.96 12.49 1.91 0.52 0.00 83.13 + 1.96 12.49 1.91 0.51 0.00 83.15 Device tps MB_read/s MB_wrtn/s MB_dscd/s MB_read MB_wrtn MB_dscd sda 6.40 0.00 0.00 0.00 0 0 0 diff --git a/tests/expected.mpstat-A b/tests/expected.mpstat-A index e2d874d..5e78b9b 100644 --- a/tests/expected.mpstat-A +++ b/tests/expected.mpstat-A @@ -48,19 +48,19 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) 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 CPU %usr %nice %sys %iowait %irq %soft %steal %guest %gnice %idle -00:00:02 all 2.28 0.00 1.55 0.50 0.19 0.19 0.00 0.00 0.00 95.29 +00:00:02 all 1.64 0.00 1.11 28.40 0.13 0.14 0.00 0.00 0.00 68.57 00:00:02 0 1.25 0.00 1.51 0.35 0.19 0.58 0.00 0.00 0.00 96.12 00:00:02 1 2.15 0.00 0.96 0.77 0.10 0.16 0.00 0.00 0.00 95.87 00:00:02 2 3.27 0.00 1.73 0.77 0.22 0.10 0.00 0.00 0.00 93.90 00:00:02 3 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 100.00 00:00:02 4 3.44 0.00 2.16 0.84 0.32 0.16 0.00 0.00 0.00 93.08 00:00:02 5 2.76 0.00 2.08 0.16 0.19 0.10 0.00 0.00 0.00 94.71 -00:00:02 7 0.83 0.00 0.83 0.10 0.10 0.06 0.00 0.00 0.00 98.08 +00:00:02 7 0.25 0.00 0.25 70.04 0.03 0.02 0.00 0.00 0.00 29.42 00:00:01 NODE %usr %nice %sys %iowait %irq %soft %steal %guest %gnice %idle -00:00:02 all 2.28 0.00 1.55 0.50 0.19 0.19 0.00 0.00 0.00 95.29 +00:00:02 all 1.64 0.00 1.11 28.40 0.13 0.14 0.00 0.00 0.00 68.57 00:00:02 0 2.66 0.00 1.80 0.65 0.25 0.28 0.00 0.00 0.00 94.37 -00:00:02 1 1.91 0.00 1.29 0.34 0.13 0.11 0.00 0.00 0.00 96.22 +00:00:02 1 1.07 0.00 0.73 43.97 0.07 0.06 0.00 0.00 0.00 54.10 00:00:01 CPU intr/s 00:00:02 all 24402.62 @@ -94,7 +94,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) 00:00:02 7 0.00 16.77 0.00 0.00 0.00 0.00 0.00 8.51 0.00 9.57 Average: CPU %usr %nice %sys %iowait %irq %soft %steal %guest %gnice %idle -Average: all 2.20 7.13 1.71 0.28 0.27 0.19 0.00 0.00 0.00 88.21 +Average: all 2.20 7.13 1.71 0.27 0.27 0.19 0.00 0.00 0.00 88.22 Average: 0 1.98 0.02 1.83 0.18 0.26 0.61 0.00 0.00 0.00 95.13 Average: 1 2.50 0.00 2.61 0.39 0.39 0.18 0.00 0.00 0.00 93.94 Average: 2 2.76 0.02 1.62 0.72 0.22 0.11 0.00 0.00 0.00 94.54 @@ -102,12 +102,12 @@ Average: 3 0.00 99.55 0.06 0.00 0.32 0.06 0.00 0.00 Average: 4 2.93 0.00 1.88 0.43 0.29 0.18 0.00 0.00 0.00 94.29 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.08 0.08 0.06 0.00 0.00 0.00 97.13 +Average: 7 1.86 0.00 0.79 0.02 0.08 0.06 0.00 0.00 0.00 97.19 Average: NODE %usr %nice %sys %iowait %irq %soft %steal %guest %gnice %idle -Average: all 2.20 7.13 1.71 0.28 0.27 0.19 0.00 0.00 0.00 88.21 +Average: all 2.20 7.13 1.71 0.27 0.27 0.19 0.00 0.00 0.00 88.22 Average: 0 2.54 0.01 1.81 0.40 0.29 0.27 0.00 0.00 0.00 94.68 -Average: 1 1.87 14.25 1.61 0.16 0.26 0.11 0.00 0.00 0.00 81.74 +Average: 1 1.87 14.25 1.61 0.14 0.26 0.11 0.00 0.00 0.00 81.76 Average: CPU intr/s Average: all 29957.60 diff --git a/tests/expected.mpstat-T b/tests/expected.mpstat-T index 32de128..3664991 100644 --- a/tests/expected.mpstat-T +++ b/tests/expected.mpstat-T @@ -12,17 +12,17 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) 00:00:01 7 3 0 1 2.89 0.00 0.74 0.06 0.06 0.06 0.00 0.00 0.00 96.18 00:00:01 CPU CORE SOCK NODE %usr %nice %sys %iowait %irq %soft %steal %guest %gnice %idle -00:00:02 all 2.28 0.00 1.55 0.50 0.19 0.19 0.00 0.00 0.00 95.29 +00:00:02 all 1.64 0.00 1.11 28.40 0.13 0.14 0.00 0.00 0.00 68.57 00:00:02 0 0 0 0 1.25 0.00 1.51 0.35 0.19 0.58 0.00 0.00 0.00 96.12 00:00:02 1 1 0 1 2.15 0.00 0.96 0.77 0.10 0.16 0.00 0.00 0.00 95.87 00:00:02 2 2 0 0 3.27 0.00 1.73 0.77 0.22 0.10 0.00 0.00 0.00 93.90 00:00:02 3 3 0 1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 100.00 00:00:02 4 0 0 0 3.44 0.00 2.16 0.84 0.32 0.16 0.00 0.00 0.00 93.08 00:00:02 5 1 0 1 2.76 0.00 2.08 0.16 0.19 0.10 0.00 0.00 0.00 94.71 -00:00:02 7 3 0 1 0.83 0.00 0.83 0.10 0.10 0.06 0.00 0.00 0.00 98.08 +00:00:02 7 3 0 1 0.25 0.00 0.25 70.04 0.03 0.02 0.00 0.00 0.00 29.42 Average: CPU CORE SOCK NODE %usr %nice %sys %iowait %irq %soft %steal %guest %gnice %idle -Average: all 2.20 7.13 1.71 0.28 0.27 0.19 0.00 0.00 0.00 88.21 +Average: all 2.20 7.13 1.71 0.27 0.27 0.19 0.00 0.00 0.00 88.22 Average: 0 0 0 0 1.98 0.02 1.83 0.18 0.26 0.61 0.00 0.00 0.00 95.13 Average: 1 1 0 1 2.50 0.00 2.61 0.39 0.39 0.18 0.00 0.00 0.00 93.94 Average: 2 2 0 0 2.76 0.02 1.62 0.72 0.22 0.11 0.00 0.00 0.00 94.54 @@ -30,4 +30,4 @@ Average: 3 3 0 1 0.00 99.55 0.06 0.00 0.32 0.06 Average: 4 0 0 0 2.93 0.00 1.88 0.43 0.29 0.18 0.00 0.00 0.00 94.29 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.08 0.08 0.06 0.00 0.00 0.00 97.13 +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 diff --git a/tests/expected.sa1 b/tests/expected.sa1 index 5740869..915992c 100644 --- a/tests/expected.sa1 +++ b/tests/expected.sa1 @@ -3,5 +3,5 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:09 LINUX RESTART (8 CPU) 13:20:29 CPU %user %nice %system %iowait %steal %idle -13:20:49 all 2.28 0.00 1.93 0.50 0.00 95.29 -Average: all 2.28 0.00 1.93 0.50 0.00 95.29 +13:20:49 all 1.64 0.00 1.38 28.40 0.00 68.57 +Average: all 1.64 0.00 1.38 28.40 0.00 68.57 diff --git a/tests/expected.sa2 b/tests/expected.sa2 index ad753c6..b5f26a0 100644 --- a/tests/expected.sa2 +++ b/tests/expected.sa2 @@ -3,15 +3,15 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:09 LINUX RESTART (8 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.50 0.00 0.19 0.19 0.00 0.00 95.29 +13:20:49 all 1.64 0.00 1.11 28.40 0.00 0.13 0.14 0.00 0.00 68.57 13:20:49 0 1.25 0.00 1.51 0.35 0.00 0.19 0.58 0.00 0.00 96.12 13:20:49 1 2.15 0.00 0.96 0.77 0.00 0.10 0.16 0.00 0.00 95.87 13:20:49 2 3.27 0.00 1.73 0.77 0.00 0.22 0.10 0.00 0.00 93.90 13:20:49 3 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 100.00 13:20:49 4 3.44 0.00 2.16 0.84 0.00 0.32 0.16 0.00 0.00 93.08 13:20:49 5 2.76 0.00 2.08 0.16 0.00 0.19 0.10 0.00 0.00 94.71 -13:20:49 7 0.83 0.00 0.83 0.10 0.00 0.10 0.06 0.00 0.00 98.08 -Average: all 2.28 0.00 1.55 0.50 0.00 0.19 0.19 0.00 0.00 95.29 +13:20:49 7 0.25 0.00 0.25 70.04 0.00 0.03 0.02 0.00 0.00 29.42 +Average: all 1.64 0.00 1.11 28.40 0.00 0.13 0.14 0.00 0.00 68.57 Average: 0 1.25 0.00 1.51 0.35 0.00 0.19 0.58 0.00 0.00 96.12 Average: 1 2.15 0.00 0.96 0.77 0.00 0.10 0.16 0.00 0.00 95.87 Average: 2 3.27 0.00 1.73 0.77 0.00 0.22 0.10 0.00 0.00 93.90 @@ -19,7 +19,7 @@ Average: 3 0.00 0.00 0.00 0.00 0.00 0.00 Average: 4 3.44 0.00 2.16 0.84 0.00 0.32 0.16 0.00 0.00 93.08 Average: 5 2.76 0.00 2.08 0.16 0.00 0.19 0.10 0.00 0.00 94.71 Average: 6 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 100.00 -Average: 7 0.83 0.00 0.83 0.10 0.00 0.10 0.06 0.00 0.00 98.08 +Average: 7 0.25 0.00 0.25 70.04 0.00 0.03 0.02 0.00 0.00 29.42 13:20:29 proc/s cswch/s 13:20:49 4.83 46287.74 diff --git a/tests/expected.sadf-d b/tests/expected.sadf-d index a599192..66498c8 100644 --- a/tests/expected.sadf-d +++ b/tests/expected.sadf-d @@ -8,22 +8,22 @@ SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;4;2.41;0.00;1.61;0.03;0.00;0.26;0.19;0.0 SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;5;1.65;0.00;2.33;0.00;0.00;0.36;0.10;0.00;0.00;95.57 SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;6;2.41;0.00;2.03;0.16;0.00;0.48;0.10;0.00;0.00;94.82 SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;7;2.89;0.00;0.74;0.06;0.00;0.06;0.06;0.00;0.00;96.18 -SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;-1;2.28;0.00;1.55;0.50;0.00;0.19;0.19;0.00;0.00;95.29 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;-1;1.64;0.00;1.11;28.40;0.00;0.13;0.14;0.00;0.00;68.57 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;0;1.25;0.00;1.51;0.35;0.00;0.19;0.58;0.00;0.00;96.12 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;1;2.15;0.00;0.96;0.77;0.00;0.10;0.16;0.00;0.00;95.87 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;2;3.27;0.00;1.73;0.77;0.00;0.22;0.10;0.00;0.00;93.90 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.00;0.00;100.00 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.10;0.00;0.10;0.06;0.00;0.00;98.08 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;-1;2.66;23.20;1.74;0.16;0.00;0.33;0.20;0.00;0.00;71.71 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;7;0.25;0.00;0.25;70.04;0.00;0.03;0.02;0.00;0.00;29.42 +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;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 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.00;0.00;51.44 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.26;0.00;0.13;0.13;0.00;0.00;94.90 +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;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 diff --git a/tests/expected.sadf-d-qu b/tests/expected.sadf-d-qu index 8825517..fdef601 100644 --- a/tests/expected.sadf-d-qu +++ b/tests/expected.sadf-d-qu @@ -1,7 +1,7 @@ # 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.50;0.00;95.29 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;-1;2.66;23.20;2.27;0.16;0.00;71.71 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;-1;1.64;0.00;1.38;28.40;0.00;68.57 +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 # 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 diff --git a/tests/expected.sadf-g b/tests/expected.sadf-g index 5369b18..bb58248 100644 --- a/tests/expected.sadf-g +++ b/tests/expected.sadf-g @@ -9,13 +9,13 @@ (Min, Max values) -%usr (2.15, 6.53) +%usr (1.64, 6.53) %nice (0.00, 23.20) -%sys (1.55, 3.44) -%iowait (0.12, 0.77) +%sys (1.11, 3.44) +%iowait (0.12, 28.40) %steal (0.00, 0.00) -%irq (0.19, 0.96) -%soft (0.19, 0.38) +%irq (0.13, 0.96) +%soft (0.14, 0.38) %guest (0.00, 0.00) %gnice (0.00, 0.00) @@ -52,22 +52,22 @@ 13:54:29 UTC - + - + - + - + - + @@ -547,13 +547,13 @@ (Min, Max values) -%usr (0.83, 7.81) +%usr (0.25, 7.81) %nice (0.00, 0.00) -%sys (0.74, 4.38) -%iowait (0.06, 0.32) +%sys (0.25, 4.38) +%iowait (0.06, 70.04) %steal (0.00, 0.00) -%irq (0.06, 0.63) -%soft (0.06, 0.23) +%irq (0.03, 0.63) +%soft (0.02, 0.23) %guest (0.00, 0.00) %gnice (0.00, 0.00) @@ -590,19 +590,19 @@ 13:54:29 UTC - + - + - + - + - + diff --git a/tests/expected.sadf-g-cc b/tests/expected.sadf-g-cc index 9565264..3509422 100644 --- a/tests/expected.sadf-g-cc +++ b/tests/expected.sadf-g-cc @@ -9,10 +9,10 @@ (Min, Max values) -%user (2.15, 6.53) +%user (1.64, 6.53) %nice (0.00, 23.20) -%system (1.93, 4.42) -%iowait (0.12, 0.77) +%system (1.38, 4.42) +%iowait (0.12, 28.40) %steal (0.00, 0.00) 0. @@ -48,16 +48,16 @@ 13:54:29 UTC - + - + - + diff --git a/tests/expected.sadf-j b/tests/expected.sadf-j index 106638b..0afd309 100644 --- a/tests/expected.sadf-j +++ b/tests/expected.sadf-j @@ -616,14 +616,14 @@ { "timestamp": {"date": "2019-04-18", "time": "13:20:29", "utc": 1, "interval": 31}, "cpu-load": [ - {"cpu": "all", "usr": 2.28, "nice": 0.00, "sys": 1.55, "iowait": 0.50, "steal": 0.00, "irq": 0.19, "soft": 0.19, "guest": 0.00, "gnice": 0.00, "idle": 95.29}, + {"cpu": "all", "usr": 1.64, "nice": 0.00, "sys": 1.11, "iowait": 28.40, "steal": 0.00, "irq": 0.13, "soft": 0.14, "guest": 0.00, "gnice": 0.00, "idle": 68.57}, {"cpu": "0", "usr": 1.25, "nice": 0.00, "sys": 1.51, "iowait": 0.35, "steal": 0.00, "irq": 0.19, "soft": 0.58, "guest": 0.00, "gnice": 0.00, "idle": 96.12}, {"cpu": "1", "usr": 2.15, "nice": 0.00, "sys": 0.96, "iowait": 0.77, "steal": 0.00, "irq": 0.10, "soft": 0.16, "guest": 0.00, "gnice": 0.00, "idle": 95.87}, {"cpu": "2", "usr": 3.27, "nice": 0.00, "sys": 1.73, "iowait": 0.77, "steal": 0.00, "irq": 0.22, "soft": 0.10, "guest": 0.00, "gnice": 0.00, "idle": 93.90}, {"cpu": "3", "usr": 0.00, "nice": 0.00, "sys": 0.00, "iowait": 0.00, "steal": 0.00, "irq": 0.00, "soft": 0.00, "guest": 0.00, "gnice": 0.00, "idle": 100.00}, {"cpu": "4", "usr": 3.44, "nice": 0.00, "sys": 2.16, "iowait": 0.84, "steal": 0.00, "irq": 0.32, "soft": 0.16, "guest": 0.00, "gnice": 0.00, "idle": 93.08}, {"cpu": "5", "usr": 2.76, "nice": 0.00, "sys": 2.08, "iowait": 0.16, "steal": 0.00, "irq": 0.19, "soft": 0.10, "guest": 0.00, "gnice": 0.00, "idle": 94.71}, - {"cpu": "7", "usr": 0.83, "nice": 0.00, "sys": 0.83, "iowait": 0.10, "steal": 0.00, "irq": 0.10, "soft": 0.06, "guest": 0.00, "gnice": 0.00, "idle": 98.08} + {"cpu": "7", "usr": 0.25, "nice": 0.00, "sys": 0.25, "iowait": 70.04, "steal": 0.00, "irq": 0.03, "soft": 0.02, "guest": 0.00, "gnice": 0.00, "idle": 29.42} ], "process-and-context-switch": {"proc": 4.83, "cswch": 46287.74}, "interrupts": [ @@ -1219,14 +1219,14 @@ { "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.16, "steal": 0.00, "irq": 0.33, "soft": 0.20, "guest": 0.00, "gnice": 0.00, "idle": 71.71}, + {"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": "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.26, "steal": 0.00, "irq": 0.13, "soft": 0.13, "guest": 0.00, "gnice": 0.00, "idle": 94.90} + {"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} ], "process-and-context-switch": {"proc": 3.66, "cswch": 64945.01}, "interrupts": [ diff --git a/tests/expected.sadf-p b/tests/expected.sadf-p index 9c5134e..7eb87d9 100644 --- a/tests/expected.sadf-p +++ b/tests/expected.sadf-p @@ -88,16 +88,16 @@ SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC cpu7 %soft 0.06 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC cpu7 %guest 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC cpu7 %gnice 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC cpu7 %idle 96.18 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC all %usr 2.28 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC all %usr 1.64 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC all %nice 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC all %sys 1.55 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC all %iowait 0.50 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC all %sys 1.11 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC all %iowait 28.40 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC all %steal 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC all %irq 0.19 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC all %soft 0.19 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC all %irq 0.13 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC all %soft 0.14 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC all %guest 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC all %gnice 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC all %idle 95.29 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC all %idle 68.57 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu0 %usr 1.25 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu0 %nice 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu0 %sys 1.51 @@ -158,26 +158,26 @@ SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu5 %soft 0.10 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu5 %guest 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu5 %gnice 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu5 %idle 94.71 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu7 %usr 0.83 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu7 %usr 0.25 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu7 %nice 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu7 %sys 0.83 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu7 %iowait 0.10 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu7 %sys 0.25 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu7 %iowait 70.04 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu7 %steal 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu7 %irq 0.10 -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 %irq 0.03 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu7 %soft 0.02 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.08 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC cpu7 %idle 29.42 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 %iowait 0.16 +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 %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.71 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC all %idle 71.70 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 @@ -241,13 +241,13 @@ SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu5 %idle 93.02 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu7 %usr 3.23 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu7 %nice 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu7 %sys 1.35 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu7 %iowait 0.26 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu7 %iowait 0.36 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu7 %steal 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC cpu7 %irq 0.13 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.90 +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 diff --git a/tests/expected.sadf-r b/tests/expected.sadf-r index e00d458..6bb2ae7 100644 --- a/tests/expected.sadf-r +++ b/tests/expected.sadf-r @@ -12,7 +12,7 @@ 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; # 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; 58202; %steal; 0; 0; %irq; 27711; 27773; %soft; 25869; 25908; %guest; 0; 0; %gnice; 0; 0; %idle; 2927065; 2947791; +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; 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; @@ -20,10 +20,10 @@ 13:20:29 UTC; CPU; 4; %usr; 12827; 12934; %nice; 293975; 293975; %sys; 7985; 8052; %iowait; 9350; 9376; %steal; 0; 0; %irq; 3472; 3482; %soft; 5338; 5343; %guest; 0; 0; %gnice; 0; 0; %idle; 387774; 390667; 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; 7294; 7297; %steal; 0; 0; %irq; 2104; 2107; %soft; 979; 981; %guest; 0; 0; %gnice; 0; 0; %idle; 583650; 586709; +13:20:29 UTC; CPU; 7; %usr; 16369; 16395; %nice; 100925; 100925; %sys; 9098; 9124; %iowait; 0; 7293; %steal; 0; 0; %irq; 2104; 2107; %soft; 979; 981; %guest; 0; 0; %gnice; 0; 0; %idle; 583650; 586713; # 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; 58202; 58263; %steal; 0; 0; %irq; 27773; 27878; %soft; 25908; 25972; %guest; 0; 0; %gnice; 0; 0; %idle; 2947791; 2972869; +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; 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; @@ -31,7 +31,7 @@ 13:20:39 UTC; CPU; 4; %usr; 12934; 13053; %nice; 293975; 295169; %sys; 8052; 8139; %iowait; 9376; 9376; %steal; 0; 0; %irq; 3482; 3501; %soft; 5343; 5350; %guest; 0; 0; %gnice; 0; 0; %idle; 390667; 393070; 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; 7297; 7307; %steal; 0; 0; %irq; 2107; 2112; %soft; 981; 986; %guest; 0; 0; %gnice; 0; 0; %idle; 586709; 590355; +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; # 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; diff --git a/tests/expected.sadf-x b/tests/expected.sadf-x index 0e9fa67..63d82ef 100644 --- a/tests/expected.sadf-x +++ b/tests/expected.sadf-x @@ -646,14 +646,14 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - + - + @@ -1275,14 +1275,14 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - + - + diff --git a/tests/expected.sar-D b/tests/expected.sar-D index b60b9b1..e87a71f 100644 --- a/tests/expected.sar-D +++ b/tests/expected.sar-D @@ -2,5 +2,5 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 05/02/19 _x86_64_ (8 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 -00:00:05 all 2.28 0.00 1.93 0.50 0.00 95.29 -Average: all 2.20 7.13 2.17 0.28 0.00 88.21 +00:00:05 all 1.64 0.00 1.38 28.40 0.00 68.57 +Average: all 2.20 7.13 2.17 0.27 0.00 88.22 diff --git a/tests/expected.sar-ISO b/tests/expected.sar-ISO index ce034d9..13f0567 100644 --- a/tests/expected.sar-ISO +++ b/tests/expected.sar-ISO @@ -2,8 +2,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 2019-04-18 _x86_64_ (8 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.50 0.00 95.29 -13:20:39 all 2.66 23.20 2.27 0.16 0.00 71.71 +13:20:29 all 1.64 0.00 1.38 28.40 0.00 68.57 +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 diff --git a/tests/expected.sar-all b/tests/expected.sar-all index 5469851..ccbe16f 100644 --- a/tests/expected.sar-all +++ b/tests/expected.sar-all @@ -10,22 +10,22 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:19 5 1.65 0.00 2.33 0.00 0.00 0.36 0.10 0.00 0.00 95.57 13:20:19 6 2.41 0.00 2.03 0.16 0.00 0.48 0.10 0.00 0.00 94.82 13:20:19 7 2.89 0.00 0.74 0.06 0.00 0.06 0.06 0.00 0.00 96.18 -13:20:29 all 2.28 0.00 1.55 0.50 0.00 0.19 0.19 0.00 0.00 95.29 +13:20:29 all 1.64 0.00 1.11 28.40 0.00 0.13 0.14 0.00 0.00 68.57 13:20:29 0 1.25 0.00 1.51 0.35 0.00 0.19 0.58 0.00 0.00 96.12 13:20:29 1 2.15 0.00 0.96 0.77 0.00 0.10 0.16 0.00 0.00 95.87 13:20:29 2 3.27 0.00 1.73 0.77 0.00 0.22 0.10 0.00 0.00 93.90 13:20:29 3 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 100.00 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.10 0.00 0.10 0.06 0.00 0.00 98.08 -13:20:39 all 2.66 23.20 1.74 0.16 0.00 0.33 0.20 0.00 0.00 71.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 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 13:20:39 3 2.33 44.73 1.03 0.01 0.00 0.29 0.16 0.00 0.00 51.44 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.26 0.00 0.13 0.13 0.00 0.00 94.90 +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: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 diff --git a/tests/expected.sar-always b/tests/expected.sar-always index 1899b9f..909fcea 100644 --- a/tests/expected.sar-always +++ b/tests/expected.sar-always @@ -2,8 +2,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 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.50 0.00 95.29 -13:20:39  all 2.66 23.20 2.27 0.16 0.00 71.71 +13:20:29  all 1.64 0.00 1.38 28.40 0.00 68.57 +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 diff --git a/tests/expected.sar-autonever b/tests/expected.sar-autonever index ce034d9..13f0567 100644 --- a/tests/expected.sar-autonever +++ b/tests/expected.sar-autonever @@ -2,8 +2,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 2019-04-18 _x86_64_ (8 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.50 0.00 95.29 -13:20:39 all 2.66 23.20 2.27 0.16 0.00 71.71 +13:20:29 all 1.64 0.00 1.38 28.40 0.00 68.57 +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 diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec index 5691e1f..6af7530 100644 --- a/tests/expected.sar-dec +++ b/tests/expected.sar-dec @@ -10,14 +10,14 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:19 5 2 0 2 0 0 0 0 0 0 96 13:20:19 6 2 0 2 0 0 0 0 0 0 95 13:20:19 7 3 0 1 0 0 0 0 0 0 96 -13:20:29 all 2 0 2 0 0 0 0 0 0 95 +13:20:29 all 2 0 1 28 0 0 0 0 0 69 13:20:29 0 1 0 2 0 0 0 1 0 0 96 13:20:29 1 2 0 1 1 0 0 0 0 0 96 13:20:29 2 3 0 2 1 0 0 0 0 0 94 13:20:29 3 0 0 0 0 0 0 0 0 0 100 13:20:29 4 3 0 2 1 0 0 0 0 0 93 13:20:29 5 3 0 2 0 0 0 0 0 0 95 -13:20:29 7 1 0 1 0 0 0 0 0 0 98 +13:20:29 7 0 0 0 70 0 0 0 0 0 29 13:20:39 all 3 23 2 0 0 0 0 0 0 72 13:20:39 0 2 52 1 0 0 0 0 0 0 44 13:20:39 1 3 0 2 1 0 0 0 0 0 93 diff --git a/tests/expected.sar-human b/tests/expected.sar-human index 971f01e..49de77d 100644 --- a/tests/expected.sar-human +++ b/tests/expected.sar-human @@ -10,14 +10,14 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:19 5 1.6% 0.0% 2.3% 0.0% 0.0% 0.4% 0.1% 0.0% 0.0% 95.6% 13:20:19 6 2.4% 0.0% 2.0% 0.2% 0.0% 0.5% 0.1% 0.0% 0.0% 94.8% 13:20:19 7 2.9% 0.0% 0.7% 0.1% 0.0% 0.1% 0.1% 0.0% 0.0% 96.2% -13:20:29 all 2.3% 0.0% 1.5% 0.5% 0.0% 0.2% 0.2% 0.0% 0.0% 95.3% +13:20:29 all 1.6% 0.0% 1.1% 28.4% 0.0% 0.1% 0.1% 0.0% 0.0% 68.6% 13:20:29 0 1.3% 0.0% 1.5% 0.4% 0.0% 0.2% 0.6% 0.0% 0.0% 96.1% 13:20:29 1 2.1% 0.0% 1.0% 0.8% 0.0% 0.1% 0.2% 0.0% 0.0% 95.9% 13:20:29 2 3.3% 0.0% 1.7% 0.8% 0.0% 0.2% 0.1% 0.0% 0.0% 93.9% 13:20:29 3 0.0% 0.0% 0.0% 0.0% 0.0% 0.0% 0.0% 0.0% 0.0% 100.0% 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.1% 0.0% 0.1% 0.1% 0.0% 0.0% 98.1% +13:20:29 7 0.2% 0.0% 0.2% 70.0% 0.0% 0.0% 0.0% 0.0% 0.0% 29.4% 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 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% @@ -25,7 +25,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:39 3 2.3% 44.7% 1.0% 0.0% 0.0% 0.3% 0.2% 0.0% 0.0% 51.4% 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.3% 0.0% 0.1% 0.1% 0.0% 0.0% 94.9% +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: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% diff --git a/tests/expected.sar-i b/tests/expected.sar-i index 5670e90..1f1aee2 100644 --- a/tests/expected.sar-i +++ b/tests/expected.sar-i @@ -1,22 +1,22 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:09 CPU %user %nice %system %iowait %steal %idle -13:20:29 all 2.19 7.68 2.14 0.29 0.00 87.70 +13:20:29 all 2.19 7.68 2.14 0.28 0.00 87.71 13:20:29 0 1.98 0.02 2.70 0.18 0.00 95.13 13:20:29 1 2.50 0.00 3.17 0.39 0.00 93.94 13:20:29 2 2.76 0.02 1.96 0.72 0.00 94.54 13:20:29 3 0.00 99.55 0.45 0.00 0.00 0.00 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.08 0.00 97.13 -13:20:39 all 2.66 23.20 2.27 0.16 0.00 71.71 +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 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 13:20:39 3 2.33 44.73 1.48 0.01 0.00 51.44 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.26 0.00 94.90 +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: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 diff --git a/tests/expected.sar-se b/tests/expected.sar-se index 57fd189..558d91f 100644 --- a/tests/expected.sar-se +++ b/tests/expected.sar-se @@ -1,5 +1,5 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:29 CPU %user %nice %system %iowait %steal %idle -13:20:39 all 2.66 23.20 2.27 0.16 0.00 71.71 -Average: all 2.66 23.20 2.27 0.16 0.00 71.71 +13:20:39 all 2.66 23.20 2.27 0.17 0.00 71.70 +Average: all 2.66 23.20 2.27 0.17 0.00 71.70 diff --git a/tests/expected.sar-u b/tests/expected.sar-u index e96ac32..de5db7d 100644 --- a/tests/expected.sar-u +++ b/tests/expected.sar-u @@ -10,22 +10,22 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:19 5 1.65 0.00 2.78 0.00 0.00 95.57 13:20:19 6 2.41 0.00 2.60 0.16 0.00 94.82 13:20:19 7 2.89 0.00 0.87 0.06 0.00 96.18 -13:20:29 all 2.28 0.00 1.93 0.50 0.00 95.29 +13:20:29 all 1.64 0.00 1.38 28.40 0.00 68.57 13:20:29 0 1.25 0.00 2.28 0.35 0.00 96.12 13:20:29 1 2.15 0.00 1.22 0.77 0.00 95.87 13:20:29 2 3.27 0.00 2.05 0.77 0.00 93.90 13:20:29 3 0.00 0.00 0.00 0.00 0.00 100.00 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.10 0.00 98.08 -13:20:39 all 2.66 23.20 2.27 0.16 0.00 71.71 +13:20:29 7 0.25 0.00 0.30 70.04 0.00 29.42 +13:20:39 all 2.66 23.20 2.27 0.17 0.00 71.70 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 13:20:39 3 2.33 44.73 1.48 0.01 0.00 51.44 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.26 0.00 94.90 +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: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 diff --git a/tests/expected.sar1 b/tests/expected.sar1 index 15770bc..0cfa7b9 100644 --- a/tests/expected.sar1 +++ b/tests/expected.sar1 @@ -2,5 +2,5 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 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 -00:00:02 all 2.28 0.00 1.93 0.50 0.00 95.29 -Average: all 2.20 7.13 2.17 0.28 0.00 88.21 +00:00:02 all 1.64 0.00 1.38 28.40 0.00 68.57 +Average: all 2.20 7.13 2.17 0.27 0.00 88.22 diff --git a/tests/expected2.sadf-g b/tests/expected2.sadf-g index cef74a5..594b730 100644 --- a/tests/expected2.sadf-g +++ b/tests/expected2.sadf-g @@ -79,16 +79,16 @@ (Min, Max values) -%usr (2.15, 6.53) +%usr (1.64, 6.53) %nice (0.00, 23.20) -%sys (1.55, 3.44) -%iowait (0.12, 0.77) +%sys (1.11, 3.44) +%iowait (0.12, 28.40) %steal (0.00, 0.00) -%irq (0.19, 0.96) -%soft (0.19, 0.38) +%irq (0.13, 0.96) +%soft (0.14, 0.38) %guest (0.00, 0.00) %gnice (0.00, 0.00) -%idle (71.71, 95.29) +%idle (68.57, 82.88) SYSSTAT.TEST 04/18/19 @@ -129,25 +129,25 @@ 0:00 - + - + - + - + - + - + @@ -697,16 +697,16 @@ (Min, Max values) -%usr (0.83, 7.81) +%usr (0.25, 7.81) %nice (0.00, 0.00) -%sys (0.74, 4.38) -%iowait (0.06, 0.32) +%sys (0.25, 4.38) +%iowait (0.06, 70.04) %steal (0.00, 0.00) -%irq (0.06, 0.63) -%soft (0.06, 0.23) +%irq (0.03, 0.63) +%soft (0.02, 0.23) %guest (0.00, 0.00) %gnice (0.00, 0.00) -%idle (86.63, 98.08) +%idle (29.42, 96.18) SYSSTAT.TEST 04/18/19 @@ -747,22 +747,22 @@ 0:00 - + - + - + - + - + - + diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all index d0e4542..9595c6f 100644 --- a/tests/expected2.sar-all +++ b/tests/expected2.sar-all @@ -10,22 +10,22 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:19 5 1.65 0.00 2.33 0.00 0.00 0.36 0.10 0.00 0.00 95.57 13:20:19 6 2.41 0.00 2.03 0.16 0.00 0.48 0.10 0.00 0.00 94.82 13:20:19 7 2.89 0.00 0.74 0.06 0.00 0.06 0.06 0.00 0.00 96.18 -13:20:29 all 2.28 0.00 1.55 0.50 0.00 0.19 0.19 0.00 0.00 95.29 +13:20:29 all 1.64 0.00 1.11 28.40 0.00 0.13 0.14 0.00 0.00 68.57 13:20:29 0 1.25 0.00 1.51 0.35 0.00 0.19 0.58 0.00 0.00 96.12 13:20:29 1 2.15 0.00 0.96 0.77 0.00 0.10 0.16 0.00 0.00 95.87 13:20:29 2 3.27 0.00 1.73 0.77 0.00 0.22 0.10 0.00 0.00 93.90 13:20:29 3 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 100.00 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.10 0.00 0.10 0.06 0.00 0.00 98.08 -13:20:39 all 2.66 23.20 1.74 0.16 0.00 0.33 0.20 0.00 0.00 71.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 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 13:20:39 3 2.33 44.73 1.03 0.01 0.00 0.29 0.16 0.00 0.00 51.44 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.26 0.00 0.13 0.13 0.00 0.00 94.90 +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: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 diff --git a/tests/expected2.sar-u b/tests/expected2.sar-u index 66373b2..0173db5 100644 --- a/tests/expected2.sar-u +++ b/tests/expected2.sar-u @@ -10,22 +10,22 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:19 5 1.65 0.00 2.78 0.00 0.00 95.57 13:20:19 6 2.41 0.00 2.60 0.16 0.00 94.82 13:20:19 7 2.89 0.00 0.87 0.06 0.00 96.18 -13:20:29 all 2.28 0.00 1.93 0.50 0.00 95.29 +13:20:29 all 1.64 0.00 1.38 28.40 0.00 68.57 13:20:29 0 1.25 0.00 2.28 0.35 0.00 96.12 13:20:29 1 2.15 0.00 1.22 0.77 0.00 95.87 13:20:29 2 3.27 0.00 2.05 0.77 0.00 93.90 13:20:29 3 0.00 0.00 0.00 0.00 0.00 100.00 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.10 0.00 98.08 -13:20:39 all 2.66 23.20 2.27 0.16 0.00 71.71 +13:20:29 7 0.25 0.00 0.30 70.04 0.00 29.42 +13:20:39 all 2.66 23.20 2.27 0.17 0.00 71.70 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 13:20:39 3 2.33 44.73 1.48 0.01 0.00 51.44 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.26 0.00 94.90 +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: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 diff --git a/tests/expected3.sadf-g b/tests/expected3.sadf-g index 311e136..b8a0b24 100644 --- a/tests/expected3.sadf-g +++ b/tests/expected3.sadf-g @@ -9,10 +9,10 @@ (Min, Max values) -%user (2.15, 6.53) +%user (1.64, 6.53) %nice (0.00, 23.20) -%system (1.93, 4.42) -%iowait (0.12, 0.77) +%system (1.38, 4.42) +%iowait (0.12, 28.40) %steal (0.00, 0.00) 0. @@ -48,16 +48,16 @@ 13:54:29 UTC - + - + - + diff --git a/tests/expected3.sar-i b/tests/expected3.sar-i index 1001c73..4c5a418 100644 --- a/tests/expected3.sar-i +++ b/tests/expected3.sar-i @@ -1,8 +1,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:09 CPU %user %nice %system %iowait %steal %idle -13:20:29 all 2.19 7.68 2.14 0.29 0.00 87.70 -13:20:39 all 2.66 23.20 2.27 0.16 0.00 71.71 +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:37:29 LINUX RESTART (8 CPU) diff --git a/tests/expected33.sar-u b/tests/expected33.sar-u index 846a1db..e4f8fcb 100644 --- a/tests/expected33.sar-u +++ b/tests/expected33.sar-u @@ -6,5 +6,5 @@ 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) 00:00:00 CPU %user %nice %system %iowait %steal %idle -00:00:01 all 2.28 0.00 1.93 0.50 0.00 95.29 -Average: all 2.28 0.00 1.93 0.50 0.00 95.29 +00:00:01 all 1.64 0.00 1.38 28.40 0.00 68.57 +Average: all 1.64 0.00 1.38 28.40 0.00 68.57 diff --git a/tests/root.README b/tests/root.README index 59ed70f..8a5f724 100644 --- a/tests/root.README +++ b/tests/root.README @@ -28,6 +28,7 @@ PID: /proc/stat CPU#3: tickless CPU#6: offline +CPU#7: iowait decremented /proc/diskstats sda, sda1: counters increase diff --git a/tests/root3/proc/stat b/tests/root3/proc/stat index 52f053d..13baf20 100644 --- a/tests/root3/proc/stat +++ b/tests/root3/proc/stat @@ -1,11 +1,11 @@ -cpu 95612 2584890 53235 2947791 58202 27773 25908 0 0 0 +cpu 95612 2584890 53235 2947795 58198 27773 25908 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 cpu3 7806 556818 3683 141836 5620 4354 1711 0 0 0 cpu4 12934 293975 8052 390667 9376 3482 5343 0 0 0 cpu5 12544 308545 6813 384212 7913 3110 1077 0 0 0 -cpu7 16395 100925 9124 586709 7297 2107 981 0 0 0 +cpu7 16395 100925 9124 586713 7293 2107 981 0 0 0 intr 96974734 8 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 10536 807 0 181938 0 0 0 147948 221678 0 0 0 0 0 0 0 0 54232 765098 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 134044213 btime 1555568347 -- 2.40.0