Update non regression tests

Take into account the change concerning PSI metrics.

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

diff --git a/tests/expected.sa2 b/tests/expected.sa2
index 148fb85f6a5fa1ca940312e84b321e1060020af8..ad753c6f0dce251ff86e580be2ede7562195f6b7 100644 (file)
--- a/tests/expected.sa2
+++ b/tests/expected.sa2
@@ -118,14 +118,14 @@ Average:          5      0.00      0.00      0.00      0.00      0.00
 Average:          6      0.00      0.00      0.00      0.00      0.00
 Average:          7      0.00      0.00      0.00      0.00      0.00
 
-13:20:29     s_acpu10  s_acpu60 s_acpu300  s_tcpu/s
-13:20:49         0.00      0.00      0.00   2304.90
-Average:         0.00      0.00      0.00   2304.90
+13:20:29     %scpu-10  %scpu-60 %scpu-300     %scpu
+13:20:49         0.00      0.00      0.00      0.23
+Average:         0.00      0.00      0.00      0.23
 
-13:20:29      s_aio10   s_aio60  s_aio300   s_tio/s   f_aio10   f_aio60  f_aio300   f_tio/s
-13:20:49         0.00      0.16      0.29  13921.32      0.00      0.15      0.28  12445.74
-Average:         0.00      0.16      0.29  13921.32      0.00      0.15      0.28  12445.74
+13:20:29      %sio-10   %sio-60  %sio-300      %sio   %fio-10   %fio-60  %fio-300      %fio
+13:20:49         0.00      0.16      0.29      1.39      0.00      0.15      0.28      1.24
+Average:         0.00      0.16      0.29      1.39      0.00      0.15      0.28      1.24
 
-13:20:29     s_amem10  s_amem60 s_amem300  s_tmem/s  f_amem10  f_amem60 f_amem300  f_tmem/s
-13:20:49        21.06     14.31      3.80    256.31      0.00      0.00      0.00     83.32
-Average:        21.06     14.31      3.80    256.31      0.00      0.00      0.00     83.32
+13:20:29     %smem-10  %smem-60 %smem-300     %smem  %fmem-10  %fmem-60 %fmem-300     %fmem
+13:20:49        21.06     14.31      3.80      0.03      0.00      0.00      0.00      0.01
+Average:        21.06     14.31      3.80      0.03      0.00      0.00      0.00      0.01

diff --git a/tests/expected.sadf-d b/tests/expected.sadf-d
index 54a891915e112f2afb15d4f8cce8dff83366762f..a3f6a425934bcedaade16b63223db3acffe4dba9 100644 (file)
--- a/tests/expected.sadf-d
+++ b/tests/expected.sadf-d
@@ -2331,21 +2331,21 @@ SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda9;85582;7774;8.33;13.45;6008414;
 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda7;279700;15464;5.24;10.33;19201593;455;0.00
 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda12;85582;7774;8.33;13.45;6008414;102818;1.68
 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda6;279700;15464;5.24;10.33;19201593;455;0.00
-# hostname;interval;timestamp;s_acpu10;s_acpu60;s_acpu300;s_tcpu/s
-SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;0.00;0.00;0.00;280.04
-SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;0.00;0.00;0.00;2304.90
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;0.00;0.00;0.00;80.16
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;0.00;0.00;0.00;2284.14
-# hostname;interval;timestamp;s_aio10;s_aio60;s_aio300;s_tio/s;f_aio10;f_aio60;f_aio300;f_tio/s
-SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;3.19;1.14;0.43;23292.75;3.19;1.14;0.42;22495.67
-SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;0.00;0.16;0.29;13921.32;0.00;0.15;0.28;12445.74
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;0.00;0.07;0.25;129.79;0.00;0.07;0.24;128.96
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;0.00;0.00;0.03;9336.31;0.00;0.00;0.03;7744.48
-# hostname;interval;timestamp;s_amem10;s_amem60;s_amem300;s_tmem/s;f_amem10;f_amem60;f_amem300;f_tmem/s
-SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;3.12;1.40;0.03;514.28;0.00;0.00;0.00;230.99
-SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;21.06;14.31;3.80;256.31;0.00;0.00;0.00;83.32
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;99.80;70.16;38.70;853.04;0.00;0.00;0.00;58.03
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;23.00;3.00;0.36;2072.85;0.00;0.00;0.00;1507.06
+# hostname;interval;timestamp;%scpu-10;%scpu-60;%scpu-300;%scpu
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;0.00;0.00;0.00;0.03
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;0.00;0.00;0.00;0.23
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;0.00;0.00;0.00;0.01
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;0.00;0.00;0.00;0.23
+# hostname;interval;timestamp;%sio-10;%sio-60;%sio-300;%sio;%fio-10;%fio-60;%fio-300;%fio
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;3.19;1.14;0.43;2.33;3.19;1.14;0.42;2.25
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;0.00;0.16;0.29;1.39;0.00;0.15;0.28;1.24
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;0.00;0.07;0.25;0.01;0.00;0.07;0.24;0.01
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;0.00;0.00;0.03;0.93;0.00;0.00;0.03;0.77
+# hostname;interval;timestamp;%smem-10;%smem-60;%smem-300;%smem;%fmem-10;%fmem-60;%fmem-300;%fmem
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;3.12;1.40;0.03;0.05;0.00;0.00;0.00;0.02
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;21.06;14.31;3.80;0.03;0.00;0.00;0.00;0.01
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;99.80;70.16;38.70;0.09;0.00;0.00;0.00;0.01
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;23.00;3.00;0.36;0.21;0.00;0.00;0.00;0.15
 SYSSTAT.TEST;-1;2019-04-18 13:37:29 UTC;LINUX-RESTART  (8 CPU)
 SYSSTAT.TEST;-1;2019-04-18 13:39:09 UTC;COM Testing sysstat!
 SYSSTAT.TEST;-1;2019-04-18 13:54:09 UTC;LINUX-RESTART  (10 CPU)
@@ -2969,9 +2969,9 @@ SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda9;85582;7774;8.33;13.45;6008414;
 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda7;279700;15464;5.24;10.33;19201593;455;0.00
 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda12;85582;7774;8.33;13.45;6008414;102818;1.68
 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda6;279700;15464;5.24;10.33;19201593;455;0.00
-# hostname;interval;timestamp;s_acpu10;s_acpu60;s_acpu300;s_tcpu/s
+# hostname;interval;timestamp;%scpu-10;%scpu-60;%scpu-300;%scpu
 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0.00;0.00;0.00;0.00
-# hostname;interval;timestamp;s_aio10;s_aio60;s_aio300;s_tio/s;f_aio10;f_aio60;f_aio300;f_tio/s
+# hostname;interval;timestamp;%sio-10;%sio-60;%sio-300;%sio;%fio-10;%fio-60;%fio-300;%fio
 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-# hostname;interval;timestamp;s_amem10;s_amem60;s_amem300;s_tmem/s;f_amem10;f_amem60;f_amem300;f_tmem/s
+# hostname;interval;timestamp;%smem-10;%smem-60;%smem-300;%smem;%fmem-10;%fmem-60;%fmem-300;%fmem
 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00

diff --git a/tests/expected.sadf-g b/tests/expected.sadf-g
index fdf3b6810663e0ee968d592c9c7138d5d4115839..f1a4db33a83571b82f3b84042688c1a507f00d20 100644 (file)
--- a/tests/expected.sadf-g
+++ b/tests/expected.sadf-g
@@ -13632,9 +13632,9 @@
 <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">s_acpu10 (0.00, 0.00)</text>
-<text x="795" y="65" style="fill: #ff00bf; stroke: none; font-size: 12px">s_acpu60 (0.00, 0.00)</text>
-<text x="795" y="80" style="fill: #00ffff; stroke: none; font-size: 12px">s_acpu300 (0.00, 0.00)</text>
+<text x="795" y="50" style="fill: #00cc00; stroke: none; font-size: 12px">%scpu-10 (0.00, 0.00)</text>
+<text x="795" y="65" style="fill: #ff00bf; stroke: none; font-size: 12px">%scpu-60 (0.00, 0.00)</text>
+<text x="795" y="80" style="fill: #00ffff; stroke: none; font-size: 12px">%scpu-300 (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.00.</text>
 <polyline points="0,0.33 720,0.33" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-200.000000)"/>
@@ -13675,15 +13675,17 @@
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
-<text x="795" y="360" style="fill: #ff0000; stroke: none; font-size: 12px">s_tcpu/s (0.00, 2304.90)</text>
+<text x="795" y="360" style="fill: #ff0000; stroke: none; font-size: 12px">%scpu (0.00, 0.23)</text>
 <g transform="translate(70,560)">
 <text x="0" y="0" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.</text>
-<polyline points="0,700.00 720,700.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-0.086772)"/>
-<text x="0" y="-60" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">700.</text>
-<polyline points="0,1400.00 720,1400.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-0.086772)"/>
-<text x="0" y="-121" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">1400.</text>
-<polyline points="0,2100.00 720,2100.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-0.086772)"/>
-<text x="0" y="-182" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">2100.</text>
+<polyline points="0,25.00 720,25.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-50" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">25.</text>
+<polyline points="0,50.00 720,50.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-100" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">50.</text>
+<polyline points="0,75.00 720,75.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-150" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">75.</text>
+<polyline points="0,100.00 720,100.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-200" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">100.</text>
 <polyline points="0,0 0,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
 <text x="0" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,0,0)">13:20:09</text>
 <polyline points="206,0 206,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
@@ -13707,7 +13709,9 @@
 <polyline points="2060,0 2060,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
 <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>
-<path d=" M10,280 L20,2304 L30,80 L40,2284 M2066,0" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.086772)"/>
+<g style="fill: #ff0000; stroke: none" transform="scale(0.348500,-2.000000)">
+<rect x="0" y="0.00" height="0.03" width="31"/><rect x="0" y="0.00" height="0.23" width="31"/><rect x="0" y="0.00" height="0.01" width="39"/><rect x="18" y="0.00" height="0.23" width="22"/>
+</g>
 </g>
 </g>
 <g id="g41-0" transform="translate(0,98950)">
@@ -13716,9 +13720,9 @@
 <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">s_aio10 (0.00, 3.19)</text>
