Update non regression tests

Take into account fix for iowait being decremented.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/tests/expected.mpstat-A b/tests/expected.mpstat-A
index 5e78b9ba16ad5134b8cfcd21ba5227eaf2063e0e..92c4a2d81a5201ba9e6e52810f02c784e31f2527 100644 (file)
--- 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    1.64    0.00    1.11   28.40    0.13    0.14    0.00    0.00    0.00   68.57
+00:00:02     all    2.28    0.00    1.55    0.48    0.19    0.19    0.00    0.00    0.00   95.31
 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.25    0.00    0.25   70.04    0.03    0.02    0.00    0.00    0.00   29.42
+00:00:02       7    0.83    0.00    0.83    0.00    0.10    0.06    0.00    0.00    0.00   98.17
 
 00:00:01    NODE    %usr   %nice    %sys %iowait    %irq   %soft  %steal  %guest  %gnice   %idle
-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     all    2.28    0.00    1.55    0.48    0.19    0.19    0.00    0.00    0.00   95.31
 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.07    0.00    0.73   43.97    0.07    0.06    0.00    0.00    0.00   54.10
+00:00:02       1    1.91    0.00    1.29    0.31    0.13    0.11    0.00    0.00    0.00   96.25
 
 00:00:01     CPU    intr/s
 00:00:02     all  24402.62

diff --git a/tests/expected.mpstat-T b/tests/expected.mpstat-T
index 3664991096580e5f7ea8c4c858ce9b2e46fc278e..b2ab9eaeabc1b49b658c548837effaec1fc725ec 100644 (file)
--- a/tests/expected.mpstat-T
+++ b/tests/expected.mpstat-T
@@ -12,14 +12,14 @@ 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                   1.64    0.00    1.11   28.40    0.13    0.14    0.00    0.00    0.00   68.57
+00:00:02     all                   2.28    0.00    1.55    0.48    0.19    0.19    0.00    0.00    0.00   95.31
 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.25    0.00    0.25   70.04    0.03    0.02    0.00    0.00    0.00   29.42
+00:00:02       7    3    0    1    0.83    0.00    0.83    0.00    0.10    0.06    0.00    0.00    0.00   98.17
 
 Average:     CPU CORE SOCK 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

diff --git a/tests/expected.sa1 b/tests/expected.sa1
index 915992cd4e4eecdb548bbd113c5254611e737eab..d957ada1875f0f1691e7e9f23cbeef1f942520a2 100644 (file)
--- 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      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
+13:20:49        all      2.28      0.00      1.93      0.48      0.00     95.31
+Average:        all      2.28      0.00      1.93      0.48      0.00     95.31

diff --git a/tests/expected.sa2 b/tests/expected.sa2
index b5f26a0cd489e6f0f2f00042b3de2973b774d2b0..ebb026f2796e9efb1c46957d153798688046a174 100644 (file)
--- 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      1.64      0.00      1.11     28.40      0.00      0.13      0.14      0.00      0.00     68.57
+13:20:49        all      2.28      0.00      1.55      0.48      0.00      0.19      0.19      0.00      0.00     95.31
 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.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
+13:20:49          7      0.83      0.00      0.83      0.00      0.00      0.10      0.06      0.00      0.00     98.17
+Average:        all      2.28      0.00      1.55      0.48      0.00      0.19      0.19      0.00      0.00     95.31
 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.25      0.00      0.25     70.04      0.00      0.03      0.02      0.00      0.00     29.42
+Average:          7      0.83      0.00      0.83      0.00      0.00      0.10      0.06      0.00      0.00     98.17
 
 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 66498c8f0604b6c857ca98c387680c9911c69b35..4780ee53c3056fe584ecb7903cf4837f4b88d2b2 100644 (file)
--- a/tests/expected.sadf-d
+++ b/tests/expected.sadf-d
@@ -8,14 +8,14 @@ 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;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;-1;2.28;0.00;1.55;0.48;0.00;0.19;0.19;0.00;0.00;95.31
 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.25;0.00;0.25;70.04;0.00;0.03;0.02;0.00;0.00;29.42
+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;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

diff --git a/tests/expected.sadf-d-qu b/tests/expected.sadf-d-qu
index fdef601a825ea2bcb2ad8246218e7f65320d8f37..0053519bfd5724e18d20e78d9a906ca254e8eba3 100644 (file)
--- a/tests/expected.sadf-d-qu
+++ b/tests/expected.sadf-d-qu
@@ -1,6 +1,6 @@
 # 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;1.64;0.00;1.38;28.40;0.00;68.57
+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
 # hostname;interval;timestamp;runq-sz;plist-sz;ldavg-1;ldavg-5;ldavg-15;blocked

diff --git a/tests/expected.sadf-g b/tests/expected.sadf-g
index bb582483b8da5c2b6abc11367385e9d68598b926..69d2a38acc3325dfb8ef9e0db2e5ea1aba8b48d1 100644 (file)
--- a/tests/expected.sadf-g
+++ b/tests/expected.sadf-g
@@ -9,13 +9,13 @@
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
-<text x="795" y="50" style="fill: #00cc00; stroke: none; font-size: 12px">%usr (1.64, 6.53)</text>
+<text x="795" y="50" style="fill: #00cc00; stroke: none; font-size: 12px">%usr (2.15, 6.53)</text>
 <text x="795" y="65" style="fill: #ff00bf; stroke: none; font-size: 12px">%nice (0.00, 23.20)</text>
-<text x="795" y="80" style="fill: #00ffff; stroke: none; font-size: 12px">%sys (1.11, 3.44)</text>
-<text x="795" y="95" style="fill: #ff0000; stroke: none; font-size: 12px">%iowait (0.12, 28.40)</text>
+<text x="795" y="80" style="fill: #00ffff; stroke: none; font-size: 12px">%sys (1.55, 3.44)</text>
+<text x="795" y="95" style="fill: #ff0000; stroke: none; font-size: 12px">%iowait (0.12, 0.77)</text>
 <text x="795" y="110" style="fill: #e85f00; stroke: none; font-size: 12px">%steal (0.00, 0.00)</text>
