Workaround for iowait being decremented

The iowait value reported by the kernel on NO_HZ systems can decrement
as a result of inaccurate iowait tracking. Waiting on IO can be first
accounted as iowait but then instead as idle.

Function get_per_cpu_interval() considers iowait going backwards between
two readings as a CPU coming back online and resets the iowait value of
the first reading to 0. If iowait is decremented only because of
inaccurate tracking, this causes that almost all time between the two
readings is incorrectly recognized by sar as being spent in iowait.

The patch updates the code in get_per_cpu_interval() to recognize this
situation. If the iowait value between two readings decremented but the
idle value did not then the code now considers it as a problem with the
iowait reporting and corrects the first value according to the second
reading. Otherwise, the code remains treating decremented iowait as a
CPU coming back online.

Fixes #14.

diff --git a/rd_stats.c b/rd_stats.c
index 56d42d006797d5a6f6534aa5d4806a24d711954f..be7624501e0dc35ffeab432af58ebfd29ca089ea 100644 (file)
--- a/rd_stats.c
+++ b/rd_stats.c
@@ -440,12 +440,24 @@ unsigned long long get_per_cpu_interval(struct stats_cpu *scc,
         * value was greater than ULLONG_MAX - 0x7ffff (the counter probably
         * overflew).
         */
+       if ((scc->cpu_iowait < scp->cpu_iowait) && (scp->cpu_iowait < (ULLONG_MAX - 0x7ffff))) {
+               /*
+                * The iowait value reported by the kernel can also decrement as
+                * a result of inaccurate iowait tracking. Waiting on IO can be
+                * first accounted as iowait but then instead as idle.
+                * Therefore if the idle value during the same period did not
+                * decrease then consider this is a problem with the iowait
+                * reporting and correct the previous value according to the new
+                * reading. Otherwise, treat this as CPU coming back online.
+                */
+               if (scc->cpu_idle > scp->cpu_idle)
+                       scp->cpu_iowait = scc->cpu_iowait;
+               else
+                       scp->cpu_iowait = 0;
+       }
        if ((scc->cpu_idle < scp->cpu_idle) && (scp->cpu_idle < (ULLONG_MAX - 0x7ffff))) {
                scp->cpu_idle = 0;
        }
-       if ((scc->cpu_iowait < scp->cpu_iowait) && (scp->cpu_iowait < (ULLONG_MAX - 0x7ffff))) {
-               scp->cpu_iowait = 0;
-       }
 
        /*
         * Don't take cpu_guest and cpu_guest_nice into account

diff --git a/tests/expected.data-ini b/tests/expected.data-ini
index afcf4f9c0198fc07b33c489c65b727661c2659da..d727f31cc99ba23b5e30e1f4ea942980363f1e75 100644 (file)
--- 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 a91df30a6600a04e481167ce0539bf9a91be748c..45baf2f1d990c8962e423ae6d05bdb6331441fc6 100644 (file)
--- 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 0ad107b9975ef42e1cd87d03de8c4bec059aa9ea..ebb20ea36f1d9719b0779d5f0c813d4a82e8db12 100644 (file)
--- 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 7cd2748a4d058a10d7883b9c121377a9b76255e5..9fa4491d5b41b88c89d3b3a6eb6ae216619c6e4b 100644 (file)
--- 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 a758f0e35625e5beec9bd73b8d3d49647d11b69c..950be91e65002b39f8259ccfbd59d79c52d20bc5 100644 (file)
--- 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 333700333693e303d8a40d9cf69577abb2ab5597..81b3f867bed4cda163512848990781a5cf5cbaad 100644 (file)
--- 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 812e56caadc141daf2fce6d763caf009a5c7122f..b7e76a20e3856a8866afc39059358783df360bef 100644 (file)
--- 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 c2247a725937c206b9c46bee4bb4252b182496d0..350e5c439f566187423115dba0445902284731e2 100644 (file)
--- 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 5b038265d406450087a29e02eb886536f9bb3413..04c036965df3efeaec1337c89fb1eaf0d2955361 100644 (file)
--- 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 e8b73496449a24cc2de3584371b539072f0eaa15..07bc0453d1b51c48b41dc9df9754b21d641959a9 100644 (file)
--- 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 77f787607beef7b791b36b7c9b3f02b244ebaaa5..2608c6e3dcb84425bd84ffe9f715326c62fb9327 100644 (file)
--- 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 e2d874dcb553e003328b6664de37651e1f21d212..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    2.28    0.00    1.55    0.50    0.19    0.19    0.00    0.00    0.00   95.29
+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.83    0.00    0.83    0.10    0.10    0.06    0.00    0.00    0.00   98.08
+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    2.28    0.00    1.55    0.50    0.19    0.19    0.00    0.00    0.00   95.29
+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.91    0.00    1.29    0.34    0.13    0.11    0.00    0.00    0.00   96.22
+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
@@ -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 32de12831e0c064aeffcbc3e9e9a619565904e9f..b2ab9eaeabc1b49b658c548837effaec1fc725ec 100644 (file)
--- 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                   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.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.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.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 5740869ca70c359955a93bdecfd14cad2eb2bf65..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      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      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 ad753c6f0dce251ff86e580be2ede7562195f6b7..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      2.28      0.00      1.55      0.50      0.00      0.19      0.19      0.00      0.00     95.29
+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.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.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.83      0.00      0.83      0.10      0.00      0.10      0.06      0.00      0.00     98.08
+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 a5991929fe041d2c31933146dcfbad4617ec555e..4780ee53c3056fe584ecb7903cf4837f4b88d2b2 100644 (file)
--- 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;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.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.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
 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 8825517721bd4b91da85fc6eead4ca5b99764f8a..0053519bfd5724e18d20e78d9a906ca254e8eba3 100644 (file)
--- 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;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
 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 5369b18a92b4e13aec88ad757c6a99cc6dddfa46..69d2a38acc3325dfb8ef9e0db2e5ea1aba8b48d1 100644 (file)
--- a/tests/expected.sadf-g
+++ b/tests/expected.sadf-g
@@ -61,13 +61,13 @@
 <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="3.83" height="0.50" width="31"/><rect x="0" y="27.60" height="0.16" 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="4.33" height="0.19" width="31"/><rect x="0" y="27.76" 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="4.51" height="0.19" width="31"/><rect x="0" y="28.09" 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>
@@ -550,7 +550,7 @@
 <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.74, 4.38)</text>
-<text x="795" y="95" style="fill: #ff0000; stroke: none; font-size: 12px">%iowait (0.06, 0.32)</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.06, 0.63)</text>
 <text x="795" y="140" style="fill: #006020; stroke: none; font-size: 12px">%soft (0.06, 0.23)</text>
@@ -596,13 +596,13 @@
 <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="1.67" height="0.10" width="31"/><rect x="0" y="4.58" height="0.26" 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="1.76" height="0.10" width="31"/><rect x="0" y="4.84" 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="1.86" height="0.06" width="31"/><rect x="0" y="4.97" 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 95652641503b024b917ffcff7b8db5fb301fc83d..241a75a3d10c722d31827dac651cbf044673871e 100644 (file)
--- a/tests/expected.sadf-g-cc
+++ b/tests/expected.sadf-g-cc
@@ -57,7 +57,7 @@
 <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="4.21" height="0.50" width="31"/><rect x="0" y="28.13" height="0.16" 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 106638b8c90c4503ebffaf3a4b1d3e1350a49367..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": 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": 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.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.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": [
@@ -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 9c5134e7ff1c4f8e295c4018ea6ca925709bfd82..6a1f7b780b370afcc9eadb7d91f34c2a9aa3615c 100644 (file)
--- a/tests/expected.sadf-p
+++ b/tests/expected.sadf-p
@@ -91,13 +91,13 @@ 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     %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     %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.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   95.29
+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
@@ -161,23 +161,23 @@ 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    %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    %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.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   98.08
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC cpu7    %idle   98.17
 SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC all     %usr    2.66
 SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC all     %nice   23.20
 SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC all     %sys    1.74
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC all     %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 e00d458c82aaa3699d3850e1b4fb93212a801e64..9ef690f83507761f5200858d0570f408c2f08c9f 100644 (file)
--- 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; 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; 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 0e9fa67640aae0a03da98db43df4bf5f95c4e066..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="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 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.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 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>
@@ -1275,14 +1275,14 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                        </timestamp>
                        <timestamp date="2019-04-18" time="13:20:39" utc="1" interval="39">
                                <cpu-load>
-                                       <cpu number="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 number="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 number="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 number="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 number="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 number="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 number="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 number="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 number="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 number="7" usr="3.23" nice="0.00" sys="1.35" iowait="0.36" steal="0.00" irq="0.13" soft="0.13" guest="0.00" gnice="0.00" idle="94.79"/>
                                </cpu-load>
                                <process-and-context-switch per="second" proc="3.66" cswch="64945.01"/>
                                <interrupts>

diff --git a/tests/expected.sar-D b/tests/expected.sar-D
index b60b9b1e69a2713dfbda76224e8a6a4305262a47..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      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      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 ce034d911da2f8d8d116fe29fe69e07d98675aed..ff0ca97c337bfd29466dcb58d8815109388486c0 100644 (file)
--- 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      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 5469851a6775ab822a9e6f6dd3fadc0474392804..fb2a83fd50b267425ae9b8f309dd75edaa6241a1 100644 (file)
--- 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      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.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.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
 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 1899b9fe3221bb81f03d078b7259718c855ea7fb..c079ea3215ca306a99b867df0f182ac9f4a1f568 100644 (file)
--- 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   \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      2.28\e[0m\e[36;22m      0.00\e[0m\e[34;1m      1.93\e[0m\e[34;1m      0.50\e[0m\e[36;22m      0.00\e[0m\e[31;1m     95.29\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.16\e[0m\e[36;22m      0.00\e[0m\e[35;1m     71.71\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 ce034d911da2f8d8d116fe29fe69e07d98675aed..ff0ca97c337bfd29466dcb58d8815109388486c0 100644 (file)
--- 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      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-human b/tests/expected.sar-human
index 971f01eb41cb332e99a89e57a7ee62ee4b883cfc..4e5fe84f6f58e9c1444f0bd126a2505d5077d750 100644 (file)
--- a/tests/expected.sar-human
+++ b/tests/expected.sar-human
@@ -17,7 +17,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       04/18/19        _x86_64_        (8 CPU)
 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.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%
@@ -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 5670e904bcd75e4a3d006ed00cf65b948dd7d192..1f1aee2b0cd5d67244443e17d0d61516dda9ed4b 100644 (file)
--- 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 57fd1897514a7ee88f2e2fcee8946b19acd2210a..558d91f7114c58170b91bc4ec826053277192680 100644 (file)
--- 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 e96ac32b9248c19d70f6c704b2bfd9f7a5088bc7..85d2a8b83c86fa87fb17e2eddff6a9e39fe99ce1 100644 (file)
--- 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      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.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.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
 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 15770bcc3898e2226229a28ddf357879e275fa66..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      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      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 cef74a510cf69627bd8e2e5f95f800a30861a3ae..5c7baf30dcfab7fd638a993d2e03b51954ee24d0 100644 (file)
--- a/tests/expected2.sadf-g
+++ b/tests/expected2.sadf-g
@@ -88,7 +88,7 @@
 <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 (71.71, 95.29)</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>
@@ -138,16 +138,16 @@
 <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="3.83" height="0.50" width="31"/><rect x="48000" y="27.60" height="0.16" 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="4.33" height="0.19" width="31"/><rect x="48000" y="27.76" 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="4.51" height="0.19" width="31"/><rect x="48000" y="28.09" 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="4.71" height="95.29" width="31"/><rect x="48000" y="28.29" height="71.71" 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>
@@ -700,13 +700,13 @@
 <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.74, 4.38)</text>
-<text x="795" y="95" style="fill: #a9a9a9; stroke: none; font-size: 12px">%iowait (0.06, 0.32)</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.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 (86.63, 98.08)</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>
@@ -753,16 +753,16 @@
 <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="1.67" height="0.10" width="31"/><rect x="48000" y="4.58" height="0.26" 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="1.76" height="0.10" width="31"/><rect x="48000" y="4.84" 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="1.86" height="0.06" width="31"/><rect x="48000" y="4.97" 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="1.92" height="98.08" width="31"/><rect x="48000" y="5.10" height="94.90" 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 d0e4542f118edad6af6bd945c67728376af7787d..cdb564c45274868085b1a4643817aaa6b046efd6 100644 (file)
--- 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      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.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.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
 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 66373b281274aa85110bd3b91421784a1b5ec62c..d7a199e77132538c66e9d9fb8a2b0a10228a75b2 100644 (file)
--- 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      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.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.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
 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 311e136b64b1a92b786d8edf0c97544b82c1e277..4834dc159fb28c83a69a49c033977f11fa06ecaf 100644 (file)
--- a/tests/expected3.sadf-g
+++ b/tests/expected3.sadf-g
@@ -57,7 +57,7 @@
 <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="4.21" height="0.50" width="31"/><rect x="0" y="28.13" height="0.16" 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/expected3.sar-i b/tests/expected3.sar-i
index 1001c73ecfa155709f646cfcfa51af829afe3788..4c5a4183d981eefcb0b8e0e9c1263a0e72a6db23 100644 (file)
--- 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 846a1db22d3ffff48badb913c100dbc42cf782df..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      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      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/root.README b/tests/root.README
index 59ed70f6589ae9caecb57c491539769f8eacc978..8a5f7242400bfe5ae41b3a178a86fcfe585b7c35 100644 (file)
--- 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 52f053d3d0ba87f60f9e4de16afcb7c6b67d3ff4..13baf20bc9d1b1edc14f4705a788bcb1c5f5c961 100644 (file)
--- 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