-<text x="795" y="65" style="fill: #ff00bf; stroke: none; font-size: 12px">s_aio60 (0.00, 1.14)</text>
-<text x="795" y="80" style="fill: #00ffff; stroke: none; font-size: 12px">s_aio300 (0.00, 0.43)</text>
+<text x="795" y="50" style="fill: #00cc00; stroke: none; font-size: 12px">%sio-10 (0.00, 3.19)</text>
+<text x="795" y="65" style="fill: #ff00bf; stroke: none; font-size: 12px">%sio-60 (0.00, 1.14)</text>
+<text x="795" y="80" style="fill: #00ffff; stroke: none; font-size: 12px">%sio-300 (0.00, 0.43)</text>
 <g transform="translate(70,250)">
 <text x="0" y="0" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.</text>
 <polyline points="0,1.00 720,1.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-62.695925)"/>
@@ -13759,15 +13763,17 @@
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
-<text x="795" y="360" style="fill: #ff0000; stroke: none; font-size: 12px">s_tio/s (0.00, 23292.75)</text>
+<text x="795" y="360" style="fill: #ff0000; stroke: none; font-size: 12px">%sio (0.00, 2.33)</text>
 <g transform="translate(70,560)">
 <text x="0" y="0" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.</text>
-<polyline points="0,7000.00 720,7000.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-0.008586)"/>
-<text x="0" y="-60" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">7000.</text>
-<polyline points="0,14000.00 720,14000.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-0.008586)"/>
-<text x="0" y="-120" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">14000.</text>
-<polyline points="0,21000.00 720,21000.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-0.008586)"/>
-<text x="0" y="-180" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">21000.</text>
+<polyline points="0,25.00 720,25.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-50" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">25.</text>
+<polyline points="0,50.00 720,50.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-100" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">50.</text>
+<polyline points="0,75.00 720,75.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-150" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">75.</text>
+<polyline points="0,100.00 720,100.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-200" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">100.</text>
 <polyline points="0,0 0,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
 <text x="0" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,0,0)">13:20:09</text>
 <polyline points="206,0 206,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
@@ -13791,16 +13797,18 @@
 <polyline points="2060,0 2060,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
 <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>
-<path d=" M10,23292 L20,13921 L30,129 L40,9336 M2066,0" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.008586)"/>
+<g style="fill: #ff0000; stroke: none" transform="scale(0.348500,-2.000000)">
+<rect x="0" y="0.00" height="2.33" width="31"/><rect x="0" y="0.00" height="1.39" width="31"/><rect x="0" y="0.00" height="0.01" width="39"/><rect x="18" y="0.00" height="0.93" width="22"/>
+</g>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
 <text x="0" y="640" style="fill: #ffff00; stroke: none">I/O pressure trends (full)
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
-<text x="795" y="670" style="fill: #e85f00; stroke: none; font-size: 12px">f_aio10 (0.00, 3.19)</text>
-<text x="795" y="685" style="fill: #0000ff; stroke: none; font-size: 12px">f_aio60 (0.00, 1.14)</text>
-<text x="795" y="700" style="fill: #006020; stroke: none; font-size: 12px">f_aio300 (0.00, 0.42)</text>
+<text x="795" y="670" style="fill: #e85f00; stroke: none; font-size: 12px">%fio-10 (0.00, 3.19)</text>
+<text x="795" y="685" style="fill: #0000ff; stroke: none; font-size: 12px">%fio-60 (0.00, 1.14)</text>
+<text x="795" y="700" style="fill: #006020; stroke: none; font-size: 12px">%fio-300 (0.00, 0.42)</text>
 <g transform="translate(70,870)">
 <text x="0" y="0" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.</text>
 <polyline points="0,1.00 720,1.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-62.695925)"/>
@@ -13841,15 +13849,17 @@
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
-<text x="795" y="980" style="fill: #7030a0; stroke: none; font-size: 12px">f_tio/s (0.00, 22495.67)</text>
+<text x="795" y="980" style="fill: #7030a0; stroke: none; font-size: 12px">%fio (0.00, 2.25)</text>
 <g transform="translate(70,1180)">
 <text x="0" y="0" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.</text>
-<polyline points="0,7000.00 720,7000.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-0.008891)"/>
-<text x="0" y="-62" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">7000.</text>
-<polyline points="0,14000.00 720,14000.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-0.008891)"/>
-<text x="0" y="-124" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">14000.</text>
-<polyline points="0,21000.00 720,21000.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-0.008891)"/>
-<text x="0" y="-186" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">21000.</text>
+<polyline points="0,25.00 720,25.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-50" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">25.</text>
+<polyline points="0,50.00 720,50.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-100" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">50.</text>
+<polyline points="0,75.00 720,75.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-150" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">75.</text>
+<polyline points="0,100.00 720,100.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-200" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">100.</text>
 <polyline points="0,0 0,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
 <text x="0" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,0,0)">13:20:09</text>
 <polyline points="206,0 206,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
@@ -13873,7 +13883,9 @@
 <polyline points="2060,0 2060,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
 <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>
-<path d=" M10,22495 L20,12445 L30,128 L40,7744 M2066,0" style="vector-effect: non-scaling-stroke; stroke: #7030a0; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.008891)"/>
+<g style="fill: #7030a0; stroke: none" transform="scale(0.348500,-2.000000)">
+<rect x="0" y="0.00" height="2.25" width="31"/><rect x="0" y="0.00" height="1.24" width="31"/><rect x="0" y="0.00" height="0.01" width="39"/><rect x="18" y="0.00" height="0.77" width="22"/>
+</g>
 </g>
 </g>
 <g id="g42-0" transform="translate(0,100190)">
@@ -13882,9 +13894,9 @@
 <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">s_amem10 (0.00, 99.80)</text>
-<text x="795" y="65" style="fill: #ff00bf; stroke: none; font-size: 12px">s_amem60 (0.00, 70.16)</text>
-<text x="795" y="80" style="fill: #00ffff; stroke: none; font-size: 12px">s_amem300 (0.00, 38.70)</text>
+<text x="795" y="50" style="fill: #00cc00; stroke: none; font-size: 12px">%smem-10 (0.00, 99.80)</text>
+<text x="795" y="65" style="fill: #ff00bf; stroke: none; font-size: 12px">%smem-60 (0.00, 70.16)</text>
+<text x="795" y="80" style="fill: #00ffff; stroke: none; font-size: 12px">%smem-300 (0.00, 38.70)</text>
 <g transform="translate(70,250)">
 <text x="0" y="0" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.</text>
 <polyline points="0,30.00 720,30.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.004008)"/>
@@ -13925,15 +13937,17 @@
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
-<text x="795" y="360" style="fill: #ff0000; stroke: none; font-size: 12px">s_tmem/s (0.00, 2072.85)</text>
+<text x="795" y="360" style="fill: #ff0000; stroke: none; font-size: 12px">%smem (0.00, 0.21)</text>
 <g transform="translate(70,560)">
 <text x="0" y="0" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.</text>
-<polyline points="0,600.00 720,600.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-0.096486)"/>
-<text x="0" y="-57" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">600.</text>
-<polyline points="0,1200.00 720,1200.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-0.096486)"/>
-<text x="0" y="-115" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">1200.</text>
-<polyline points="0,1800.00 720,1800.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-0.096486)"/>
-<text x="0" y="-173" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">1800.</text>
+<polyline points="0,25.00 720,25.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-50" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">25.</text>
+<polyline points="0,50.00 720,50.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-100" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">50.</text>
+<polyline points="0,75.00 720,75.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-150" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">75.</text>
+<polyline points="0,100.00 720,100.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-200" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">100.</text>
 <polyline points="0,0 0,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
 <text x="0" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,0,0)">13:20:09</text>
 <polyline points="206,0 206,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
@@ -13957,16 +13971,18 @@
 <polyline points="2060,0 2060,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
 <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>
-<path d=" M10,514 L20,256 L30,853 L40,2072 M2066,0" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.096486)"/>
+<g style="fill: #ff0000; stroke: none" transform="scale(0.348500,-2.000000)">
+<rect x="0" y="0.00" height="0.05" width="31"/><rect x="0" y="0.00" height="0.03" width="31"/><rect x="0" y="0.00" height="0.09" width="39"/><rect x="18" y="0.00" height="0.21" width="22"/>
+</g>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
 <text x="0" y="640" style="fill: #ffff00; stroke: none">Memory pressure trends (full)
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
-<text x="795" y="670" style="fill: #e85f00; stroke: none; font-size: 12px">f_amem10 (0.00, 0.00)</text>
-<text x="795" y="685" style="fill: #0000ff; stroke: none; font-size: 12px">f_amem60 (0.00, 0.00)</text>
-<text x="795" y="700" style="fill: #006020; stroke: none; font-size: 12px">f_amem300 (0.00, 0.00)</text>
+<text x="795" y="670" style="fill: #e85f00; stroke: none; font-size: 12px">%fmem-10 (0.00, 0.00)</text>
+<text x="795" y="685" style="fill: #0000ff; stroke: none; font-size: 12px">%fmem-60 (0.00, 0.00)</text>
+<text x="795" y="700" style="fill: #006020; stroke: none; font-size: 12px">%fmem-300 (0.00, 0.00)</text>
 <g transform="translate(70,870)">
 <text x="0" y="0" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.00.</text>
 <polyline points="0,0.33 720,0.33" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-200.000000)"/>
@@ -14007,15 +14023,17 @@
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
-<text x="795" y="980" style="fill: #7030a0; stroke: none; font-size: 12px">f_tmem/s (0.00, 1507.06)</text>
+<text x="795" y="980" style="fill: #7030a0; stroke: none; font-size: 12px">%fmem (0.00, 0.15)</text>
 <g transform="translate(70,1180)">
 <text x="0" y="0" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.</text>
-<polyline points="0,500.00 720,500.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-0.132709)"/>
-<text x="0" y="-66" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">500.</text>
-<polyline points="0,1000.00 720,1000.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-0.132709)"/>
-<text x="0" y="-132" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">1000.</text>
-<polyline points="0,1500.00 720,1500.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-0.132709)"/>
-<text x="0" y="-199" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">1500.</text>
+<polyline points="0,25.00 720,25.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-50" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">25.</text>
+<polyline points="0,50.00 720,50.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-100" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">50.</text>
+<polyline points="0,75.00 720,75.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-150" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">75.</text>
+<polyline points="0,100.00 720,100.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-200" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">100.</text>
 <polyline points="0,0 0,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
 <text x="0" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,0,0)">13:20:09</text>
 <polyline points="206,0 206,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
@@ -14039,7 +14057,9 @@
 <polyline points="2060,0 2060,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
 <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>