-<text x="795" y="125" style="fill: #0000ff; stroke: none; font-size: 12px">%irq (0.13, 0.96)</text>
-<text x="795" y="140" style="fill: #006020; stroke: none; font-size: 12px">%soft (0.14, 0.38)</text>
+<text x="795" y="125" style="fill: #0000ff; stroke: none; font-size: 12px">%irq (0.19, 0.96)</text>
+<text x="795" y="140" style="fill: #006020; stroke: none; font-size: 12px">%soft (0.19, 0.38)</text>
 <text x="795" y="155" style="fill: #7030a0; stroke: none; font-size: 12px">%guest (0.00, 0.00)</text>
 <text x="795" y="170" style="fill: #ffff00; stroke: none; font-size: 12px">%gnice (0.00, 0.00)</text>
 <g transform="translate(70,250)">
@@ -52,22 +52,22 @@
 <text x="717" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,717,0)">13:54:29</text>
 <text x="-10" y="30" style="fill: #ffff00; stroke: none; font-size: 12px; text-anchor: end">UTC</text>
 <g style="fill: #00cc00; stroke: none" transform="scale(0.348500,-2.000000)">
-<rect x="0" y="0.00" height="2.15" width="31"/><rect x="0" y="0.00" height="1.64" width="31"/><rect x="0" y="0.00" height="2.66" width="39"/><rect x="18" y="0.00" height="6.53" width="22"/><rect x="2035" y="0.00" height="2.47" width="31"/>
+<rect x="0" y="0.00" height="2.15" width="31"/><rect x="0" y="0.00" height="2.28" width="31"/><rect x="0" y="0.00" height="2.66" width="39"/><rect x="18" y="0.00" height="6.53" width="22"/><rect x="2035" y="0.00" height="2.47" width="31"/>
 </g>
 <g style="fill: #ff00bf; stroke: none" transform="scale(0.348500,-2.000000)">
 <rect x="0" y="2.15" height="12.50" width="31"/><rect x="0" y="2.66" height="23.20" width="39"/><rect x="18" y="6.53" height="9.63" width="22"/><rect x="2035" y="2.47" height="17.21" width="31"/>
 </g>
 <g style="fill: #00ffff; stroke: none" transform="scale(0.348500,-2.000000)">
-<rect x="0" y="14.64" height="1.84" width="31"/><rect x="0" y="1.64" height="1.11" width="31"/><rect x="0" y="25.86" height="1.74" width="39"/><rect x="18" y="16.16" height="3.44" width="22"/><rect x="2035" y="19.68" height="2.21" width="31"/>
+<rect x="0" y="14.64" height="1.84" width="31"/><rect x="0" y="2.28" height="1.55" width="31"/><rect x="0" y="25.86" height="1.74" width="39"/><rect x="18" y="16.16" height="3.44" width="22"/><rect x="2035" y="19.68" height="2.21" width="31"/>
 </g>
 <g style="fill: #ff0000; stroke: none" transform="scale(0.348500,-2.000000)">
-<rect x="0" y="16.48" height="0.12" width="31"/><rect x="0" y="2.75" height="28.40" width="31"/><rect x="0" y="27.60" height="0.17" width="39"/><rect x="18" y="19.60" height="0.54" width="22"/><rect x="2035" y="21.89" height="0.77" width="31"/>
+<rect x="0" y="16.48" height="0.12" width="31"/><rect x="0" y="3.83" height="0.48" width="31"/><rect x="0" y="27.60" height="0.17" width="39"/><rect x="18" y="19.60" height="0.54" width="22"/><rect x="2035" y="21.89" height="0.77" width="31"/>
 </g>
 <g style="fill: #0000ff; stroke: none" transform="scale(0.348500,-2.000000)">
-<rect x="0" y="16.60" height="0.34" width="31"/><rect x="0" y="31.16" height="0.13" width="31"/><rect x="0" y="27.77" height="0.33" width="39"/><rect x="18" y="20.14" height="0.60" width="22"/><rect x="2035" y="22.66" height="0.96" width="31"/>
+<rect x="0" y="16.60" height="0.34" width="31"/><rect x="0" y="4.31" height="0.19" width="31"/><rect x="0" y="27.77" height="0.33" width="39"/><rect x="18" y="20.14" height="0.60" width="22"/><rect x="2035" y="22.66" height="0.96" width="31"/>
 </g>
 <g style="fill: #006020; stroke: none" transform="scale(0.348500,-2.000000)">
-<rect x="0" y="16.93" height="0.19" width="31"/><rect x="0" y="31.29" height="0.14" width="31"/><rect x="0" y="28.10" height="0.20" width="39"/><rect x="18" y="20.74" height="0.38" width="22"/><rect x="2035" y="23.62" height="0.22" width="31"/>
+<rect x="0" y="16.93" height="0.19" width="31"/><rect x="0" y="4.50" height="0.19" width="31"/><rect x="0" y="28.10" height="0.20" width="39"/><rect x="18" y="20.74" height="0.38" width="22"/><rect x="2035" y="23.62" height="0.22" width="31"/>
 </g>
 </g>
 </g>
@@ -547,13 +547,13 @@
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
-<text x="795" y="50" style="fill: #00cc00; stroke: none; font-size: 12px">%usr (0.25, 7.81)</text>
+<text x="795" y="50" style="fill: #00cc00; stroke: none; font-size: 12px">%usr (0.83, 7.81)</text>
 <text x="795" y="65" style="fill: #ff00bf; stroke: none; font-size: 12px">%nice (0.00, 0.00)</text>
-<text x="795" y="80" style="fill: #00ffff; stroke: none; font-size: 12px">%sys (0.25, 4.38)</text>
-<text x="795" y="95" style="fill: #ff0000; stroke: none; font-size: 12px">%iowait (0.06, 70.04)</text>
+<text x="795" y="80" style="fill: #00ffff; stroke: none; font-size: 12px">%sys (0.74, 4.38)</text>
+<text x="795" y="95" style="fill: #ff0000; stroke: none; font-size: 12px">%iowait (0.00, 0.36)</text>
 <text x="795" y="110" style="fill: #e85f00; stroke: none; font-size: 12px">%steal (0.00, 0.00)</text>