-<path d=" M10,230 L20,83 L30,58 L40,1507 M2066,0" style="vector-effect: non-scaling-stroke; stroke: #7030a0; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.132709)"/>
+<g style="fill: #7030a0; stroke: none" transform="scale(0.348500,-2.000000)">
+<rect x="0" y="0.00" height="0.02" width="31"/><rect x="0" y="0.00" height="0.01" width="31"/><rect x="0" y="0.00" height="0.01" width="39"/><rect x="18" y="0.00" height="0.15" width="22"/>
+</g>
 </g>
 </g>
 <!-- Actual canvas height: 101430 -->

diff --git a/tests/expected.sadf-j b/tests/expected.sadf-j
index c39f884d6fa7bb33804c86f3419cf33ef13363be..1e2e1dc9ca06a812ecebb4011ce3d86ba9c1dc4a 100644 (file)
--- a/tests/expected.sadf-j
+++ b/tests/expected.sadf-j
@@ -608,9 +608,9 @@
                                                {"filesystem": "/dev/sda6", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}
                                        ],
                                        "psi": {
-                                               "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_total": 280.04},
-                                               "psi-io": {"some_avg10": 3.19, "some_avg60": 1.14, "some_avg300": 0.43, "some_total": 23292.75, "full_avg10": 3.19, "full_avg60": 1.14, "full_avg300": 0.42, "full_total": 22495.67},
-                                               "psi-mem": {"some_avg10": 3.12, "some_avg60": 1.40, "some_avg300": 0.03, "some_total": 514.28, "full_avg10": 0.00, "full_avg60": 0.00, "full_avg300": 0.00, "full_total": 230.99}
+                                               "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_avg": 0.03},
+                                               "psi-io": {"some_avg10": 3.19, "some_avg60": 1.14, "some_avg300": 0.43, "some_avg": 2.33, "full_avg10": 3.19, "full_avg60": 1.14, "full_avg300": 0.42, "full_avg": 2.25},
+                                               "psi-mem": {"some_avg10": 3.12, "some_avg60": 1.40, "some_avg300": 0.03, "some_avg": 0.05, "full_avg10": 0.00, "full_avg60": 0.00, "full_avg300": 0.00, "full_avg": 0.02}
                                        }
                                },
                                {
@@ -1211,9 +1211,9 @@
                                                {"filesystem": "/dev/sdg", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}
                                        ],
                                        "psi": {
-                                               "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_total": 2304.90},
-                                               "psi-io": {"some_avg10": 0.00, "some_avg60": 0.16, "some_avg300": 0.29, "some_total": 13921.32, "full_avg10": 0.00, "full_avg60": 0.15, "full_avg300": 0.28, "full_total": 12445.74},
-                                               "psi-mem": {"some_avg10": 21.06, "some_avg60": 14.31, "some_avg300": 3.80, "some_total": 256.31, "full_avg10": 0.00, "full_avg60": 0.00, "full_avg300": 0.00, "full_total": 83.32}
+                                               "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_avg": 0.23},
+                                               "psi-io": {"some_avg10": 0.00, "some_avg60": 0.16, "some_avg300": 0.29, "some_avg": 1.39, "full_avg10": 0.00, "full_avg60": 0.15, "full_avg300": 0.28, "full_avg": 1.24},
+                                               "psi-mem": {"some_avg10": 21.06, "some_avg60": 14.31, "some_avg300": 3.80, "some_avg": 0.03, "full_avg10": 0.00, "full_avg60": 0.00, "full_avg300": 0.00, "full_avg": 0.01}
                                        }
                                },
                                {
@@ -1818,9 +1818,9 @@
                                                {"filesystem": "/dev/sdg", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}
                                        ],
                                        "psi": {
-                                               "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_total": 80.16},
-                                               "psi-io": {"some_avg10": 0.00, "some_avg60": 0.07, "some_avg300": 0.25, "some_total": 129.79, "full_avg10": 0.00, "full_avg60": 0.07, "full_avg300": 0.24, "full_total": 128.96},
-                                               "psi-mem": {"some_avg10": 99.80, "some_avg60": 70.16, "some_avg300": 38.70, "some_total": 853.04, "full_avg10": 0.00, "full_avg60": 0.00, "full_avg300": 0.00, "full_total": 58.03}
+                                               "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_avg": 0.01},
+                                               "psi-io": {"some_avg10": 0.00, "some_avg60": 0.07, "some_avg300": 0.25, "some_avg": 0.01, "full_avg10": 0.00, "full_avg60": 0.07, "full_avg300": 0.24, "full_avg": 0.01},
+                                               "psi-mem": {"some_avg10": 99.80, "some_avg60": 70.16, "some_avg300": 38.70, "some_avg": 0.09, "full_avg10": 0.00, "full_avg60": 0.00, "full_avg300": 0.00, "full_avg": 0.01}
                                        }
                                },
                                {
@@ -2427,9 +2427,9 @@
                                                {"filesystem": "/dev/sda6", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}
                                        ],
                                        "psi": {
-                                               "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_total": 2284.14},
-                                               "psi-io": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.03, "some_total": 9336.31, "full_avg10": 0.00, "full_avg60": 0.00, "full_avg300": 0.03, "full_total": 7744.48},
-                                               "psi-mem": {"some_avg10": 23.00, "some_avg60": 3.00, "some_avg300": 0.36, "some_total": 2072.85, "full_avg10": 0.00, "full_avg60": 0.00, "full_avg300": 0.00, "full_total": 1507.06}
+                                               "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_avg": 0.23},
+                                               "psi-io": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.03, "some_avg": 0.93, "full_avg10": 0.00, "full_avg60": 0.00, "full_avg300": 0.03, "full_avg": 0.77},
+                                               "psi-mem": {"some_avg10": 23.00, "some_avg60": 3.00, "some_avg300": 0.36, "some_avg": 0.21, "full_avg10": 0.00, "full_avg60": 0.00, "full_avg300": 0.00, "full_avg": 0.15}
                                        }
                                },
                                {
@@ -3043,9 +3043,9 @@
                                                {"filesystem": "/dev/sda6", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}
                                        ],
                                        "psi": {
-                                               "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_total": 0.00},
-                                               "psi-io": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_total": 0.00, "full_avg10": 0.00, "full_avg60": 0.00, "full_avg300": 0.00, "full_total": 0.00},
-                                               "psi-mem": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_total": 0.00, "full_avg10": 0.00, "full_avg60": 0.00, "full_avg300": 0.00, "full_total": 0.00}
+                                               "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_avg": 0.00},
+                                               "psi-io": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_avg": 0.00, "full_avg10": 0.00, "full_avg60": 0.00, "full_avg300": 0.00, "full_avg": 0.00},
+                                               "psi-mem": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_avg": 0.00, "full_avg10": 0.00, "full_avg60": 0.00, "full_avg300": 0.00, "full_avg": 0.00}
                                        }
                                }
                        ],

diff --git a/tests/expected.sadf-p b/tests/expected.sadf-p
index c0d9e30c3e5800de0f132b0ecbe28014d31b5389..18918ade9cfba94b841855668fe850d3d9ff45b0 100644 (file)
--- a/tests/expected.sadf-p
+++ b/tests/expected.sadf-p
@@ -4331,86 +4331,86 @@ SYSSTAT.TEST    22      2019-04-18 13:20:49 UTC /dev/sda6       %ufsused        10.33
 SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC /dev/sda6       Ifree   19201593
 SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC /dev/sda6       Iused   455
 SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC /dev/sda6       %Iused  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       s_acpu10        0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       s_acpu60        0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       s_acpu300       0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       s_tcpu/s        280.04
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       s_acpu10        0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       s_acpu60        0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       s_acpu300       0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       s_tcpu/s        2304.90
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       s_acpu10        0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       s_acpu60        0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       s_acpu300       0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       s_tcpu/s        80.16
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       s_acpu10        0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       s_acpu60        0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       s_acpu300       0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       s_tcpu/s        2284.14
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       s_aio10 3.19
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       s_aio60 1.14
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       s_aio300        0.43
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       s_tio/s 23292.75
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       f_aio10 3.19
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       f_aio60 1.14
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       f_aio300        0.42
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       f_tio/s 22495.67
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       s_aio10 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       s_aio60 0.16
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       s_aio300        0.29
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       s_tio/s 13921.32
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       f_aio10 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       f_aio60 0.15
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       f_aio300        0.28
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       f_tio/s 12445.74
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       s_aio10 0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       s_aio60 0.07
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       s_aio300        0.25
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       s_tio/s 129.79
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       f_aio10 0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       f_aio60 0.07
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       f_aio300        0.24
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       f_tio/s 128.96
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       s_aio10 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       s_aio60 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       s_aio300        0.03
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       s_tio/s 9336.31
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       f_aio10 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       f_aio60 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       f_aio300        0.03
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       f_tio/s 7744.48
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       s_amem10        3.12
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       s_amem60        1.40
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       s_amem300       0.03
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       s_tmem/s        514.28
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       f_amem10        0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       f_amem60        0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       f_amem300       0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       f_tmem/s        230.99
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       s_amem10        21.06
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       s_amem60        14.31
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       s_amem300       3.80
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       s_tmem/s        256.31
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       f_amem10        0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       f_amem60        0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       f_amem300       0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       f_tmem/s        83.32
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       s_amem10        99.80
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       s_amem60        70.16
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       s_amem300       38.70
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       s_tmem/s        853.04
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       f_amem10        0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       f_amem60        0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       f_amem300       0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       f_tmem/s        58.03
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       s_amem10        23.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       s_amem60        3.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       s_amem300       0.36
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       s_tmem/s        2072.85
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       f_amem10        0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       f_amem60        0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       f_amem300       0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       f_tmem/s        1507.06
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %scpu-10        0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %scpu-60        0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %scpu-300       0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %scpu   0.03
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %scpu-10        0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %scpu-60        0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %scpu-300       0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %scpu   0.23
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %scpu-10        0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %scpu-60        0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %scpu-300       0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %scpu   0.01
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %scpu-10        0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %scpu-60        0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %scpu-300       0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %scpu   0.23
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %sio-10 3.19
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %sio-60 1.14
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %sio-300        0.43
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %sio    2.33
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %fio-10 3.19
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %fio-60 1.14
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %fio-300        0.42
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %fio    2.25
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %sio-10 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %sio-60 0.16
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %sio-300        0.29
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %sio    1.39
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %fio-10 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %fio-60 0.15
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %fio-300        0.28
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %fio    1.24
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %sio-10 0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %sio-60 0.07
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %sio-300        0.25
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %sio    0.01
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %fio-10 0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %fio-60 0.07
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %fio-300        0.24
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %fio    0.01
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %sio-10 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %sio-60 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %sio-300        0.03
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %sio    0.93
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %fio-10 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %fio-60 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %fio-300        0.03
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %fio    0.77
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %smem-10        3.12
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %smem-60        1.40
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %smem-300       0.03
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %smem   0.05
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %fmem-10        0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %fmem-60        0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %fmem-300       0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC -       %fmem   0.02
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %smem-10        21.06
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %smem-60        14.31
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %smem-300       3.80
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %smem   0.03
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %fmem-10        0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %fmem-60        0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %fmem-300       0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC -       %fmem   0.01
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %smem-10        99.80
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %smem-60        70.16
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %smem-300       38.70
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %smem   0.09
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %fmem-10        0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %fmem-60        0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %fmem-300       0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC -       %fmem   0.01
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %smem-10        23.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %smem-60        3.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %smem-300       0.36
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %smem   0.21
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %fmem-10        0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %fmem-60        0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %fmem-300       0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC -       %fmem   0.15
 SYSSTAT.TEST   -1      2019-04-18 13:37:29 UTC LINUX-RESTART   (8 CPU)
 SYSSTAT.TEST   -1      2019-04-18 13:39:09 UTC COM Testing sysstat!
 SYSSTAT.TEST   -1      2019-04-18 13:54:09 UTC LINUX-RESTART   (10 CPU)
@@ -5571,23 +5571,23 @@ SYSSTAT.TEST    31      2019-04-18 13:54:35 UTC /dev/sda6       %ufsused        10.33
 SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC /dev/sda6       Ifree   19201593
 SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC /dev/sda6       Iused   455
 SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC /dev/sda6       %Iused  0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       s_acpu10        0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       s_acpu60        0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       s_acpu300       0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       s_tcpu/s        0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       s_aio10 0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       s_aio60 0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       s_aio300        0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       s_tio/s 0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       f_aio10 0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       f_aio60 0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       f_aio300        0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       f_tio/s 0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       s_amem10        0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       s_amem60        0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       s_amem300       0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       s_tmem/s        0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       f_amem10        0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       f_amem60        0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       f_amem300       0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       f_tmem/s        0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %scpu-10        0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %scpu-60        0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %scpu-300       0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %scpu   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %sio-10 0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %sio-60 0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %sio-300        0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %sio    0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %fio-10 0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %fio-60 0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %fio-300        0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %fio    0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %smem-10        0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %smem-60        0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %smem-300       0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %smem   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %fmem-10        0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %fmem-60        0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %fmem-300       0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC -       %fmem   0.00

diff --git a/tests/expected.sadf-r b/tests/expected.sadf-r
index f6f7c0b41ab7b392a73933eb5de6ccfc03898027..f5ac0afeefad8354bfec1b6ce0bb626ba1dbf07c 100644 (file)
--- a/tests/expected.sadf-r
+++ b/tests/expected.sadf-r
@@ -2614,42 +2614,42 @@
 # uptime_cs; 0; ust_time; 1555594649; extra_next; 0; record_type; 2; HH:MM:SS; 13:37:29
 # uptime_cs; 722372; ust_time; 1555593619; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:19
 # name; A_PSI_CPU; nr_curr; 1; nr_alloc; 1; nr_ini; 1
-13:20:19 UTC; s_acpu10; 0; s_acpu60; 0; s_acpu300; 0; s_tcpu/s; 1473177; 1481906;
+13:20:19 UTC; %scpu-10; 0; %scpu-60; 0; %scpu-300; 0; %scpu; 1473177; 1481906;
 # uptime_cs; 725496; ust_time; 1555593629; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:29
 # name; A_PSI_CPU; nr_curr; 1; nr_alloc; 1; nr_ini; 1
-13:20:29 UTC; s_acpu10; 0; s_acpu60; 0; s_acpu300; 0; s_tcpu/s; 1481906; 1553911;
+13:20:29 UTC; %scpu-10; 0; %scpu-60; 0; %scpu-300; 0; %scpu; 1481906; 1553911;
 # uptime_cs; 729346; ust_time; 1555593639; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:39
 # name; A_PSI_CPU; nr_curr; 1; nr_alloc; 1; nr_ini; 1
-13:20:39 UTC; s_acpu10; 0; s_acpu60; 0; s_acpu300; 0; s_tcpu/s; 1553911; 1556997;
+13:20:39 UTC; %scpu-10; 0; %scpu-60; 0; %scpu-300; 0; %scpu; 1553911; 1556997;
 # uptime_cs; 731585; ust_time; 1555593649; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:49
 # name; A_PSI_CPU; nr_curr; 1; nr_alloc; 1; nr_ini; 1
-13:20:49 UTC; s_acpu10; 0; s_acpu60; 0; s_acpu300; 0; s_tcpu/s; 1556997; 1608139;
+13:20:49 UTC; %scpu-10; 0; %scpu-60; 0; %scpu-300; 0; %scpu; 1556997; 1608139;
 # uptime_cs; 0; ust_time; 1555594649; extra_next; 0; record_type; 2; HH:MM:SS; 13:37:29
 # uptime_cs; 722372; ust_time; 1555593619; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:19
 # name; A_PSI_IO; nr_curr; 1; nr_alloc; 1; nr_ini; 1
-13:20:19 UTC; s_aio10; 319; s_aio60; 114; s_aio300; 43; s_tio/s; 96242289; 96968324; f_aio10; 319; f_aio60; 114; f_aio300; 42; f_tio/s; 92732851; 93434041;
+13:20:19 UTC; %sio-10; 319; %sio-60; 114; %sio-300; 43; %sio; 96242289; 96968324; %fio-10; 319; %fio-60; 114; %fio-300; 42; %fio; 92732851; 93434041;
 # uptime_cs; 725496; ust_time; 1555593629; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:29
 # name; A_PSI_IO; nr_curr; 1; nr_alloc; 1; nr_ini; 1
-13:20:29 UTC; s_aio10; 0; s_aio60; 16; s_aio300; 29; s_tio/s; 96968324; 97403226; f_aio10; 0; f_aio60; 15; f_aio300; 28; f_tio/s; 93434041; 93822846;
+13:20:29 UTC; %sio-10; 0; %sio-60; 16; %sio-300; 29; %sio; 96968324; 97403226; %fio-10; 0; %fio-60; 15; %fio-300; 28; %fio; 93434041; 93822846;
 # uptime_cs; 729346; ust_time; 1555593639; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:39
 # name; A_PSI_IO; nr_curr; 1; nr_alloc; 1; nr_ini; 1
-13:20:39 UTC; s_aio10; 0; s_aio60; 7; s_aio300; 25; s_tio/s; 97403226; 97408223; f_aio10; 0; f_aio60; 7; f_aio300; 24; f_tio/s; 93822846; 93827811;
+13:20:39 UTC; %sio-10; 0; %sio-60; 7; %sio-300; 25; %sio; 97403226; 97408223; %fio-10; 0; %fio-60; 7; %fio-300; 24; %fio; 93822846; 93827811;
 # uptime_cs; 731585; ust_time; 1555593649; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:49
 # name; A_PSI_IO; nr_curr; 1; nr_alloc; 1; nr_ini; 1
-13:20:49 UTC; s_aio10; 0; s_aio60; 0; s_aio300; 3; s_tio/s; 97408223; 97617263; f_aio10; 0; f_aio60; 0; f_aio300; 3; f_tio/s; 93827811; 94001210;
+13:20:49 UTC; %sio-10; 0; %sio-60; 0; %sio-300; 3; %sio; 97408223; 97617263; %fio-10; 0; %fio-60; 0; %fio-300; 3; %fio; 93827811; 94001210;
 # uptime_cs; 0; ust_time; 1555594649; extra_next; 0; record_type; 2; HH:MM:SS; 13:37:29
 # uptime_cs; 722372; ust_time; 1555593619; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:19
 # name; A_PSI_MEM; nr_curr; 1; nr_alloc; 1; nr_ini; 1
-13:20:19 UTC; s_amem10; 312; s_amem60; 140; s_amem300; 3; s_tmem/s; 0; 16030; f_amem10; 0; f_amem60; 0; f_amem300; 0; f_tmem/s; 0; 7200;
+13:20:19 UTC; %smem-10; 312; %smem-60; 140; %smem-300; 3; %smem; 0; 16030; %fmem-10; 0; %fmem-60; 0; %fmem-300; 0; %fmem; 0; 7200;
 # uptime_cs; 725496; ust_time; 1555593629; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:29
 # name; A_PSI_MEM; nr_curr; 1; nr_alloc; 1; nr_ini; 1
-13:20:29 UTC; s_amem10; 2106; s_amem60; 1431; s_amem300; 380; s_tmem/s; 16030; 24037; f_amem10; 0; f_amem60; 0; f_amem300; 0; f_tmem/s; 7200; 9803;
+13:20:29 UTC; %smem-10; 2106; %smem-60; 1431; %smem-300; 380; %smem; 16030; 24037; %fmem-10; 0; %fmem-60; 0; %fmem-300; 0; %fmem; 7200; 9803;
 # uptime_cs; 729346; ust_time; 1555593639; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:39
 # name; A_PSI_MEM; nr_curr; 1; nr_alloc; 1; nr_ini; 1
-13:20:39 UTC; s_amem10; 9980; s_amem60; 7016; s_amem300; 3870; s_tmem/s; 24037; 56879; f_amem10; 0; f_amem60; 0; f_amem300; 0; f_tmem/s; 9803; 12037;
+13:20:39 UTC; %smem-10; 9980; %smem-60; 7016; %smem-300; 3870; %smem; 24037; 56879; %fmem-10; 0; %fmem-60; 0; %fmem-300; 0; %fmem; 9803; 12037;
 # uptime_cs; 731585; ust_time; 1555593649; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:49
 # name; A_PSI_MEM; nr_curr; 1; nr_alloc; 1; nr_ini; 1
-13:20:49 UTC; s_amem10; 2300; s_amem60; 300; s_amem300; 36; s_tmem/s; 56879; 103290; f_amem10; 0; f_amem60; 0; f_amem300; 0; f_tmem/s; 12037; 45780;
+13:20:49 UTC; %smem-10; 2300; %smem-60; 300; %smem-300; 36; %smem; 56879; 103290; %fmem-10; 0; %fmem-60; 0; %fmem-300; 0; %fmem; 12037; 45780;
 # uptime_cs; 0; ust_time; 1555594649; extra_next; 0; record_type; 2; HH:MM:SS; 13:37:29
 13:37:29 UTC; LINUX-RESTART (8 CPU)
 # uptime_cs; 0; ust_time; 1555594749; extra_next; 0; record_type; 4; HH:MM:SS; 13:39:09