-<text x="795" y="125" style="fill: #0000ff; stroke: none; font-size: 12px">%irq (0.03, 0.63)</text>
-<text x="795" y="140" style="fill: #006020; stroke: none; font-size: 12px">%soft (0.02, 0.23)</text>
+<text x="795" y="125" style="fill: #0000ff; stroke: none; font-size: 12px">%irq (0.06, 0.63)</text>
+<text x="795" y="140" style="fill: #006020; stroke: none; font-size: 12px">%soft (0.06, 0.23)</text>
 <text x="795" y="155" style="fill: #7030a0; stroke: none; font-size: 12px">%guest (0.00, 0.00)</text>
 <text x="795" y="170" style="fill: #ffff00; stroke: none; font-size: 12px">%gnice (0.00, 0.00)</text>
 <g transform="translate(70,250)">
@@ -590,19 +590,19 @@
 <text x="717" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,717,0)">13:54:29</text>
 <text x="-10" y="30" style="fill: #ffff00; stroke: none; font-size: 12px; text-anchor: end">UTC</text>
 <g style="fill: #00cc00; stroke: none" transform="scale(0.348500,-2.000000)">
-<rect x="0" y="0.00" height="2.89" width="31"/><rect x="0" y="0.00" height="0.25" width="31"/><rect x="0" y="0.00" height="3.23" width="39"/><rect x="18" y="0.00" height="7.81" width="22"/><rect x="2035" y="0.00" height="2.89" width="31"/>
+<rect x="0" y="0.00" height="2.89" width="31"/><rect x="0" y="0.00" height="0.83" width="31"/><rect x="0" y="0.00" height="3.23" width="39"/><rect x="18" y="0.00" height="7.81" width="22"/><rect x="2035" y="0.00" height="2.89" width="31"/>
 </g>
 <g style="fill: #00ffff; stroke: none" transform="scale(0.348500,-2.000000)">
-<rect x="0" y="2.89" height="0.74" width="31"/><rect x="0" y="0.25" height="0.25" width="31"/><rect x="0" y="3.23" height="1.35" width="39"/><rect x="18" y="7.81" height="4.38" width="22"/><rect x="2035" y="2.89" height="0.74" width="31"/>
+<rect x="0" y="2.89" height="0.74" width="31"/><rect x="0" y="0.83" height="0.83" width="31"/><rect x="0" y="3.23" height="1.35" width="39"/><rect x="18" y="7.81" height="4.38" width="22"/><rect x="2035" y="2.89" height="0.74" width="31"/>
 </g>
 <g style="fill: #ff0000; stroke: none" transform="scale(0.348500,-2.000000)">
-<rect x="0" y="3.63" height="0.06" width="31"/><rect x="0" y="0.50" height="70.04" width="31"/><rect x="0" y="4.58" height="0.36" width="39"/><rect x="18" y="12.20" height="0.32" width="22"/><rect x="2035" y="3.63" height="0.06" width="31"/>
+<rect x="0" y="3.63" height="0.06" width="31"/><rect x="0" y="4.58" height="0.36" width="39"/><rect x="18" y="12.20" height="0.32" width="22"/><rect x="2035" y="3.63" height="0.06" width="31"/>
 </g>
 <g style="fill: #0000ff; stroke: none" transform="scale(0.348500,-2.000000)">
-<rect x="0" y="3.69" height="0.06" width="31"/><rect x="0" y="70.54" height="0.03" width="31"/><rect x="0" y="4.95" height="0.13" width="39"/><rect x="18" y="12.51" height="0.63" width="22"/><rect x="2035" y="3.69" height="0.06" width="31"/>
+<rect x="0" y="3.69" height="0.06" width="31"/><rect x="0" y="1.67" height="0.10" width="31"/><rect x="0" y="4.95" height="0.13" width="39"/><rect x="18" y="12.51" height="0.63" width="22"/><rect x="2035" y="3.69" height="0.06" width="31"/>
 </g>
 <g style="fill: #006020; stroke: none" transform="scale(0.348500,-2.000000)">
-<rect x="0" y="3.76" height="0.06" width="31"/><rect x="0" y="70.57" height="0.02" width="31"/><rect x="0" y="5.08" height="0.13" width="39"/><rect x="18" y="13.14" height="0.23" width="22"/><rect x="2035" y="3.76" height="0.06" width="31"/>
+<rect x="0" y="3.76" height="0.06" width="31"/><rect x="0" y="1.76" height="0.06" width="31"/><rect x="0" y="5.08" height="0.13" width="39"/><rect x="18" y="13.14" height="0.23" width="22"/><rect x="2035" y="3.76" height="0.06" width="31"/>
 </g>
 </g>
 </g>

diff --git a/tests/expected.sadf-g-cc b/tests/expected.sadf-g-cc
index 3509422a40b4eea2a8fe1ed6369af44104d1a589..241a75a3d10c722d31827dac651cbf044673871e 100644 (file)
--- a/tests/expected.sadf-g-cc
+++ b/tests/expected.sadf-g-cc
@@ -9,10 +9,10 @@
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
-<text x="795" y="50" style="fill: #000000; stroke: none; font-size: 12px">%user (1.64, 6.53)</text>
+<text x="795" y="50" style="fill: #000000; stroke: none; font-size: 12px">%user (2.15, 6.53)</text>
 <text x="795" y="65" style="fill: #1a1aff; stroke: none; font-size: 12px">%nice (0.00, 23.20)</text>
-<text x="795" y="80" style="fill: #1affb2; stroke: none; font-size: 12px">%system (1.38, 4.42)</text>
-<text x="795" y="95" style="fill: #b21aff; stroke: none; font-size: 12px">%iowait (0.12, 28.40)</text>
+<text x="795" y="80" style="fill: #1affb2; stroke: none; font-size: 12px">%system (1.93, 4.42)</text>
+<text x="795" y="95" style="fill: #b21aff; stroke: none; font-size: 12px">%iowait (0.12, 0.77)</text>
 <text x="795" y="110" style="fill: #1ab2ff; stroke: none; font-size: 12px">%steal (0.00, 0.00)</text>
 <g transform="translate(70,250)">
 <text x="0" y="0" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">0.</text>
@@ -48,16 +48,16 @@
 <text x="717" y="10" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,717,0)">13:54:29</text>
 <text x="-10" y="30" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">UTC</text>
 <g style="fill: #000000; stroke: none" transform="scale(0.348500,-2.000000)">