@@ -3313,10 +3313,10 @@
 13:54:35 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048;
 # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35
 # name; A_PSI_CPU; nr_curr; 1; nr_alloc; 1; nr_ini; 1
-13:54:35 UTC; s_acpu10; 0; s_acpu60; 0; s_acpu300; 0; s_tcpu/s; 0; 0;
+13:54:35 UTC; %scpu-10; 0; %scpu-60; 0; %scpu-300; 0; %scpu; 0; 0;
 # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35
 # name; A_PSI_IO; nr_curr; 1; nr_alloc; 1; nr_ini; 1
-13:54:35 UTC; s_aio10; 0; s_aio60; 0; s_aio300; 0; s_tio/s; 0; 0; f_aio10; 0; f_aio60; 0; f_aio300; 0; f_tio/s; 0; 0;
+13:54:35 UTC; %sio-10; 0; %sio-60; 0; %sio-300; 0; %sio; 0; 0; %fio-10; 0; %fio-60; 0; %fio-300; 0; %fio; 0; 0;
 # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35
 # name; A_PSI_MEM; nr_curr; 1; nr_alloc; 1; nr_ini; 1
-13:54:35 UTC; s_amem10; 0; s_amem60; 0; s_amem300; 0; s_tmem/s; 0; 0; f_amem10; 0; f_amem60; 0; f_amem300; 0; f_tmem/s; 0; 0;
+13:54:35 UTC; %smem-10; 0; %smem-60; 0; %smem-300; 0; %smem; 0; 0; %fmem-10; 0; %fmem-60; 0; %fmem-300; 0; %fmem; 0; 0;

diff --git a/tests/expected.sadf-x b/tests/expected.sadf-x
index e7c961a684000fa4e39bb3ce3824cdaa021182f7..b7341179792e2b36804d07b0a5f3f33311df5d52 100644 (file)
--- a/tests/expected.sadf-x
+++ b/tests/expected.sadf-x
@@ -639,9 +639,9 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                        <filesystem fsname="/dev/sda6" MBfsfree="279700" MBfsused="15464" fsused-percent="5.24" ufsused-percent="10.33" Ifree="19201593" Iused="455" Iused-percent="0.00"/>
                                </filesystems>
                                <psi per="second">
-                                       <psi-cpu some_avg10="0.00" some_avg60="0.00" some_avg300="0.00" some_total="280.04"/>
-                                       <psi-io some_avg10="3.19" some_avg60="1.14" some_avg300="0.43" some_total="23292.75" full_avg10="3.19" full_avg60="1.14" full_avg300="0.42" full_total="22495.67"/>
-                                       <psi-mem some_avg10="3.12" some_avg60="1.40" some_avg300="0.03" some_total="514.28" full_avg10="0.00" full_avg60="0.00" full_avg300="0.00" full_total="230.99"/>
+                                       <psi-cpu some_avg10="0.00" some_avg60="0.00" some_avg300="0.00" some_avg="0.03"/>
+                                       <psi-io some_avg10="3.19" some_avg60="1.14" some_avg300="0.43" some_avg="2.33" full_avg10="3.19" full_avg60="1.14" full_avg300="0.42" full_avg="2.25"/>
+                                       <psi-mem some_avg10="3.12" some_avg60="1.40" some_avg300="0.03" some_avg="0.05" full_avg10="0.00" full_avg60="0.00" full_avg300="0.00" full_avg="0.02"/>
                                </psi>
                        </timestamp>
                        <timestamp date="2019-04-18" time="13:20:29" utc="1" interval="31">
@@ -1268,9 +1268,9 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                        <filesystem fsname="/dev/sdg" MBfsfree="85582" MBfsused="7774" fsused-percent="8.33" ufsused-percent="13.45" Ifree="6008414" Iused="102818" Iused-percent="1.68"/>
                                </filesystems>
                                <psi per="second">
-                                       <psi-cpu some_avg10="0.00" some_avg60="0.00" some_avg300="0.00" some_total="2304.90"/>
-                                       <psi-io some_avg10="0.00" some_avg60="0.16" some_avg300="0.29" some_total="13921.32" full_avg10="0.00" full_avg60="0.15" full_avg300="0.28" full_total="12445.74"/>
-                                       <psi-mem some_avg10="21.06" some_avg60="14.31" some_avg300="3.80" some_total="256.31" full_avg10="0.00" full_avg60="0.00" full_avg300="0.00" full_total="83.32"/>
+                                       <psi-cpu some_avg10="0.00" some_avg60="0.00" some_avg300="0.00" some_avg="0.23"/>
+                                       <psi-io some_avg10="0.00" some_avg60="0.16" some_avg300="0.29" some_avg="1.39" full_avg10="0.00" full_avg60="0.15" full_avg300="0.28" full_avg="1.24"/>
+                                       <psi-mem some_avg10="21.06" some_avg60="14.31" some_avg300="3.80" some_avg="0.03" full_avg10="0.00" full_avg60="0.00" full_avg300="0.00" full_avg="0.01"/>
                                </psi>
                        </timestamp>
                        <timestamp date="2019-04-18" time="13:20:39" utc="1" interval="39">
@@ -1901,9 +1901,9 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                        <filesystem fsname="/dev/sdg" MBfsfree="85582" MBfsused="7774" fsused-percent="8.33" ufsused-percent="13.45" Ifree="6008414" Iused="102818" Iused-percent="1.68"/>
                                </filesystems>
                                <psi per="second">
-                                       <psi-cpu some_avg10="0.00" some_avg60="0.00" some_avg300="0.00" some_total="80.16"/>
-                                       <psi-io some_avg10="0.00" some_avg60="0.07" some_avg300="0.25" some_total="129.79" full_avg10="0.00" full_avg60="0.07" full_avg300="0.24" full_total="128.96"/>
-                                       <psi-mem some_avg10="99.80" some_avg60="70.16" some_avg300="38.70" some_total="853.04" full_avg10="0.00" full_avg60="0.00" full_avg300="0.00" full_total="58.03"/>
+                                       <psi-cpu some_avg10="0.00" some_avg60="0.00" some_avg300="0.00" some_avg="0.01"/>
+                                       <psi-io some_avg10="0.00" some_avg60="0.07" some_avg300="0.25" some_avg="0.01" full_avg10="0.00" full_avg60="0.07" full_avg300="0.24" full_avg="0.01"/>
+                                       <psi-mem some_avg10="99.80" some_avg60="70.16" some_avg300="38.70" some_avg="0.09" full_avg10="0.00" full_avg60="0.00" full_avg300="0.00" full_avg="0.01"/>
                                </psi>
                        </timestamp>
                        <timestamp date="2019-04-18" time="13:20:49" utc="1" interval="22">
@@ -2536,9 +2536,9 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                        <filesystem fsname="/dev/sda6" MBfsfree="279700" MBfsused="15464" fsused-percent="5.24" ufsused-percent="10.33" Ifree="19201593" Iused="455" Iused-percent="0.00"/>
                                </filesystems>
                                <psi per="second">
-                                       <psi-cpu some_avg10="0.00" some_avg60="0.00" some_avg300="0.00" some_total="2284.14"/>
-                                       <psi-io some_avg10="0.00" some_avg60="0.00" some_avg300="0.03" some_total="9336.31" full_avg10="0.00" full_avg60="0.00" full_avg300="0.03" full_total="7744.48"/>
-                                       <psi-mem some_avg10="23.00" some_avg60="3.00" some_avg300="0.36" some_total="2072.85" full_avg10="0.00" full_avg60="0.00" full_avg300="0.00" full_total="1507.06"/>
+                                       <psi-cpu some_avg10="0.00" some_avg60="0.00" some_avg300="0.00" some_avg="0.23"/>
+                                       <psi-io some_avg10="0.00" some_avg60="0.00" some_avg300="0.03" some_avg="0.93" full_avg10="0.00" full_avg60="0.00" full_avg300="0.03" full_avg="0.77"/>
+                                       <psi-mem some_avg10="23.00" some_avg60="3.00" some_avg300="0.36" some_avg="0.21" full_avg10="0.00" full_avg60="0.00" full_avg300="0.00" full_avg="0.15"/>
                                </psi>
                        </timestamp>
                        <timestamp date="2019-04-18" time="13:54:35" utc="1" interval="31">
@@ -3178,9 +3178,9 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                        <filesystem fsname="/dev/sda6" MBfsfree="279700" MBfsused="15464" fsused-percent="5.24" ufsused-percent="10.33" Ifree="19201593" Iused="455" Iused-percent="0.00"/>
                                </filesystems>
                                <psi per="second">
-                                       <psi-cpu some_avg10="0.00" some_avg60="0.00" some_avg300="0.00" some_total="0.00"/>
-                                       <psi-io some_avg10="0.00" some_avg60="0.00" some_avg300="0.00" some_total="0.00" full_avg10="0.00" full_avg60="0.00" full_avg300="0.00" full_total="0.00"/>
-                                       <psi-mem some_avg10="0.00" some_avg60="0.00" some_avg300="0.00" some_total="0.00" full_avg10="0.00" full_avg60="0.00" full_avg300="0.00" full_total="0.00"/>
+                                       <psi-cpu some_avg10="0.00" some_avg60="0.00" some_avg300="0.00" some_avg="0.00"/>
+                                       <psi-io some_avg10="0.00" some_avg60="0.00" some_avg300="0.00" some_avg="0.00" full_avg10="0.00" full_avg60="0.00" full_avg300="0.00" full_avg="0.00"/>
+                                       <psi-mem some_avg10="0.00" some_avg60="0.00" some_avg300="0.00" some_avg="0.00" full_avg10="0.00" full_avg60="0.00" full_avg300="0.00" full_avg="0.00"/>
                                </psi>
                        </timestamp>
                </statistics>

diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec
index 05b80a4a7a3072885d1772cb0139545ef6a0fe09..4f32504e5f99e3ac1217cf1e2bebad2ffd12d7aa 100644 (file)
--- a/tests/expected.sar-dec
+++ b/tests/expected.sar-dec
@@ -2948,26 +2948,26 @@ Summary:       279700     15464         5        10  19201593       455
 Summary:       279700     15464         5        10  19201593       455         0 /dev/sdf
 Summary:        85582      7774         8        13   6008414    102818         2 /dev/sdg
 
-13:20:09     s_acpu10  s_acpu60 s_acpu300  s_tcpu/s
-13:20:19            0         0         0       280
-13:20:29            0         0         0      2305
-13:20:39            0         0         0        80
-13:20:49            0         0         0      2284
-Average:            0         0         0      1095
+13:20:09     %scpu-10  %scpu-60 %scpu-300     %scpu
+13:20:19            0         0         0         0
+13:20:29            0         0         0         0
+13:20:39            0         0         0         0
+13:20:49            0         0         0         0
+Average:            0         0         0         0
 
-13:20:09      s_aio10   s_aio60  s_aio300   s_tio/s   f_aio10   f_aio60  f_aio300   f_tio/s
-13:20:19            3         1         0     23293         3         1         0     22496
-13:20:29            0         0         0     13921         0         0         0     12446
-13:20:39            0         0         0       130         0         0         0       129
-13:20:49            0         0         0      9336         0         0         0      7744
-Average:            1         0         0     11151         1         0         0     10287
+13:20:09      %sio-10   %sio-60  %sio-300      %sio   %fio-10   %fio-60  %fio-300      %fio
+13:20:19            3         1         0         2         3         1         0         2
+13:20:29            0         0         0         1         0         0         0         1
+13:20:39            0         0         0         0         0         0         0         0
+13:20:49            0         0         0         1         0         0         0         1
+Average:            1         0         0         1         1         0         0         1
 
-13:20:09     s_amem10  s_amem60 s_amem300  s_tmem/s  f_amem10  f_amem60 f_amem300  f_tmem/s
-13:20:19            3         1         0       514         0         0         0       231
-13:20:29           21        14         4       256         0         0         0        83
-13:20:39          100        70        39       853         0         0         0        58
-13:20:49           23         3         0      2073         0         0         0      1507
-Average:           37        22        11       838         0         0         0       371
+13:20:09     %smem-10  %smem-60 %smem-300     %smem  %fmem-10  %fmem-60 %fmem-300     %fmem
+13:20:19            3         1         0         0         0         0         0         0
+13:20:29           21        14         4         0         0         0         0         0
+13:20:39          100        70        39         0         0         0         0         0
+13:20:49           23         3         0         0         0         0         0         0
+Average:           37        22        11         0         0         0         0         0
 
 13:37:29     LINUX RESTART     (8 CPU)
 
@@ -4213,14 +4213,14 @@ Summary:       279700     15464         5        10  19201593       455
 Summary:        85582      7774         8        13   6008414    102818         2 /dev/sda12
 Summary:       279700     15464         5        10  19201593       455         0 /dev/sda6
 
-13:54:15     s_acpu10  s_acpu60 s_acpu300  s_tcpu/s
+13:54:15     %scpu-10  %scpu-60 %scpu-300     %scpu
 13:54:35            0         0         0         0
 Average:            0         0         0         0
 
-13:54:15      s_aio10   s_aio60  s_aio300   s_tio/s   f_aio10   f_aio60  f_aio300   f_tio/s
+13:54:15      %sio-10   %sio-60  %sio-300      %sio   %fio-10   %fio-60  %fio-300      %fio
 13:54:35            0         0         0         0         0         0         0         0
 Average:            0         0         0         0         0         0         0         0
 
-13:54:15     s_amem10  s_amem60 s_amem300  s_tmem/s  f_amem10  f_amem60 f_amem300  f_tmem/s
+13:54:15     %smem-10  %smem-60 %smem-300     %smem  %fmem-10  %fmem-60 %fmem-300     %fmem
 13:54:35            0         0         0         0         0         0         0         0
 Average:            0         0         0         0         0         0         0         0

diff --git a/tests/expected.sar-human b/tests/expected.sar-human
index 39916211897f8799b811a1cfd94ae8df7ca94bd2..bf2e74402eac87ed16b14e3873f0c085a5ef67b9 100644 (file)
--- a/tests/expected.sar-human
+++ b/tests/expected.sar-human
@@ -2948,26 +2948,26 @@ Summary:       273.1G     15.1G      5.2%     10.3%  19201593       455      0.0
 Summary:       273.1G     15.1G      5.2%     10.3%  19201593       455      0.0% /dev/sdf
 Summary:        83.6G      7.6G      8.3%     13.5%   6008414    102818      1.7% /dev/sdg
 
-13:20:09     s_acpu10  s_acpu60 s_acpu300  s_tcpu/s
-13:20:19         0.0%      0.0%      0.0%    280.04
-13:20:29         0.0%      0.0%      0.0%   2304.90
-13:20:39         0.0%      0.0%      0.0%     80.16
-13:20:49         0.0%      0.0%      0.0%   2284.14
-Average:         0.0%      0.0%      0.0%   1094.58
+13:20:09     %scpu-10  %scpu-60 %scpu-300     %scpu
+13:20:19         0.0%      0.0%      0.0%      0.0%
+13:20:29         0.0%      0.0%      0.0%      0.2%
+13:20:39         0.0%      0.0%      0.0%      0.0%
+13:20:49         0.0%      0.0%      0.0%      0.2%
+Average:         0.0%      0.0%      0.0%      0.1%
 
-13:20:09      s_aio10   s_aio60  s_aio300   s_tio/s   f_aio10   f_aio60  f_aio300   f_tio/s
-13:20:19         3.2%      1.1%      0.4%  23292.75      3.2%      1.1%      0.4%  22495.67
-13:20:29         0.0%      0.2%      0.3%  13921.32      0.0%      0.1%      0.3%  12445.74
-13:20:39         0.0%      0.1%      0.2%    129.79      0.0%      0.1%      0.2%    128.96
-13:20:49         0.0%      0.0%      0.0%   9336.31      0.0%      0.0%      0.0%   7744.48
-Average:         0.8%      0.3%      0.2%  11151.45      0.8%      0.3%      0.2%  10286.77
+13:20:09      %sio-10   %sio-60  %sio-300      %sio   %fio-10   %fio-60  %fio-300      %fio
+13:20:19         3.2%      1.1%      0.4%      2.3%      3.2%      1.1%      0.4%      2.2%
+13:20:29         0.0%      0.2%      0.3%      1.4%      0.0%      0.1%      0.3%      1.2%
+13:20:39         0.0%      0.1%      0.2%      0.0%      0.0%      0.1%      0.2%      0.0%
+13:20:49         0.0%      0.0%      0.0%      0.9%      0.0%      0.0%      0.0%      0.8%
+Average:         0.8%      0.3%      0.2%      1.1%      0.8%      0.3%      0.2%      1.0%
 
-13:20:09     s_amem10  s_amem60 s_amem300  s_tmem/s  f_amem10  f_amem60 f_amem300  f_tmem/s
-13:20:19         3.1%      1.4%      0.0%    514.28      0.0%      0.0%      0.0%    230.99
-13:20:29        21.1%     14.3%      3.8%    256.31      0.0%      0.0%      0.0%     83.32
-13:20:39        99.8%     70.2%     38.7%    853.04      0.0%      0.0%      0.0%     58.03
-13:20:49        23.0%      3.0%      0.4%   2072.85      0.0%      0.0%      0.0%   1507.06
-Average:        36.7%     22.2%     10.7%    837.71      0.0%      0.0%      0.0%    371.29
+13:20:09     %smem-10  %smem-60 %smem-300     %smem  %fmem-10  %fmem-60 %fmem-300     %fmem
+13:20:19         3.1%      1.4%      0.0%      0.1%      0.0%      0.0%      0.0%      0.0%
+13:20:29        21.1%     14.3%      3.8%      0.0%      0.0%      0.0%      0.0%      0.0%
+13:20:39        99.8%     70.2%     38.7%      0.1%      0.0%      0.0%      0.0%      0.0%
+13:20:49        23.0%      3.0%      0.4%      0.2%      0.0%      0.0%      0.0%      0.2%
+Average:        36.7%     22.2%     10.7%      0.1%      0.0%      0.0%      0.0%      0.0%
 
 13:37:29     LINUX RESTART     (8 CPU)
 
@@ -4213,14 +4213,14 @@ Summary:       273.1G     15.1G      5.2%     10.3%  19201593       455      0.0
 Summary:        83.6G      7.6G      8.3%     13.5%   6008414    102818      1.7% /dev/sda12
 Summary:       273.1G     15.1G      5.2%     10.3%  19201593       455      0.0% /dev/sda6
 
-13:54:15     s_acpu10  s_acpu60 s_acpu300  s_tcpu/s
-13:54:35         0.0%      0.0%      0.0%      0.00
-Average:         0.0%      0.0%      0.0%      0.00
+13:54:15     %scpu-10  %scpu-60 %scpu-300     %scpu
+13:54:35         0.0%      0.0%      0.0%      0.0%
+Average:         0.0%      0.0%      0.0%      0.0%
 
-13:54:15      s_aio10   s_aio60  s_aio300   s_tio/s   f_aio10   f_aio60  f_aio300   f_tio/s
-13:54:35         0.0%      0.0%      0.0%      0.00      0.0%      0.0%      0.0%      0.00
-Average:         0.0%      0.0%      0.0%      0.00      0.0%      0.0%      0.0%      0.00
+13:54:15      %sio-10   %sio-60  %sio-300      %sio   %fio-10   %fio-60  %fio-300      %fio
+13:54:35         0.0%      0.0%      0.0%      0.0%      0.0%      0.0%      0.0%      0.0%
+Average:         0.0%      0.0%      0.0%      0.0%      0.0%      0.0%      0.0%      0.0%
 
-13:54:15     s_amem10  s_amem60 s_amem300  s_tmem/s  f_amem10  f_amem60 f_amem300  f_tmem/s
-13:54:35         0.0%      0.0%      0.0%      0.00      0.0%      0.0%      0.0%      0.00
-Average:         0.0%      0.0%      0.0%      0.00      0.0%      0.0%      0.0%      0.00
+13:54:15     %smem-10  %smem-60 %smem-300     %smem  %fmem-10  %fmem-60 %fmem-300     %fmem
+13:54:35         0.0%      0.0%      0.0%      0.0%      0.0%      0.0%      0.0%      0.0%
+Average:         0.0%      0.0%      0.0%      0.0%      0.0%      0.0%      0.0%      0.0%

diff --git a/tests/expected2.sadf-g b/tests/expected2.sadf-g
index a42de925f663843384bf6ddefadfb28477748fce..c6458cc1d31cf87900767d239758fd3ad4be0c2b 100644 (file)
--- a/tests/expected2.sadf-g
+++ b/tests/expected2.sadf-g
@@ -5749,18 +5749,20 @@
 <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">s_tcpu/s (0.00, 2304.90)</text>
+<text x="795" y="50" style="fill: #696969; stroke: none; font-size: 12px">%scpu (0.00, 0.23)</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>
 <g transform="translate(70,250)">
 <text x="0" y="0" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">0.</text>