-<rect x="0" y="0.00" height="2.15" width="31"/><rect x="0" y="0.00" height="1.64" width="31"/><rect x="0" y="0.00" height="2.66" width="39"/><rect x="18" y="0.00" height="6.53" width="22"/><rect x="2035" y="0.00" height="2.47" width="31"/>
+<rect x="0" y="0.00" height="2.15" width="31"/><rect x="0" y="0.00" height="2.28" width="31"/><rect x="0" y="0.00" height="2.66" width="39"/><rect x="18" y="0.00" height="6.53" width="22"/><rect x="2035" y="0.00" height="2.47" width="31"/>
 </g>
 <g style="fill: #1a1aff; stroke: none" transform="scale(0.348500,-2.000000)">
 <rect x="0" y="2.15" height="12.50" width="31"/><rect x="0" y="2.66" height="23.20" width="39"/><rect x="18" y="6.53" height="9.63" width="22"/><rect x="2035" y="2.47" height="17.21" width="31"/>
 </g>
 <g style="fill: #1affb2; stroke: none" transform="scale(0.348500,-2.000000)">
-<rect x="0" y="14.64" height="2.36" width="31"/><rect x="0" y="1.64" height="1.38" width="31"/><rect x="0" y="25.86" height="2.27" width="39"/><rect x="18" y="16.16" height="4.42" width="22"/><rect x="2035" y="19.68" height="3.39" width="31"/>
+<rect x="0" y="14.64" height="2.36" width="31"/><rect x="0" y="2.28" height="1.93" width="31"/><rect x="0" y="25.86" height="2.27" width="39"/><rect x="18" y="16.16" height="4.42" width="22"/><rect x="2035" y="19.68" height="3.39" width="31"/>
 </g>
 <g style="fill: #b21aff; stroke: none" transform="scale(0.348500,-2.000000)">
-<rect x="0" y="17.00" height="0.12" width="31"/><rect x="0" y="3.03" height="28.40" width="31"/><rect x="0" y="28.13" height="0.17" width="39"/><rect x="18" y="20.58" height="0.54" width="22"/><rect x="2035" y="23.07" height="0.77" width="31"/>
+<rect x="0" y="17.00" height="0.12" width="31"/><rect x="0" y="4.21" height="0.48" width="31"/><rect x="0" y="28.13" height="0.17" width="39"/><rect x="18" y="20.58" height="0.54" width="22"/><rect x="2035" y="23.07" height="0.77" width="31"/>
 </g>
 </g>
 </g>