-<polyline points="0,700.00 720,700.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-0.086772)"/>
-<text x="0" y="-60" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">700.</text>
-<polyline points="0,1400.00 720,1400.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-0.086772)"/>
-<text x="0" y="-121" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">1400.</text>
-<polyline points="0,2100.00 720,2100.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-0.086772)"/>
-<text x="0" y="-182" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">2100.</text>
+<polyline points="0,25.00 720,25.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-50" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">25.</text>
+<polyline points="0,50.00 720,50.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-100" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">50.</text>
+<polyline points="0,75.00 720,75.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-150" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">75.</text>
+<polyline points="0,100.00 720,100.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-200" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">100.</text>
 <polyline points="0,0 0,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
 <text x="-15" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 0:00</text>
 <polyline points="7200,0 7200,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
@@ -5787,7 +5789,9 @@
 <text x="645" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">22:00</text>
 <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>
-<path d=" M48019,280 L48029,2304 L48039,80 L48049,2284 M50075,0" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.086772)"/>
+<g style="fill: #696969; stroke: none" transform="scale(0.008333,-2.000000)">
+<rect x="47988" y="0.00" height="0.03" width="31"/><rect x="47998" y="0.00" height="0.23" width="31"/><rect x="48000" y="0.00" height="0.01" width="39"/><rect x="48027" y="0.00" height="0.23" width="22"/>
+</g>
 </g>
 </g>
 <g id="g41-0" transform="translate(0,16570)">
@@ -5796,9 +5800,9 @@
 <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">s_aio10 (0.00, 3.19)</text>
-<text x="795" y="65" style="fill: #bebebe; stroke: none; font-size: 12px">s_aio60 (0.00, 1.14)</text>
-<text x="795" y="80" style="fill: #000000; stroke: none; font-size: 12px">s_aio300 (0.00, 0.43)</text>
+<text x="795" y="50" style="fill: #696969; stroke: none; font-size: 12px">%sio-10 (0.00, 3.19)</text>
+<text x="795" y="65" style="fill: #bebebe; stroke: none; font-size: 12px">%sio-60 (0.00, 1.14)</text>
+<text x="795" y="80" style="fill: #000000; stroke: none; font-size: 12px">%sio-300 (0.00, 0.43)</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>
@@ -5845,18 +5849,20 @@
 <tspan x="1855" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="1130,50 1130,250 1850,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
-<text x="1855" y="50" style="fill: #696969; stroke: none; font-size: 12px">s_tio/s (0.00, 23292.75)</text>
+<text x="1855" y="50" style="fill: #696969; stroke: none; font-size: 12px">%sio (0.00, 2.33)</text>
 <text x="2105" y="250" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">SYSSTAT.TEST
 <tspan x="2105" y="264" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">04/18/19</tspan>
 </text>
 <g transform="translate(1130,250)">
 <text x="0" y="0" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">0.</text>
-<polyline points="0,7000.00 720,7000.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-0.008586)"/>
-<text x="0" y="-60" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">7000.</text>
-<polyline points="0,14000.00 720,14000.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-0.008586)"/>
-<text x="0" y="-120" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">14000.</text>
-<polyline points="0,21000.00 720,21000.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-0.008586)"/>
-<text x="0" y="-180" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">21000.</text>
+<polyline points="0,25.00 720,25.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-50" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">25.</text>
+<polyline points="0,50.00 720,50.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-100" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">50.</text>
+<polyline points="0,75.00 720,75.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-150" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">75.</text>
+<polyline points="0,100.00 720,100.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-200" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">100.</text>
 <polyline points="0,0 0,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
 <text x="-15" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 0:00</text>
 <polyline points="7200,0 7200,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
@@ -5883,16 +5889,18 @@
 <text x="645" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">22:00</text>
 <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>
-<path d=" M48019,23292 L48029,13921 L48039,129 L48049,9336 M50075,0" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.008586)"/>
+<g style="fill: #696969; stroke: none" transform="scale(0.008333,-2.000000)">
+<rect x="47988" y="0.00" height="2.33" width="31"/><rect x="47998" y="0.00" height="1.39" width="31"/><rect x="48000" y="0.00" height="0.01" width="39"/><rect x="48027" y="0.00" height="0.93" width="22"/>
+</g>
 </g>
 <rect x="2120" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="2120" y="20" style="fill: #000000; stroke: none">I/O pressure trends (full)
 <tspan x="2915" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="2190,50 2190,250 2910,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
-<text x="2915" y="50" style="fill: #696969; stroke: none; font-size: 12px">f_aio10 (0.00, 3.19)</text>
-<text x="2915" y="65" style="fill: #bebebe; stroke: none; font-size: 12px">f_aio60 (0.00, 1.14)</text>
-<text x="2915" y="80" style="fill: #000000; stroke: none; font-size: 12px">f_aio300 (0.00, 0.42)</text>
+<text x="2915" y="50" style="fill: #696969; stroke: none; font-size: 12px">%fio-10 (0.00, 3.19)</text>
+<text x="2915" y="65" style="fill: #bebebe; stroke: none; font-size: 12px">%fio-60 (0.00, 1.14)</text>
+<text x="2915" y="80" style="fill: #000000; stroke: none; font-size: 12px">%fio-300 (0.00, 0.42)</text>
 <text x="3165" y="250" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">SYSSTAT.TEST
 <tspan x="3165" y="264" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">04/18/19</tspan>
 </text>
@@ -5939,18 +5947,20 @@
 <tspan x="3975" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="3250,50 3250,250 3970,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
-<text x="3975" y="50" style="fill: #696969; stroke: none; font-size: 12px">f_tio/s (0.00, 22495.67)</text>
+<text x="3975" y="50" style="fill: #696969; stroke: none; font-size: 12px">%fio (0.00, 2.25)</text>
 <text x="4225" y="250" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">SYSSTAT.TEST
 <tspan x="4225" y="264" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">04/18/19</tspan>
 </text>
 <g transform="translate(3250,250)">
 <text x="0" y="0" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">0.</text>
-<polyline points="0,7000.00 720,7000.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-0.008891)"/>
-<text x="0" y="-62" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">7000.</text>
-<polyline points="0,14000.00 720,14000.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-0.008891)"/>
-<text x="0" y="-124" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">14000.</text>
-<polyline points="0,21000.00 720,21000.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-0.008891)"/>
-<text x="0" y="-186" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">21000.</text>
+<polyline points="0,25.00 720,25.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-50" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">25.</text>
+<polyline points="0,50.00 720,50.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-100" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">50.</text>
+<polyline points="0,75.00 720,75.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-150" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">75.</text>
+<polyline points="0,100.00 720,100.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-200" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">100.</text>
 <polyline points="0,0 0,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
 <text x="-15" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 0:00</text>
 <polyline points="7200,0 7200,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
@@ -5977,7 +5987,9 @@
 <text x="645" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">22:00</text>
 <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>
-<path d=" M48019,22495 L48029,12445 L48039,128 L48049,7744 M50075,0" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.008891)"/>
+<g style="fill: #696969; stroke: none" transform="scale(0.008333,-2.000000)">
+<rect x="47988" y="0.00" height="2.25" width="31"/><rect x="47998" y="0.00" height="1.24" width="31"/><rect x="48000" y="0.00" height="0.01" width="39"/><rect x="48027" y="0.00" height="0.77" width="22"/>
+</g>
 </g>
 </g>
 <g id="g42-0" transform="translate(0,16880)">
@@ -5986,9 +5998,9 @@
 <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">s_amem10 (0.00, 99.80)</text>
-<text x="795" y="65" style="fill: #bebebe; stroke: none; font-size: 12px">s_amem60 (0.00, 70.16)</text>
-<text x="795" y="80" style="fill: #000000; stroke: none; font-size: 12px">s_amem300 (0.00, 38.70)</text>
+<text x="795" y="50" style="fill: #696969; stroke: none; font-size: 12px">%smem-10 (0.00, 99.80)</text>
+<text x="795" y="65" style="fill: #bebebe; stroke: none; font-size: 12px">%smem-60 (0.00, 70.16)</text>
+<text x="795" y="80" style="fill: #000000; stroke: none; font-size: 12px">%smem-300 (0.00, 38.70)</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>
@@ -6035,18 +6047,20 @@
 <tspan x="1855" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="1130,50 1130,250 1850,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
-<text x="1855" y="50" style="fill: #696969; stroke: none; font-size: 12px">s_tmem/s (0.00, 2072.85)</text>
+<text x="1855" y="50" style="fill: #696969; stroke: none; font-size: 12px">%smem (0.00, 0.21)</text>
 <text x="2105" y="250" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">SYSSTAT.TEST
 <tspan x="2105" y="264" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">04/18/19</tspan>
 </text>
 <g transform="translate(1130,250)">
 <text x="0" y="0" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">0.</text>
-<polyline points="0,600.00 720,600.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-0.096486)"/>
-<text x="0" y="-57" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">600.</text>
-<polyline points="0,1200.00 720,1200.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-0.096486)"/>
-<text x="0" y="-115" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">1200.</text>
-<polyline points="0,1800.00 720,1800.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-0.096486)"/>
-<text x="0" y="-173" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">1800.</text>
+<polyline points="0,25.00 720,25.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-50" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">25.</text>
+<polyline points="0,50.00 720,50.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-100" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">50.</text>
+<polyline points="0,75.00 720,75.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-150" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">75.</text>
+<polyline points="0,100.00 720,100.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-200" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">100.</text>
 <polyline points="0,0 0,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
 <text x="-15" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 0:00</text>
 <polyline points="7200,0 7200,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
@@ -6073,25 +6087,29 @@
 <text x="645" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">22:00</text>
 <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>
-<path d=" M48019,514 L48029,256 L48039,853 L48049,2072 M50075,0" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.096486)"/>
+<g style="fill: #696969; stroke: none" transform="scale(0.008333,-2.000000)">
+<rect x="47988" y="0.00" height="0.05" width="31"/><rect x="47998" y="0.00" height="0.03" width="31"/><rect x="48000" y="0.00" height="0.09" width="39"/><rect x="48027" y="0.00" height="0.21" width="22"/>
+</g>
 </g>
 <rect x="2120" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="2120" y="20" style="fill: #000000; stroke: none">Memory stall time (full)
 <tspan x="2915" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="2190,50 2190,250 2910,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
-<text x="2915" y="50" style="fill: #696969; stroke: none; font-size: 12px">f_tmem/s (0.00, 1507.06)</text>
+<text x="2915" y="50" style="fill: #696969; stroke: none; font-size: 12px">%fmem (0.00, 0.15)</text>
 <text x="3165" y="250" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">SYSSTAT.TEST
 <tspan x="3165" y="264" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">04/18/19</tspan>
 </text>
 <g transform="translate(2190,250)">
 <text x="0" y="0" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">0.</text>
-<polyline points="0,500.00 720,500.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-0.132709)"/>
-<text x="0" y="-66" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">500.</text>
-<polyline points="0,1000.00 720,1000.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-0.132709)"/>
-<text x="0" y="-132" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">1000.</text>
-<polyline points="0,1500.00 720,1500.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-0.132709)"/>
-<text x="0" y="-199" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">1500.</text>
+<polyline points="0,25.00 720,25.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-50" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">25.</text>
+<polyline points="0,50.00 720,50.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-100" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">50.</text>
+<polyline points="0,75.00 720,75.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-150" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">75.</text>
+<polyline points="0,100.00 720,100.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-200" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">100.</text>
 <polyline points="0,0 0,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
 <text x="-15" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 0:00</text>
 <polyline points="7200,0 7200,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
@@ -6118,7 +6136,9 @@
 <text x="645" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">22:00</text>
 <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>
-<path d=" M48019,230 L48029,83 L48039,58 L48049,1507 M50075,0" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.132709)"/>
+<g style="fill: #696969; stroke: none" transform="scale(0.008333,-2.000000)">
+<rect x="47988" y="0.00" height="0.02" width="31"/><rect x="47998" y="0.00" height="0.01" width="31"/><rect x="48000" y="0.00" height="0.01" width="39"/><rect x="48027" y="0.00" height="0.15" width="22"/>
+</g>
 </g>
 </g>
 <!-- Actual canvas height: 17190 -->

diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all
index b35de719b967a0229d2bed6604e64572846057ac..51ac114678391079ab6d4858c4240435e62e7228 100644 (file)
--- a/tests/expected2.sar-all
+++ b/tests/expected2.sar-all
@@ -2948,26 +2948,26 @@ Summary:       279700     15464      5.24     10.33  19201593       455      0.0
 Summary:       279700     15464      5.24     10.33  19201593       455      0.00 /dev/sdf
 Summary:        85582      7774      8.33     13.45   6008414    102818      1.68 /dev/sdg
 
-13:20:09     s_acpu10  s_acpu60 s_acpu300  s_tcpu/s
-13:20:19         0.00      0.00      0.00    280.04
-13:20:29         0.00      0.00      0.00   2304.90
-13:20:39         0.00      0.00      0.00     80.16
-13:20:49         0.00      0.00      0.00   2284.14
-Average:         0.00      0.00      0.00   1094.58
+13:20:09     %scpu-10  %scpu-60 %scpu-300     %scpu
+13:20:19         0.00      0.00      0.00      0.03
+13:20:29         0.00      0.00      0.00      0.23
+13:20:39         0.00      0.00      0.00      0.01
+13:20:49         0.00      0.00      0.00      0.23
+Average:         0.00      0.00      0.00      0.11
 
-13:20:09      s_aio10   s_aio60  s_aio300   s_tio/s   f_aio10   f_aio60  f_aio300   f_tio/s
-13:20:19         3.19      1.14      0.43  23292.75      3.19      1.14      0.42  22495.67
-13:20:29         0.00      0.16      0.29  13921.32      0.00      0.15      0.28  12445.74
-13:20:39         0.00      0.07      0.25    129.79      0.00      0.07      0.24    128.96
-13:20:49         0.00      0.00      0.03   9336.31      0.00      0.00      0.03   7744.48
-Average:         0.80      0.34      0.25  11151.45      0.80      0.34      0.24  10286.77
+13:20:09      %sio-10   %sio-60  %sio-300      %sio   %fio-10   %fio-60  %fio-300      %fio
+13:20:19         3.19      1.14      0.43      2.33      3.19      1.14      0.42      2.25
+13:20:29         0.00      0.16      0.29      1.39      0.00      0.15      0.28      1.24
+13:20:39         0.00      0.07      0.25      0.01      0.00      0.07      0.24      0.01
+13:20:49         0.00      0.00      0.03      0.93      0.00      0.00      0.03      0.77
+Average:         0.80      0.34      0.25      1.12      0.80      0.34      0.24      1.03
 
-13:20:09     s_amem10  s_amem60 s_amem300  s_tmem/s  f_amem10  f_amem60 f_amem300  f_tmem/s
-13:20:19         3.12      1.40      0.03    514.28      0.00      0.00      0.00    230.99
-13:20:29        21.06     14.31      3.80    256.31      0.00      0.00      0.00     83.32
-13:20:39        99.80     70.16     38.70    853.04      0.00      0.00      0.00     58.03
-13:20:49        23.00      3.00      0.36   2072.85      0.00      0.00      0.00   1507.06
-Average:        36.74     22.22     10.72    837.71      0.00      0.00      0.00    371.29
+13:20:09     %smem-10  %smem-60 %smem-300     %smem  %fmem-10  %fmem-60 %fmem-300     %fmem
+13:20:19         3.12      1.40      0.03      0.05      0.00      0.00      0.00      0.02
+13:20:29        21.06     14.31      3.80      0.03      0.00      0.00      0.00      0.01
+13:20:39        99.80     70.16     38.70      0.09      0.00      0.00      0.00      0.01
+13:20:49        23.00      3.00      0.36      0.21      0.00      0.00      0.00      0.15
+Average:        36.74     22.22     10.72      0.08      0.00      0.00      0.00      0.04
 
 13:37:29     LINUX RESTART     (8 CPU)
 
@@ -4213,14 +4213,14 @@ Summary:       279700     15464      5.24     10.33  19201593       455      0.0
 Summary:        85582      7774      8.33     13.45   6008414    102818      1.68 /dev/sda12
 Summary:       279700     15464      5.24     10.33  19201593       455      0.00 /dev/sda6
 
-13:54:15     s_acpu10  s_acpu60 s_acpu300  s_tcpu/s
+13:54:15     %scpu-10  %scpu-60 %scpu-300     %scpu
 13:54:35         0.00      0.00      0.00      0.00
 Average:         0.00      0.00      0.00      0.00
 
-13:54:15      s_aio10   s_aio60  s_aio300   s_tio/s   f_aio10   f_aio60  f_aio300   f_tio/s
+13:54:15      %sio-10   %sio-60  %sio-300      %sio   %fio-10   %fio-60  %fio-300      %fio
 13:54:35         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
 Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
 
-13:54:15     s_amem10  s_amem60 s_amem300  s_tmem/s  f_amem10  f_amem60 f_amem300  f_tmem/s
+13:54:15     %smem-10  %smem-60 %smem-300     %smem  %fmem-10  %fmem-60 %fmem-300     %fmem
 13:54:35         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
 Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00

diff --git a/tests/expected3.sar-all b/tests/expected3.sar-all
index 26767e74ce75e7494fd3933bd655ff358381e732..de7411fb8129cfc1b6f16dbe30050b348733de82 100644 (file)
--- a/tests/expected3.sar-all
+++ b/tests/expected3.sar-all
@@ -407,25 +407,25 @@ Summary:       279700     15464      5.24     10.33  19201593       455      0.0
 Summary:       279700     15464      5.24     10.33  19201593       455      0.00 /dev/sdf
 Summary:        85582      7774      8.33     13.45   6008414    102818      1.68 /dev/sdg
 
-13:20:09     s_acpu10  s_acpu60 s_acpu300  s_tcpu/s
-13:20:19         0.00      0.00      0.00    280.04
-13:20:29         0.00      0.00      0.00   2304.90
-13:20:39         0.00      0.00      0.00     80.16
-13:20:49         0.00      0.00      0.00   2284.14
-Average:         0.00      0.00      0.00   1094.58
-
-13:20:09      s_aio10   s_aio60  s_aio300   s_tio/s   f_aio10   f_aio60  f_aio300   f_tio/s
-13:20:19         3.19      1.14      0.43  23292.75      3.19      1.14      0.42  22495.67
-13:20:29         0.00      0.16      0.29  13921.32      0.00      0.15      0.28  12445.74
-13:20:39         0.00      0.07      0.25    129.79      0.00      0.07      0.24    128.96
-13:20:49         0.00      0.00      0.03   9336.31      0.00      0.00      0.03   7744.48
-Average:         0.80      0.34      0.25  11151.45      0.80      0.34      0.24  10286.77
-
-13:20:09     s_amem10  s_amem60 s_amem300  s_tmem/s  f_amem10  f_amem60 f_amem300  f_tmem/s
-13:20:19         3.12      1.40      0.03    514.28      0.00      0.00      0.00    230.99
-13:20:29        21.06     14.31      3.80    256.31      0.00      0.00      0.00     83.32
-13:20:39        99.80     70.16     38.70    853.04      0.00      0.00      0.00     58.03
-13:20:49        23.00      3.00      0.36   2072.85      0.00      0.00      0.00   1507.06
-Average:        36.74     22.22     10.72    837.71      0.00      0.00      0.00    371.29
+13:20:09     %scpu-10  %scpu-60 %scpu-300     %scpu
+13:20:19         0.00      0.00      0.00      0.03
+13:20:29         0.00      0.00      0.00      0.23
+13:20:39         0.00      0.00      0.00      0.01
+13:20:49         0.00      0.00      0.00      0.23
+Average:         0.00      0.00      0.00      0.11
+
+13:20:09      %sio-10   %sio-60  %sio-300      %sio   %fio-10   %fio-60  %fio-300      %fio
+13:20:19         3.19      1.14      0.43      2.33      3.19      1.14      0.42      2.25
+13:20:29         0.00      0.16      0.29      1.39      0.00      0.15      0.28      1.24
+13:20:39         0.00      0.07      0.25      0.01      0.00      0.07      0.24      0.01
+13:20:49         0.00      0.00      0.03      0.93      0.00      0.00      0.03      0.77
+Average:         0.80      0.34      0.25      1.12      0.80      0.34      0.24      1.03
+
+13:20:09     %smem-10  %smem-60 %smem-300     %smem  %fmem-10  %fmem-60 %fmem-300     %fmem
+13:20:19         3.12      1.40      0.03      0.05      0.00      0.00      0.00      0.02
+13:20:29        21.06     14.31      3.80      0.03      0.00      0.00      0.00      0.01
+13:20:39        99.80     70.16     38.70      0.09      0.00      0.00      0.00      0.01
+13:20:49        23.00      3.00      0.36      0.21      0.00      0.00      0.00      0.15
+Average:        36.74     22.22     10.72      0.08      0.00      0.00      0.00      0.04
 
 13:37:29     LINUX RESTART     (8 CPU)