diff --git a/tests/expected.sadf-j b/tests/expected.sadf-j
index 0afd309f19884a5c5569049ad114ce538ab86a64..a574459a5d695c0bbab27e372434287ecb697ea2 100644 (file)
--- 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": 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": "all", "usr": 2.28, "nice": 0.00, "sys": 1.55, "iowait": 0.48, "steal": 0.00, "irq": 0.19, "soft": 0.19, "guest": 0.00, "gnice": 0.00, "idle": 95.31},
                                                {"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.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}
+                                               {"cpu": "7", "usr": 0.83, "nice": 0.00, "sys": 0.83, "iowait": 0.00, "steal": 0.00, "irq": 0.10, "soft": 0.06, "guest": 0.00, "gnice": 0.00, "idle": 98.17}
                                        ],
                                        "process-and-context-switch": {"proc": 4.83, "cswch": 46287.74},
                                        "interrupts": [

diff --git a/tests/expected.sadf-p b/tests/expected.sadf-p
index 7eb87d9b5af2bffcbe3e98b7673e14809383dfb4..6a1f7b780b370afcc9eadb7d91f34c2a9aa3615c 100644 (file)
--- 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    1.64
+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     %nice   0.00
-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     %sys    1.55
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC all     %iowait 0.48
 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.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     %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     %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   68.57
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC all     %idle   95.31
 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,16 +158,16 @@ 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.25
+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    %nice   0.00
-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    %sys    0.83
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC cpu7    %iowait 0.00
 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.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    %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    %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   29.42
+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

diff --git a/tests/expected.sadf-r b/tests/expected.sadf-r
index 6bb2ae75d63daff86b48d474bb5600971bd685ed..9ef690f83507761f5200858d0570f408c2f08c9f 100644 (file)
--- a/tests/expected.sadf-r
+++ b/tests/expected.sadf-r
@@ -20,7 +20,7 @@
 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; 0; 7293; %steal; 0; 0; %irq; 2104; 2107; %soft; 979; 981; %guest; 0; 0; %gnice; 0; 0; %idle; 583650; 586713;
+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;
 # 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;

diff --git a/tests/expected.sadf-x b/tests/expected.sadf-x
index 63d82ef59ffb2c298b81b104aa61fdc293c65f2d..1416fb9800563baa0407d3f910a477743a9e368b 100644 (file)
--- a/tests/expected.sadf-x
+++ b/tests/expected.sadf-x
@@ -646,14 +646,14 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                        </timestamp>
                        <timestamp date="2019-04-18" time="13:20:29" utc="1" interval="31">
                                <cpu-load>
-                                       <cpu number="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 number="all" usr="2.28" nice="0.00" sys="1.55" iowait="0.48" steal="0.00" irq="0.19" soft="0.19" guest="0.00" gnice="0.00" idle="95.31"/>
                                        <cpu number="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 number="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 number="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 number="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 number="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 number="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 number="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"/>
+                                       <cpu number="7" usr="0.83" nice="0.00" sys="0.83" iowait="0.00" steal="0.00" irq="0.10" soft="0.06" guest="0.00" gnice="0.00" idle="98.17"/>
                                </cpu-load>
                                <process-and-context-switch per="second" proc="4.83" cswch="46287.74"/>
                                <interrupts>

diff --git a/tests/expected.sar-D b/tests/expected.sar-D
index e87a71fa7b7561af67f9306bfae129c218e2f624..eaf3d7116999f6dfa4332c61795cde4f4960dd7e 100644 (file)
--- 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      1.64      0.00      1.38     28.40      0.00     68.57
+00:00:05        all      2.28      0.00      1.93      0.48      0.00     95.31
 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 13f0567f8b4745621b88a33c3be0c7055bff4186..ff0ca97c337bfd29466dcb58d8815109388486c0 100644 (file)
--- a/tests/expected.sar-ISO
+++ b/tests/expected.sar-ISO
@@ -2,7 +2,7 @@ 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      1.64      0.00      1.38     28.40      0.00     68.57
+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

diff --git a/tests/expected.sar-all b/tests/expected.sar-all
index ccbe16f6a47a50d46b4f75e6e20cbd8a3d2f3e5b..fb2a83fd50b267425ae9b8f309dd75edaa6241a1 100644 (file)
--- a/tests/expected.sar-all
+++ b/tests/expected.sar-all
@@ -10,14 +10,14 @@ 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      1.64      0.00      1.11     28.40      0.00      0.13      0.14      0.00      0.00     68.57
+13:20:29        all      2.28      0.00      1.55      0.48      0.00      0.19      0.19      0.00      0.00     95.31
 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.25      0.00      0.25     70.04      0.00      0.03      0.02      0.00      0.00     29.42
+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          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

diff --git a/tests/expected.sar-always b/tests/expected.sar-always
index 909fcea7104ab0df6d457edc344f4e25721d348a..c079ea3215ca306a99b867df0f182ac9f4a1f568 100644 (file)
--- a/tests/expected.sar-always
+++ b/tests/expected.sar-always
@@ -2,7 +2,7 @@ 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   \e[32;22m     all\e[0m\e[34;1m      2.15\e[0m\e[34;1m     12.50\e[0m\e[34;1m      2.36\e[0m\e[34;1m      0.12\e[0m\e[36;22m      0.00\e[0m\e[31;1m     82.88\e[0m
-13:20:29   \e[32;22m     all\e[0m\e[34;1m      1.64\e[0m\e[36;22m      0.00\e[0m\e[34;1m      1.38\e[0m\e[34;1m     28.40\e[0m\e[36;22m      0.00\e[0m\e[35;1m     68.57\e[0m
+13:20:29   \e[32;22m     all\e[0m\e[34;1m      2.28\e[0m\e[36;22m      0.00\e[0m\e[34;1m      1.93\e[0m\e[34;1m      0.48\e[0m\e[36;22m      0.00\e[0m\e[31;1m     95.31\e[0m
 13:20:39   \e[32;22m     all\e[0m\e[34;1m      2.66\e[0m\e[34;1m     23.20\e[0m\e[34;1m      2.27\e[0m\e[34;1m      0.17\e[0m\e[36;22m      0.00\e[0m\e[35;1m     71.70\e[0m
 13:20:49   \e[32;22m     all\e[0m\e[34;1m      6.53\e[0m\e[34;1m      9.63\e[0m\e[34;1m      4.42\e[0m\e[34;1m      0.54\e[0m\e[36;22m      0.00\e[0m\e[31;1m     78.89\e[0m
 Average:   \e[32;22m     all\e[0m\e[34;1m      3.51\e[0m\e[34;1m     13.20\e[0m\e[34;1m      2.85\e[0m\e[34;1m      0.31\e[0m\e[36;22m      0.00\e[0m\e[31;1m     80.13\e[0m

diff --git a/tests/expected.sar-autonever b/tests/expected.sar-autonever
index 13f0567f8b4745621b88a33c3be0c7055bff4186..ff0ca97c337bfd29466dcb58d8815109388486c0 100644 (file)
--- a/tests/expected.sar-autonever
+++ b/tests/expected.sar-autonever
@@ -2,7 +2,7 @@ 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      1.64      0.00      1.38     28.40      0.00     68.57
+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

diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec
index 6af7530584c55ef4f603cc946cf066f4b0d29e74..5691e1f84c29d677651268788ee49636fdc923ef 100644 (file)
--- 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         1        28         0         0         0         0         0        69
+13:20:29        all         2         0         2         0         0         0         0         0         0        95
 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         0         0         0        70         0         0         0         0         0        29
+13:20:29          7         1         0         1         0         0         0         0         0         0        98
 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 49de77d49b429bbfaa75062b164243d025bd27b3..4e5fe84f6f58e9c1444f0bd126a2505d5077d750 100644 (file)
--- 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      1.6%      0.0%      1.1%     28.4%      0.0%      0.1%      0.1%      0.0%      0.0%     68.6%
+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          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.2%      0.0%      0.2%     70.0%      0.0%      0.0%      0.0%      0.0%      0.0%     29.4%
+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          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%

diff --git a/tests/expected.sar-u b/tests/expected.sar-u
index de5db7db3fe7fc980911bdfaedd3c0c76354e96c..85d2a8b83c86fa87fb17e2eddff6a9e39fe99ce1 100644 (file)
--- a/tests/expected.sar-u
+++ b/tests/expected.sar-u
@@ -10,14 +10,14 @@ 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      1.64      0.00      1.38     28.40      0.00     68.57
+13:20:29        all      2.28      0.00      1.93      0.48      0.00     95.31
 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.25      0.00      0.30     70.04      0.00     29.42
+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          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

diff --git a/tests/expected.sar1 b/tests/expected.sar1
index 0cfa7b902d634d8910a829ff20a9fbf7776c9011..1ae5d18a558a01ee148ce9eb4803c52ae31b63e1 100644 (file)
--- 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      1.64      0.00      1.38     28.40      0.00     68.57
+00:00:02        all      2.28      0.00      1.93      0.48      0.00     95.31
 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 594b7305544a1ac2b54e73e75720b2e4069624b8..5c7baf30dcfab7fd638a993d2e03b51954ee24d0 100644 (file)
--- a/tests/expected2.sadf-g
+++ b/tests/expected2.sadf-g
@@ -79,16 +79,16 @@
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
-<text x="795" y="50" style="fill: #696969; stroke: none; font-size: 12px">%usr (1.64, 6.53)</text>
+<text x="795" y="50" style="fill: #696969; stroke: none; font-size: 12px">%usr (2.15, 6.53)</text>
 <text x="795" y="65" style="fill: #bebebe; stroke: none; font-size: 12px">%nice (0.00, 23.20)</text>
-<text x="795" y="80" style="fill: #000000; stroke: none; font-size: 12px">%sys (1.11, 3.44)</text>
-<text x="795" y="95" style="fill: #a9a9a9; stroke: none; font-size: 12px">%iowait (0.12, 28.40)</text>
+<text x="795" y="80" style="fill: #000000; stroke: none; font-size: 12px">%sys (1.55, 3.44)</text>
+<text x="795" y="95" style="fill: #a9a9a9; stroke: none; font-size: 12px">%iowait (0.12, 0.77)</text>
 <text x="795" y="110" style="fill: #708090; stroke: none; font-size: 12px">%steal (0.00, 0.00)</text>
-<text x="795" y="125" style="fill: #c0c0c0; stroke: none; font-size: 12px">%irq (0.13, 0.96)</text>
-<text x="795" y="140" style="fill: #808080; stroke: none; font-size: 12px">%soft (0.14, 0.38)</text>
+<text x="795" y="125" style="fill: #c0c0c0; stroke: none; font-size: 12px">%irq (0.19, 0.96)</text>
+<text x="795" y="140" style="fill: #808080; stroke: none; font-size: 12px">%soft (0.19, 0.38)</text>
 <text x="795" y="155" style="fill: #d3d3d3; stroke: none; font-size: 12px">%guest (0.00, 0.00)</text>
 <text x="795" y="170" style="fill: #909090; stroke: none; font-size: 12px">%gnice (0.00, 0.00)</text>
-<text x="795" y="185" style="fill: #696969; stroke: none; font-size: 12px">%idle (68.57, 82.88)</text>
+<text x="795" y="185" style="fill: #696969; stroke: none; font-size: 12px">%idle (71.70, 95.31)</text>
 <text x="1045" y="250" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">SYSSTAT.TEST
 <tspan x="1045" y="264" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">04/18/19</tspan>
 </text>
@@ -129,25 +129,25 @@
 <polyline points="86400,0 86400,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
 <text x="705" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 0:00</text>
 <g style="fill: #696969; stroke: none" transform="scale(0.008333,-2.000000)">
-<rect x="47988" y="0.00" height="2.15" width="31"/><rect x="47998" y="0.00" height="1.64" width="31"/><rect x="48000" y="0.00" height="2.66" width="39"/><rect x="48027" y="0.00" height="6.53" width="22"/><rect x="50044" y="0.00" height="2.47" width="31"/>
+<rect x="47988" y="0.00" height="2.15" width="31"/><rect x="47998" y="0.00" height="2.28" width="31"/><rect x="48000" y="0.00" height="2.66" width="39"/><rect x="48027" y="0.00" height="6.53" width="22"/><rect x="50044" y="0.00" height="2.47" width="31"/>
 </g>
 <g style="fill: #bebebe; stroke: none" transform="scale(0.008333,-2.000000)">
 <rect x="47988" y="2.15" height="12.50" width="31"/><rect x="48000" y="2.66" height="23.20" width="39"/><rect x="48027" y="6.53" height="9.63" width="22"/><rect x="50044" y="2.47" height="17.21" width="31"/>
 </g>
 <g style="fill: #000000; stroke: none" transform="scale(0.008333,-2.000000)">
-<rect x="47988" y="14.64" height="1.84" width="31"/><rect x="47998" y="1.64" height="1.11" width="31"/><rect x="48000" y="25.86" height="1.74" width="39"/><rect x="48027" y="16.16" height="3.44" width="22"/><rect x="50044" y="19.68" height="2.21" width="31"/>
+<rect x="47988" y="14.64" height="1.84" width="31"/><rect x="47998" y="2.28" height="1.55" width="31"/><rect x="48000" y="25.86" height="1.74" width="39"/><rect x="48027" y="16.16" height="3.44" width="22"/><rect x="50044" y="19.68" height="2.21" width="31"/>
 </g>
 <g style="fill: #a9a9a9; stroke: none" transform="scale(0.008333,-2.000000)">
-<rect x="47988" y="16.48" height="0.12" width="31"/><rect x="47998" y="2.75" height="28.40" width="31"/><rect x="48000" y="27.60" height="0.17" width="39"/><rect x="48027" y="19.60" height="0.54" width="22"/><rect x="50044" y="21.89" height="0.77" width="31"/>
+<rect x="47988" y="16.48" height="0.12" width="31"/><rect x="47998" y="3.83" height="0.48" width="31"/><rect x="48000" y="27.60" height="0.17" width="39"/><rect x="48027" y="19.60" height="0.54" width="22"/><rect x="50044" y="21.89" height="0.77" width="31"/>
 </g>
 <g style="fill: #c0c0c0; stroke: none" transform="scale(0.008333,-2.000000)">
-<rect x="47988" y="16.60" height="0.34" width="31"/><rect x="47998" y="31.16" height="0.13" width="31"/><rect x="48000" y="27.77" height="0.33" width="39"/><rect x="48027" y="20.14" height="0.60" width="22"/><rect x="50044" y="22.66" height="0.96" width="31"/>
+<rect x="47988" y="16.60" height="0.34" width="31"/><rect x="47998" y="4.31" height="0.19" width="31"/><rect x="48000" y="27.77" height="0.33" width="39"/><rect x="48027" y="20.14" height="0.60" width="22"/><rect x="50044" y="22.66" height="0.96" width="31"/>
 </g>
 <g style="fill: #808080; stroke: none" transform="scale(0.008333,-2.000000)">
-<rect x="47988" y="16.93" height="0.19" width="31"/><rect x="47998" y="31.29" height="0.14" width="31"/><rect x="48000" y="28.10" height="0.20" width="39"/><rect x="48027" y="20.74" height="0.38" width="22"/><rect x="50044" y="23.62" height="0.22" width="31"/>
+<rect x="47988" y="16.93" height="0.19" width="31"/><rect x="47998" y="4.50" height="0.19" width="31"/><rect x="48000" y="28.10" height="0.20" width="39"/><rect x="48027" y="20.74" height="0.38" width="22"/><rect x="50044" y="23.62" height="0.22" width="31"/>
 </g>
 <g style="fill: #696969; stroke: none" transform="scale(0.008333,-2.000000)">
-<rect x="47988" y="17.12" height="82.88" width="31"/><rect x="47998" y="31.43" height="68.57" width="31"/><rect x="48000" y="28.30" height="71.70" width="39"/><rect x="48027" y="21.11" height="78.89" width="22"/><rect x="50044" y="23.84" height="76.16" width="31"/>
+<rect x="47988" y="17.12" height="82.88" width="31"/><rect x="47998" y="4.69" height="95.31" width="31"/><rect x="48000" y="28.30" height="71.70" width="39"/><rect x="48027" y="21.11" height="78.89" width="22"/><rect x="50044" y="23.84" height="76.16" width="31"/>
 </g>
 </g>
 </g>
@@ -697,16 +697,16 @@
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
-<text x="795" y="50" style="fill: #696969; stroke: none; font-size: 12px">%usr (0.25, 7.81)</text>
+<text x="795" y="50" style="fill: #696969; stroke: none; font-size: 12px">%usr (0.83, 7.81)</text>
 <text x="795" y="65" style="fill: #bebebe; stroke: none; font-size: 12px">%nice (0.00, 0.00)</text>
-<text x="795" y="80" style="fill: #000000; stroke: none; font-size: 12px">%sys (0.25, 4.38)</text>
-<text x="795" y="95" style="fill: #a9a9a9; stroke: none; font-size: 12px">%iowait (0.06, 70.04)</text>
+<text x="795" y="80" style="fill: #000000; stroke: none; font-size: 12px">%sys (0.74, 4.38)</text>
+<text x="795" y="95" style="fill: #a9a9a9; stroke: none; font-size: 12px">%iowait (0.00, 0.36)</text>
 <text x="795" y="110" style="fill: #708090; stroke: none; font-size: 12px">%steal (0.00, 0.00)</text>
-<text x="795" y="125" style="fill: #c0c0c0; stroke: none; font-size: 12px">%irq (0.03, 0.63)</text>
-<text x="795" y="140" style="fill: #808080; stroke: none; font-size: 12px">%soft (0.02, 0.23)</text>
+<text x="795" y="125" style="fill: #c0c0c0; stroke: none; font-size: 12px">%irq (0.06, 0.63)</text>
+<text x="795" y="140" style="fill: #808080; stroke: none; font-size: 12px">%soft (0.06, 0.23)</text>
 <text x="795" y="155" style="fill: #d3d3d3; stroke: none; font-size: 12px">%guest (0.00, 0.00)</text>
 <text x="795" y="170" style="fill: #909090; stroke: none; font-size: 12px">%gnice (0.00, 0.00)</text>
-<text x="795" y="185" style="fill: #696969; stroke: none; font-size: 12px">%idle (29.42, 96.18)</text>
+<text x="795" y="185" style="fill: #696969; stroke: none; font-size: 12px">%idle (86.63, 98.17)</text>
 <text x="1045" y="250" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">SYSSTAT.TEST
 <tspan x="1045" y="264" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">04/18/19</tspan>
 </text>
@@ -747,22 +747,22 @@
 <polyline points="86400,0 86400,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
 <text x="705" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 0:00</text>
 <g style="fill: #696969; stroke: none" transform="scale(0.008333,-2.000000)">
-<rect x="47988" y="0.00" height="2.89" width="31"/><rect x="47998" y="0.00" height="0.25" width="31"/><rect x="48000" y="0.00" height="3.23" width="39"/><rect x="48027" y="0.00" height="7.81" width="22"/><rect x="50044" y="0.00" height="2.89" width="31"/>
+<rect x="47988" y="0.00" height="2.89" width="31"/><rect x="47998" y="0.00" height="0.83" width="31"/><rect x="48000" y="0.00" height="3.23" width="39"/><rect x="48027" y="0.00" height="7.81" width="22"/><rect x="50044" y="0.00" height="2.89" width="31"/>
 </g>
 <g style="fill: #000000; stroke: none" transform="scale(0.008333,-2.000000)">
-<rect x="47988" y="2.89" height="0.74" width="31"/><rect x="47998" y="0.25" height="0.25" width="31"/><rect x="48000" y="3.23" height="1.35" width="39"/><rect x="48027" y="7.81" height="4.38" width="22"/><rect x="50044" y="2.89" height="0.74" width="31"/>
+<rect x="47988" y="2.89" height="0.74" width="31"/><rect x="47998" y="0.83" height="0.83" width="31"/><rect x="48000" y="3.23" height="1.35" width="39"/><rect x="48027" y="7.81" height="4.38" width="22"/><rect x="50044" y="2.89" height="0.74" width="31"/>
 </g>
 <g style="fill: #a9a9a9; stroke: none" transform="scale(0.008333,-2.000000)">
-<rect x="47988" y="3.63" height="0.06" width="31"/><rect x="47998" y="0.50" height="70.04" width="31"/><rect x="48000" y="4.58" height="0.36" width="39"/><rect x="48027" y="12.20" height="0.32" width="22"/><rect x="50044" y="3.63" height="0.06" width="31"/>
+<rect x="47988" y="3.63" height="0.06" width="31"/><rect x="48000" y="4.58" height="0.36" width="39"/><rect x="48027" y="12.20" height="0.32" width="22"/><rect x="50044" y="3.63" height="0.06" width="31"/>
 </g>
 <g style="fill: #c0c0c0; stroke: none" transform="scale(0.008333,-2.000000)">
-<rect x="47988" y="3.69" height="0.06" width="31"/><rect x="47998" y="70.54" height="0.03" width="31"/><rect x="48000" y="4.95" height="0.13" width="39"/><rect x="48027" y="12.51" height="0.63" width="22"/><rect x="50044" y="3.69" height="0.06" width="31"/>
+<rect x="47988" y="3.69" height="0.06" width="31"/><rect x="47998" y="1.67" height="0.10" width="31"/><rect x="48000" y="4.95" height="0.13" width="39"/><rect x="48027" y="12.51" height="0.63" width="22"/><rect x="50044" y="3.69" height="0.06" width="31"/>
 </g>
 <g style="fill: #808080; stroke: none" transform="scale(0.008333,-2.000000)">
-<rect x="47988" y="3.76" height="0.06" width="31"/><rect x="47998" y="70.57" height="0.02" width="31"/><rect x="48000" y="5.08" height="0.13" width="39"/><rect x="48027" y="13.14" height="0.23" width="22"/><rect x="50044" y="3.76" height="0.06" width="31"/>
+<rect x="47988" y="3.76" height="0.06" width="31"/><rect x="47998" y="1.76" height="0.06" width="31"/><rect x="48000" y="5.08" height="0.13" width="39"/><rect x="48027" y="13.14" height="0.23" width="22"/><rect x="50044" y="3.76" height="0.06" width="31"/>
 </g>
 <g style="fill: #696969; stroke: none" transform="scale(0.008333,-2.000000)">
-<rect x="47988" y="3.82" height="96.18" width="31"/><rect x="47998" y="70.58" height="29.42" width="31"/><rect x="48000" y="5.21" height="94.79" width="39"/><rect x="48027" y="13.37" height="86.63" width="22"/><rect x="50044" y="3.82" height="96.18" width="31"/>
+<rect x="47988" y="3.82" height="96.18" width="31"/><rect x="47998" y="1.83" height="98.17" width="31"/><rect x="48000" y="5.21" height="94.79" width="39"/><rect x="48027" y="13.37" height="86.63" width="22"/><rect x="50044" y="3.82" height="96.18" width="31"/>
 </g>
 </g>
 </g>

diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all
index 9595c6f27bb900c35f2f72091c45e6ab81a13dd8..cdb564c45274868085b1a4643817aaa6b046efd6 100644 (file)
--- a/tests/expected2.sar-all
+++ b/tests/expected2.sar-all
@@ -10,14 +10,14 @@ 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      1.64      0.00      1.11     28.40      0.00      0.13      0.14      0.00      0.00     68.57
+13:20:29        all      2.28      0.00      1.55      0.48      0.00      0.19      0.19      0.00      0.00     95.31
 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.25      0.00      0.25     70.04      0.00      0.03      0.02      0.00      0.00     29.42
+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          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

diff --git a/tests/expected2.sar-u b/tests/expected2.sar-u
index 0173db51272812acd37efc9eb46ea4dbcb257121..d7a199e77132538c66e9d9fb8a2b0a10228a75b2 100644 (file)
--- a/tests/expected2.sar-u
+++ b/tests/expected2.sar-u
@@ -10,14 +10,14 @@ 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      1.64      0.00      1.38     28.40      0.00     68.57
+13:20:29        all      2.28      0.00      1.93      0.48      0.00     95.31
 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.25      0.00      0.30     70.04      0.00     29.42
+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          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

diff --git a/tests/expected3.sadf-g b/tests/expected3.sadf-g
index b8a0b243150dc2dadecece1418b661c2523b3a90..4834dc159fb28c83a69a49c033977f11fa06ecaf 100644 (file)
--- a/tests/expected3.sadf-g
+++ b/tests/expected3.sadf-g
@@ -9,10 +9,10 @@
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
-<text x="795" y="50" style="fill: #00cc00; stroke: none; font-size: 12px">%user (1.64, 6.53)</text>
+<text x="795" y="50" style="fill: #00cc00; stroke: none; font-size: 12px">%user (2.15, 6.53)</text>
 <text x="795" y="65" style="fill: #ff00bf; stroke: none; font-size: 12px">%nice (0.00, 23.20)</text>
-<text x="795" y="80" style="fill: #00ffff; stroke: none; font-size: 12px">%system (1.38, 4.42)</text>
-<text x="795" y="95" style="fill: #ff0000; stroke: none; font-size: 12px">%iowait (0.12, 28.40)</text>
+<text x="795" y="80" style="fill: #00ffff; stroke: none; font-size: 12px">%system (1.93, 4.42)</text>
+<text x="795" y="95" style="fill: #ff0000; stroke: none; font-size: 12px">%iowait (0.12, 0.77)</text>
 <text x="795" y="110" style="fill: #e85f00; stroke: none; font-size: 12px">%steal (0.00, 0.00)</text>
 <g transform="translate(70,250)">
 <text x="0" y="0" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.</text>
@@ -48,16 +48,16 @@
 <text x="717" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,717,0)">13:54:29</text>
 <text x="-10" y="30" style="fill: #ffff00; stroke: none; font-size: 12px; text-anchor: end">UTC</text>
 <g style="fill: #00cc00; stroke: none" transform="scale(0.348500,-2.000000)">
-<rect x="0" y="0.00" height="2.15" width="31"/><rect x="0" y="0.00" height="1.64" width="31"/><rect x="0" y="0.00" height="2.66" width="39"/><rect x="18" y="0.00" height="6.53" width="22"/><rect x="2035" y="0.00" height="2.47" width="31"/>
+<rect x="0" y="0.00" height="2.15" width="31"/><rect x="0" y="0.00" height="2.28" width="31"/><rect x="0" y="0.00" height="2.66" width="39"/><rect x="18" y="0.00" height="6.53" width="22"/><rect x="2035" y="0.00" height="2.47" width="31"/>
 </g>
 <g style="fill: #ff00bf; stroke: none" transform="scale(0.348500,-2.000000)">
 <rect x="0" y="2.15" height="12.50" width="31"/><rect x="0" y="2.66" height="23.20" width="39"/><rect x="18" y="6.53" height="9.63" width="22"/><rect x="2035" y="2.47" height="17.21" width="31"/>
 </g>
 <g style="fill: #00ffff; stroke: none" transform="scale(0.348500,-2.000000)">
-<rect x="0" y="14.64" height="2.36" width="31"/><rect x="0" y="1.64" height="1.38" width="31"/><rect x="0" y="25.86" height="2.27" width="39"/><rect x="18" y="16.16" height="4.42" width="22"/><rect x="2035" y="19.68" height="3.39" width="31"/>
+<rect x="0" y="14.64" height="2.36" width="31"/><rect x="0" y="2.28" height="1.93" width="31"/><rect x="0" y="25.86" height="2.27" width="39"/><rect x="18" y="16.16" height="4.42" width="22"/><rect x="2035" y="19.68" height="3.39" width="31"/>
 </g>
 <g style="fill: #ff0000; stroke: none" transform="scale(0.348500,-2.000000)">
-<rect x="0" y="17.00" height="0.12" width="31"/><rect x="0" y="3.03" height="28.40" width="31"/><rect x="0" y="28.13" height="0.17" width="39"/><rect x="18" y="20.58" height="0.54" width="22"/><rect x="2035" y="23.07" height="0.77" width="31"/>
+<rect x="0" y="17.00" height="0.12" width="31"/><rect x="0" y="4.21" height="0.48" width="31"/><rect x="0" y="28.13" height="0.17" width="39"/><rect x="18" y="20.58" height="0.54" width="22"/><rect x="2035" y="23.07" height="0.77" width="31"/>
 </g>
 </g>
 </g>

diff --git a/tests/expected33.sar-u b/tests/expected33.sar-u
index e4f8fcbe699ea179ed2dd4f96c40cc9888016520..4012fc32b0eccc967777955488e1f8182c082211 100644 (file)
--- 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      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
+00:00:01        all      2.28      0.00      1.93      0.48      0.00     95.31
+Average:        all      2.28      0.00      1.93      0.48      0.00     95.31