simtest: Try to simulate the addition of a new FB host

For this, we need to make sure that FB hosts will always be read in
the same order (and especially on Travis CI VM) though this may depend
on the underlying filesystem implementation.

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

diff --git a/tests/expected.sadf-d b/tests/expected.sadf-d
index 609da41820da5156314fca58b98968416c21a439..a83fa522290a23130b73feb81c053b288d8e490b 100644 (file)
--- a/tests/expected.sadf-d
+++ b/tests/expected.sadf-d
@@ -2235,7 +2235,9 @@ SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;0.00;0.00;0.00;0.00
 SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;host0;0.00;0.00;0.00;0.00
 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;host0;0.00;0.00;0.00;0.00
 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;host0;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;host1;0.42;0.13;0.10;0.05
 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;host0;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;host1;0.00;0.00;0.00;0.00
 # hostname;interval;timestamp;CPU;total/s;dropd/s;squeezd/s;rx_rps/s;flw_lim/s
 SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;-1;0.00;0.00;0.00;0.00;0.00
 SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;0;0.00;0.00;0.00;0.00;0.00

diff --git a/tests/expected.sadf-g b/tests/expected.sadf-g
index 83d1da366c6934c0220d196960990310983bd986..fff7b9c7ee35ef50f1bca3b54fbc6130d3b370b4 100644 (file)
--- a/tests/expected.sadf-g
+++ b/tests/expected.sadf-g
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" width="1060" height="93060" fill="black" stroke="#808080" stroke-width="1">
+<svg xmlns="http://www.w3.org/2000/svg" width="1060" height="93680" fill="black" stroke="#808080" stroke-width="1">
 <text x="0" y="30" text-anchor="start" stroke="#a52a2a">Linux 1.2.3-TEST (SYSSTAT.TEST)        04/18/2019      _x86_64_        (8 CPU)
 </text>
 <g id="g1-0" transform="translate(0,60)">
@@ -10491,7 +10491,91 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 </g>
-<g id="g39-0" transform="translate(0,75390)">
+<g id="g38-1" transform="translate(0,75390)">
+<rect x="0" y="0" height="300" width="1050" fill="#000000"/>
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Fibre Channel HBA statistics (1) [host1]
+<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">fch_rxf/s (0.00, 0.42)</text>
+<text x="795" y="65" style="fill: #ff00bf; stroke: none; font-size: 12px">fch_txf/s (0.00, 0.13)</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.14 720,0.14" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-481.250000)"/>
+<text x="0" y="-67" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.14.</text>
+<polyline points="0,0.28 720,0.28" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-481.250000)"/>
+<text x="0" y="-134" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.28.</text>
+<polyline points="0,0.42 720,0.42" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-481.250000)"/>
+<text x="0" y="-202" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.42.</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)"/>
+<text x="71" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,71,0)">13:23:35</text>
+<polyline points="412,0 412,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="143" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,143,0)">13:27:01</text>
+<polyline points="618,0 618,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="215" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,215,0)">13:30:27</text>
+<polyline points="824,0 824,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="287" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,287,0)">13:33:53</text>
+<polyline points="1030,0 1030,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="358" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,358,0)">13:37:19</text>
+<polyline points="1236,0 1236,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="430" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,430,0)">13:40:45</text>
+<polyline points="1442,0 1442,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="502" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,502,0)">13:44:11</text>
+<polyline points="1648,0 1648,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="574" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,574,0)">13:47:37</text>
+<polyline points="1854,0 1854,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="646" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,646,0)">13:51:03</text>
+<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=" M30,0.42 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-481.250000)"/>
+<path d=" M30,0.13 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff00bf; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-481.250000)"/>
+</g>
+<rect x="0" y="310" height="300" width="1050" fill="#000000"/>
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Fibre Channel HBA statistics (2) [host1]
+<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: #00ffff; stroke: none; font-size: 12px">fch_rxw/s (0.00, 0.10)</text>
+<text x="795" y="375" style="fill: #ff0000; stroke: none; font-size: 12px">fch_txw/s (0.00, 0.05)</text>
+<g transform="translate(70,560)">
+<text x="0" y="0" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.00.</text>
+<polyline points="0,0.03 720,0.03" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-1925.000000)"/>
+<text x="0" y="-57" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.03.</text>
+<polyline points="0,0.07 720,0.07" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-1925.000000)"/>
+<text x="0" y="-134" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.07.</text>
+<polyline points="0,0.10 720,0.10" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-1925.000000)"/>
+<text x="0" y="-192" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.10.</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)"/>
+<text x="71" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,71,0)">13:23:35</text>
+<polyline points="412,0 412,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="143" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,143,0)">13:27:01</text>
+<polyline points="618,0 618,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="215" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,215,0)">13:30:27</text>
+<polyline points="824,0 824,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="287" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,287,0)">13:33:53</text>
+<polyline points="1030,0 1030,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="358" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,358,0)">13:37:19</text>
+<polyline points="1236,0 1236,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="430" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,430,0)">13:40:45</text>
+<polyline points="1442,0 1442,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="502" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,502,0)">13:44:11</text>
+<polyline points="1648,0 1648,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="574" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,574,0)">13:47:37</text>
+<polyline points="1854,0 1854,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="646" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,646,0)">13:51:03</text>
+<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=" M30,0.10 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #00ffff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-1925.000000)"/>
+<path d=" M30,0.05 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-1925.000000)"/>
+</g>
+</g>
+<g id="g39-0" transform="translate(0,76010)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Software-based network processing statistics (1) [all]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -10577,7 +10661,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #e85f00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 </g>
-<g id="g39-1" transform="translate(0,76010)">
+<g id="g39-1" transform="translate(0,76630)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Software-based network processing statistics (1) [0]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -10663,7 +10747,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #e85f00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 </g>
-<g id="g39-2" transform="translate(0,76630)">
+<g id="g39-2" transform="translate(0,77250)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Software-based network processing statistics (1) [1]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -10749,7 +10833,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #e85f00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 </g>
-<g id="g39-3" transform="translate(0,77250)">
+<g id="g39-3" transform="translate(0,77870)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Software-based network processing statistics (1) [2]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -10835,7 +10919,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #e85f00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 </g>
-<g id="g39-4" transform="translate(0,77870)">
+<g id="g39-4" transform="translate(0,78490)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Software-based network processing statistics (1) [3]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -10921,7 +11005,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #e85f00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 </g>
-<g id="g39-5" transform="translate(0,78490)">
+<g id="g39-5" transform="translate(0,79110)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Software-based network processing statistics (1) [4]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -11007,7 +11091,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #e85f00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 </g>
-<g id="g39-6" transform="translate(0,79110)">
+<g id="g39-6" transform="translate(0,79730)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Software-based network processing statistics (1) [5]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -11093,7 +11177,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #e85f00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 </g>
-<g id="g39-7" transform="translate(0,79730)">
+<g id="g39-7" transform="translate(0,80350)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Software-based network processing statistics (1) [6]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -11179,7 +11263,7 @@
 <path d=" M10,0.00 M20,0.00 M30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #e85f00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 </g>
-<g id="g39-8" transform="translate(0,80350)">
+<g id="g39-8" transform="translate(0,80970)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Software-based network processing statistics (1) [7]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -11265,7 +11349,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #e85f00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 </g>
-<g id="g39-9" transform="translate(0,80970)">
+<g id="g39-9" transform="translate(0,81590)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Software-based network processing statistics (1) [8]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -11351,7 +11435,7 @@
 <path d=" M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #e85f00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 </g>
-<g id="g39-10" transform="translate(0,81590)">
+<g id="g39-10" transform="translate(0,82210)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Software-based network processing statistics (1) [9]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -11437,7 +11521,7 @@
 <path d=" M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #e85f00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 </g>
-<g id="g30-0" transform="translate(0,82210)">
+<g id="g30-0" transform="translate(0,82830)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">CPU clock frequency [all]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -11478,7 +11562,7 @@
 <path d=" M0,3522.54 L10,3522.54 L20,3522.54 L30,3522.54 L40,3522.54 M2035,3517.54 L2066,3517.54" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.056777)"/>
 </g>
 </g>
-<g id="g30-1" transform="translate(0,82520)">
+<g id="g30-1" transform="translate(0,83140)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">CPU clock frequency [0]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -11519,7 +11603,7 @@
 <path d=" M0,3566.48 L10,3566.48 L20,3566.48 L30,3566.48 L40,3566.48 M2035,3566.48 L2066,3566.48" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.056078)"/>
 </g>
 </g>
-<g id="g30-2" transform="translate(0,82830)">
+<g id="g30-2" transform="translate(0,83450)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">CPU clock frequency [1]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -11560,7 +11644,7 @@
 <path d=" M0,3566.39 L10,3566.39 L20,3566.39 L30,3566.39 L40,3566.39 M2035,3566.39 L2066,3566.39" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.056079)"/>
 </g>
 </g>
-<g id="g30-3" transform="translate(0,83140)">
+<g id="g30-3" transform="translate(0,83760)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">CPU clock frequency [2]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -11601,7 +11685,7 @@
 <path d=" M0,3492.11 L10,3492.11 L20,3492.11 L30,3492.11 L40,3492.11 M2035,3492.11 L2066,3492.11" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.057272)"/>
 </g>
 </g>
-<g id="g30-4" transform="translate(0,83450)">
+<g id="g30-4" transform="translate(0,84070)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">CPU clock frequency [3]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -11642,7 +11726,7 @@
 <path d=" M0,3566.22 L10,3566.22 L20,3566.22 L30,3566.22 L40,3566.22 M2035,3566.22 L2066,3566.22" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.056082)"/>
 </g>
 </g>
-<g id="g30-5" transform="translate(0,83760)">
+<g id="g30-5" transform="translate(0,84380)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">CPU clock frequency [4]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -11683,7 +11767,7 @@
 <path d=" M0,3505.84 L10,3505.84 L20,3505.84 L30,3505.84 L40,3505.84 M2035,3505.84 L2066,3505.84" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.057048)"/>
 </g>
 </g>
-<g id="g30-6" transform="translate(0,84070)">
+<g id="g30-6" transform="translate(0,84690)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">CPU clock frequency [5]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -11724,7 +11808,7 @@
 <path d=" M0,3493.55 L10,3493.55 L20,3493.55 L30,3493.55 L40,3493.55 M2035,3493.55 L2066,3493.55" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.057248)"/>
 </g>
 </g>
-<g id="g30-7" transform="translate(0,84380)">
+<g id="g30-7" transform="translate(0,85000)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">CPU clock frequency [6]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -11765,7 +11849,7 @@
 <path d=" M0,3492.22 L10,3492.22 L20,3492.22 L30,3492.22 L40,3492.22 M2035,3492.22 L2066,3492.22" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.057270)"/>
 </g>
 </g>
-<g id="g30-8" transform="translate(0,84690)">
+<g id="g30-8" transform="translate(0,85310)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">CPU clock frequency [7]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -11806,7 +11890,7 @@
 <path d=" M0,3497.56 L10,3497.56 L20,3497.56 L30,3497.56 L40,3497.56 M2035,3497.56 L2066,3497.56" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.057183)"/>
 </g>
 </g>
-<g id="g30-9" transform="translate(0,85000)">
+<g id="g30-9" transform="translate(0,85620)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">CPU clock frequency [8]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -11847,7 +11931,7 @@
 <path d=" M2035,3497.56 L2066,3497.56" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.057183)"/>
 </g>
 </g>
-<g id="g30-10" transform="translate(0,85310)">
+<g id="g30-10" transform="translate(0,85930)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">CPU clock frequency [9]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -11888,7 +11972,7 @@
 <path d=" M2035,3497.56 L2066,3497.56" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.057183)"/>
 </g>
 </g>
-<g id="g37-0" transform="translate(0,85620)">
+<g id="g37-0" transform="translate(0,86240)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Filesystems statistics (1) [/dev/sda9]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -12062,7 +12146,7 @@
 </g>
 </g>
 </g>
-<g id="g37-1" transform="translate(0,86860)">
+<g id="g37-1" transform="translate(0,87480)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Filesystems statistics (1) [/dev/sda7]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -12236,7 +12320,7 @@
 </g>
 </g>
 </g>
-<g id="g37-2" transform="translate(0,88100)">
+<g id="g37-2" transform="translate(0,88720)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Filesystems statistics (1) [/dev/sda12]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -12410,7 +12494,7 @@
 </g>
 </g>
 </g>
-<g id="g37-3" transform="translate(0,89340)">
+<g id="g37-3" transform="translate(0,89960)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Filesystems statistics (1) [/dev/sda6]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -12584,7 +12668,7 @@
 </g>
 </g>
 </g>
-<g id="g37-4" transform="translate(0,90580)">
+<g id="g37-4" transform="translate(0,91200)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Filesystems statistics (1) [/dev/sdf]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -12758,7 +12842,7 @@
 </g>
 </g>
 </g>
-<g id="g37-5" transform="translate(0,91820)">
+<g id="g37-5" transform="translate(0,92440)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Filesystems statistics (1) [/dev/sdg]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -12934,5 +13018,5 @@
 </g>
 </g>
 </g>
-<!-- Actual canvas height: 93060 -->
+<!-- Actual canvas height: 93680 -->
 </svg>

diff --git a/tests/expected.sadf-j b/tests/expected.sadf-j
index 9a67bd0853f6221b5a08352bf1c04a43766648ae..81360b99b236f759fc02565ec58ac42d4b9ebef2 100644 (file)
--- a/tests/expected.sadf-j
+++ b/tests/expected.sadf-j
@@ -1771,7 +1771,8 @@
                                                "net-eicmp6": {"ierr6": 0.00, "idtunr6": 0.00, "odtunr6": 0.00, "itmex6": 0.00, "otmex6": 0.00, "iprmpb6": 0.00, "oprmpb6": 0.00, "iredir6": 0.00, "oredir6": 0.00, "ipck2b6": 0.00, "opck2b6": 0.00},
                                                "net-udp6": {"idgm6": 0.00, "odgm6": 0.00, "noport6": 0.00, "idgmer6": 0.00},
                                                "fchosts": [
-                                                       {"fchost": "host0", "fch_rxf": 0.00, "fch_txf": 0.00, "fch_rxw": 0.00, "fch_txw": 0.00}
+                                                       {"fchost": "host0", "fch_rxf": 0.00, "fch_txf": 0.00, "fch_rxw": 0.00, "fch_txw": 0.00},
+                                                       {"fchost": "host1", "fch_rxf": 0.42, "fch_txf": 0.13, "fch_rxw": 0.10, "fch_txw": 0.05}
                                                ],
                                                "softnet": [
                                                        {"cpu": "all", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00},
@@ -2375,7 +2376,8 @@
                                                "net-eicmp6": {"ierr6": 0.00, "idtunr6": 0.00, "odtunr6": 0.00, "itmex6": 0.00, "otmex6": 0.00, "iprmpb6": 0.00, "oprmpb6": 0.00, "iredir6": 0.00, "oredir6": 0.00, "ipck2b6": 0.00, "opck2b6": 0.00},
                                                "net-udp6": {"idgm6": 0.00, "odgm6": 0.00, "noport6": 0.00, "idgmer6": 0.00},
                                                "fchosts": [
-                                                       {"fchost": "host0", "fch_rxf": 0.00, "fch_txf": 0.00, "fch_rxw": 0.00, "fch_txw": 0.00}
+                                                       {"fchost": "host0", "fch_rxf": 0.00, "fch_txf": 0.00, "fch_rxw": 0.00, "fch_txw": 0.00},
+                                                       {"fchost": "host1", "fch_rxf": 0.00, "fch_txf": 0.00, "fch_rxw": 0.00, "fch_txw": 0.00}
                                                ],
                                                "softnet": [
                                                        {"cpu": "all", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00},

diff --git a/tests/expected.sadf-p b/tests/expected.sadf-p
index de3aacbc971401da18c7c7baf0d9f58f192563c8..e9103a77d3d101b301c495316d972cc46fc803a2 100644 (file)
--- a/tests/expected.sadf-p
+++ b/tests/expected.sadf-p
@@ -3973,10 +3973,18 @@ SYSSTAT.TEST    39      2019-04-18 13:20:39 UTC host0   fch_rxf/s       0.00
 SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC host0   fch_txf/s       0.00
 SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC host0   fch_rxw/s       0.00
 SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC host0   fch_txw/s       0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC host1   fch_rxf/s       0.42
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC host1   fch_txf/s       0.13
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC host1   fch_rxw/s       0.10
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC host1   fch_txw/s       0.05
 SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC host0   fch_rxf/s       0.00
 SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC host0   fch_txf/s       0.00
 SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC host0   fch_rxw/s       0.00
 SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC host0   fch_txw/s       0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC host1   fch_rxf/s       0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC host1   fch_txf/s       0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC host1   fch_rxw/s       0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC host1   fch_txw/s       0.00
 SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC all     total/s 0.00
 SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC all     dropd/s 0.00
 SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC all     squeezd/s       0.00

diff --git a/tests/expected.sadf-r b/tests/expected.sadf-r
index 4cb8cba481464d26fead5051654566006c1731b3..87d4b1245c3adc15255d44afcf3af961082a41e5 100644 (file)
--- a/tests/expected.sadf-r
+++ b/tests/expected.sadf-r
@@ -2326,14 +2326,16 @@
 13:20:39 UTC; idgm6/s; 671; 671; odgm6/s; 36; 36; noport6/s; 0; 0; idgmer6/s; 0; 0;
 # A_NET_UDP6: 1/1 (1)
 13:20:49 UTC; idgm6/s; 671; 671; odgm6/s; 36; 36; noport6/s; 0; 0; idgmer6/s; 0; 0;
-# A_NET_FC: 1/1 (1)
+# A_NET_FC: 1/2 (1)
 13:20:19 UTC; FCHOST; host0; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2;
-# A_NET_FC: 1/1 (1)
+# A_NET_FC: 1/2 (1)
 13:20:29 UTC; FCHOST; host0; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2;
-# A_NET_FC: 1/1 (1)
+# A_NET_FC: 2/2 (1)
 13:20:39 UTC; FCHOST; host0; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2;
-# A_NET_FC: 1/1 (1)
+13:20:39 UTC; FCHOST [NEW]; host1; fch_rxf/s; 0; 16; fch_txf/s; 0; 5; fch_rxw/s; 0; 4; fch_txw/s; 0; 2;
+# A_NET_FC: 2/2 (1)
 13:20:49 UTC; FCHOST; host0; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2;
+13:20:49 UTC; FCHOST; host1; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2;
 # A_NET_SOFT: 9/9 (9)
 13:20:19 UTC; CPU; 0; total/s; 11976; 11976; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0;
 13:20:19 UTC; CPU; 1; total/s; 10608; 10608; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0;
@@ -3023,7 +3025,7 @@
 13:54:35 UTC; ierr6/s; 0; 0; idtunr6/s; 0; 0; odtunr6/s; 0; 0; itmex6/s; 0; 0; otmex6/s; 0; 0; iprmpb6/s; 0; 0; oprmpb6/s; 0; 0; iredir6/s; 0; 0; oredir6/s; 0; 0; ipck2b6/s; 0; 0; opck2b6/s; 0; 0;
 # A_NET_UDP6: 1/1 (1)
 13:54:35 UTC; idgm6/s; 671; 671; odgm6/s; 36; 36; noport6/s; 0; 0; idgmer6/s; 0; 0;
-# A_NET_FC: 1/1 (1)
+# A_NET_FC: 1/2 (1)
 13:54:35 UTC; FCHOST; host0; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2;
 # A_NET_SOFT: 11/18 (11)
 13:54:35 UTC; CPU; 0; total/s; 11976; 11976; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0;

diff --git a/tests/expected.sadf-x b/tests/expected.sadf-x
index c778ff7b017733934530118cf96a4c2646d4715a..19126475976b8234d810018dce38a11c85f91635 100644 (file)
--- a/tests/expected.sadf-x
+++ b/tests/expected.sadf-x
@@ -607,7 +607,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                        <net-icmp6 imsg6="0.00" omsg6="0.00" iech6="0.00" iechr6="0.00" oechr6="0.00" igmbq6="0.00" igmbr6="0.00" ogmbr6="0.00" igmbrd6="0.00" ogmbrd6="0.00" irtsol6="0.00" ortsol6="0.00" irtad6="0.00" inbsol6="0.00" onbsol6="0.00" inbad6="0.00" onbad6="0.00"/>
                                        <net-eicmp6 ierr6="0.00" idtunr6="0.00" odtunr6="0.00" itmex6="0.00" otmex6="0.00" iprmpb6="0.00" oprmpb6="0.00" iredir6="0.00" oredir6="0.00" ipck2b6="0.00" opck2b6="0.00"/>
                                        <net-udp6 idgm6="0.00" odgm6="0.00" noport6="0.00" idgmer6="0.00"/>
-                                       <fchost name="host0" fch_rxf="0.00" fch_txf="0.00" fch_rxw="0.00" fch_txw="0.06"/>
+                                       <fchost name="host0" fch_rxf="0.00" fch_txf="0.00" fch_rxw="0.00" fch_txw="0.00"/>
                                        <softnet cpu="all" total="0.00" dropd="0.00" squeezd="0.00" rx_rps="0.00" flw_lim="0.00"/>
                                        <softnet cpu="0" total="0.00" dropd="0.00" squeezd="0.00" rx_rps="0.00" flw_lim="0.00"/>
                                        <softnet cpu="1" total="0.00" dropd="0.00" squeezd="0.00" rx_rps="0.00" flw_lim="0.00"/>
@@ -1230,7 +1230,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                        <net-icmp6 imsg6="0.00" omsg6="0.00" iech6="0.00" iechr6="0.00" oechr6="0.00" igmbq6="0.00" igmbr6="0.00" ogmbr6="0.00" igmbrd6="0.00" ogmbrd6="0.00" irtsol6="0.00" ortsol6="0.00" irtad6="0.00" inbsol6="0.00" onbsol6="0.00" inbad6="0.00" onbad6="0.00"/>
                                        <net-eicmp6 ierr6="0.00" idtunr6="0.00" odtunr6="0.00" itmex6="0.00" otmex6="0.00" iprmpb6="0.00" oprmpb6="0.00" iredir6="0.00" oredir6="0.00" ipck2b6="0.00" opck2b6="0.00"/>
                                        <net-udp6 idgm6="0.00" odgm6="0.00" noport6="0.00" idgmer6="0.00"/>
-                                       <fchost name="host0" fch_rxf="0.00" fch_txf="0.00" fch_rxw="0.00" fch_txw="0.06"/>
+                                       <fchost name="host0" fch_rxf="0.00" fch_txf="0.00" fch_rxw="0.00" fch_txw="0.00"/>
                                        <softnet cpu="all" total="0.00" dropd="0.00" squeezd="0.00" rx_rps="0.00" flw_lim="0.00"/>
                                        <softnet cpu="0" total="0.00" dropd="0.00" squeezd="0.00" rx_rps="0.00" flw_lim="0.00"/>
                                        <softnet cpu="1" total="0.00" dropd="0.00" squeezd="0.00" rx_rps="0.00" flw_lim="0.00"/>
@@ -1857,7 +1857,8 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                        <net-icmp6 imsg6="0.00" omsg6="0.00" iech6="0.00" iechr6="0.00" oechr6="0.00" igmbq6="0.00" igmbr6="0.00" ogmbr6="0.00" igmbrd6="0.00" ogmbrd6="0.00" irtsol6="0.00" ortsol6="0.00" irtad6="0.00" inbsol6="0.00" onbsol6="0.00" inbad6="0.00" onbad6="0.00"/>
                                        <net-eicmp6 ierr6="0.00" idtunr6="0.00" odtunr6="0.00" itmex6="0.00" otmex6="0.00" iprmpb6="0.00" oprmpb6="0.00" iredir6="0.00" oredir6="0.00" ipck2b6="0.00" opck2b6="0.00"/>
                                        <net-udp6 idgm6="0.00" odgm6="0.00" noport6="0.00" idgmer6="0.00"/>
-                                       <fchost name="host0" fch_rxf="0.00" fch_txf="0.00" fch_rxw="0.00" fch_txw="0.05"/>
+                                       <fchost name="host0" fch_rxf="0.00" fch_txf="0.00" fch_rxw="0.00" fch_txw="0.00"/>
+                                       <fchost name="host1" fch_rxf="0.42" fch_txf="0.13" fch_rxw="0.10" fch_txw="0.05"/>
                                        <softnet cpu="all" total="0.00" dropd="0.00" squeezd="0.00" rx_rps="0.00" flw_lim="0.00"/>
                                        <softnet cpu="0" total="0.00" dropd="0.00" squeezd="0.00" rx_rps="0.00" flw_lim="0.00"/>
                                        <softnet cpu="1" total="0.00" dropd="0.00" squeezd="0.00" rx_rps="0.00" flw_lim="0.00"/>
@@ -2487,7 +2488,8 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                        <net-icmp6 imsg6="0.00" omsg6="0.00" iech6="0.00" iechr6="0.00" oechr6="0.00" igmbq6="0.00" igmbr6="0.00" ogmbr6="0.00" igmbrd6="0.00" ogmbrd6="0.00" irtsol6="0.00" ortsol6="0.00" irtad6="0.00" inbsol6="0.00" onbsol6="0.00" inbad6="0.00" onbad6="0.00"/>
                                        <net-eicmp6 ierr6="0.00" idtunr6="0.00" odtunr6="0.00" itmex6="0.00" otmex6="0.00" iprmpb6="0.00" oprmpb6="0.00" iredir6="0.00" oredir6="0.00" ipck2b6="0.00" opck2b6="0.00"/>
                                        <net-udp6 idgm6="0.00" odgm6="0.00" noport6="0.00" idgmer6="0.00"/>
-                                       <fchost name="host0" fch_rxf="0.00" fch_txf="0.00" fch_rxw="0.00" fch_txw="0.09"/>
+                                       <fchost name="host0" fch_rxf="0.00" fch_txf="0.00" fch_rxw="0.00" fch_txw="0.00"/>
+                                       <fchost name="host1" fch_rxf="0.00" fch_txf="0.00" fch_rxw="0.00" fch_txw="0.00"/>
                                        <softnet cpu="all" total="0.00" dropd="0.00" squeezd="0.00" rx_rps="0.00" flw_lim="0.00"/>
                                        <softnet cpu="0" total="0.00" dropd="0.00" squeezd="0.00" rx_rps="0.00" flw_lim="0.00"/>
                                        <softnet cpu="1" total="0.00" dropd="0.00" squeezd="0.00" rx_rps="0.00" flw_lim="0.00"/>
@@ -3117,7 +3119,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                        <net-icmp6 imsg6="0.00" omsg6="0.00" iech6="0.00" iechr6="0.00" oechr6="0.00" igmbq6="0.00" igmbr6="0.00" ogmbr6="0.00" igmbrd6="0.00" ogmbrd6="0.00" irtsol6="0.00" ortsol6="0.00" irtad6="0.00" inbsol6="0.00" onbsol6="0.00" inbad6="0.00" onbad6="0.00"/>
                                        <net-eicmp6 ierr6="0.00" idtunr6="0.00" odtunr6="0.00" itmex6="0.00" otmex6="0.00" iprmpb6="0.00" oprmpb6="0.00" iredir6="0.00" oredir6="0.00" ipck2b6="0.00" opck2b6="0.00"/>
                                        <net-udp6 idgm6="0.00" odgm6="0.00" noport6="0.00" idgmer6="0.00"/>
-                                       <fchost name="host0" fch_rxf="0.00" fch_txf="0.00" fch_rxw="0.00" fch_txw="0.06"/>
+                                       <fchost name="host0" fch_rxf="0.00" fch_txf="0.00" fch_rxw="0.00" fch_txw="0.00"/>
                                        <softnet cpu="all" total="0.00" dropd="0.00" squeezd="0.00" rx_rps="0.00" flw_lim="0.00"/>
                                        <softnet cpu="0" total="0.00" dropd="0.00" squeezd="0.00" rx_rps="0.00" flw_lim="0.00"/>
                                        <softnet cpu="1" total="0.00" dropd="0.00" squeezd="0.00" rx_rps="0.00" flw_lim="0.00"/>

diff --git a/tests/expected.sar-all b/tests/expected.sar-all
index 2cefe3af08a440ccfdc6d9ffcbd62b2ed9492d7b..91397cebd031cdb83b59553e4f26256e06d5aa55 100644 (file)
--- a/tests/expected.sar-all
+++ b/tests/expected.sar-all
@@ -2822,8 +2822,11 @@ Average:         0.00      0.00      0.00      0.00
 13:20:19         0.00      0.00      0.00      0.00 host0
 13:20:29         0.00      0.00      0.00      0.00 host0
 13:20:39         0.00      0.00      0.00      0.00 host0
+13:20:39         0.42      0.13      0.10      0.05 host1
 13:20:49         0.00      0.00      0.00      0.00 host0
+13:20:49         0.00      0.00      0.00      0.00 host1
 Average:         0.00      0.00      0.00      0.00 host0
+Average:         0.13      0.04      0.03      0.02 host1
 
 13:20:09        CPU   total/s   dropd/s squeezd/s  rx_rps/s flw_lim/s
 13:20:19        all      0.00      0.00      0.00      0.00      0.00

diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec
index 488cb02e1461a9e3f75b7b967b4c03d7a064adc9..107613e93b5e2b86430db6b27a0eb2ce745b6728 100644 (file)
--- a/tests/expected.sar-dec
+++ b/tests/expected.sar-dec
@@ -2822,8 +2822,11 @@ Average:            0         0         0         0
 13:20:19            0         0         0         0 host0
 13:20:29            0         0         0         0 host0
 13:20:39            0         0         0         0 host0
+13:20:39            0         0         0         0 host1
 13:20:49            0         0         0         0 host0
+13:20:49            0         0         0         0 host1
 Average:            0         0         0         0 host0
+Average:            0         0         0         0 host1
 
 13:20:09        CPU   total/s   dropd/s squeezd/s  rx_rps/s flw_lim/s
 13:20:19        all         0         0         0         0         0

diff --git a/tests/expected.sar-human b/tests/expected.sar-human
index 88d64653b4ae0fd5c323ac3d3649293110c816e7..64574e6344a575c7ec44f3f1e92d1273f140d126 100644 (file)
--- a/tests/expected.sar-human
+++ b/tests/expected.sar-human
@@ -2822,8 +2822,11 @@ Average:         0.00      0.00      0.00      0.00
 13:20:19         0.00      0.00      0.00      0.00 host0
 13:20:29         0.00      0.00      0.00      0.00 host0
 13:20:39         0.00      0.00      0.00      0.00 host0
+13:20:39         0.42      0.13      0.10      0.05 host1
 13:20:49         0.00      0.00      0.00      0.00 host0
+13:20:49         0.00      0.00      0.00      0.00 host1
 Average:         0.00      0.00      0.00      0.00 host0
+Average:         0.13      0.04      0.03      0.02 host1
 
 13:20:09        CPU   total/s   dropd/s squeezd/s  rx_rps/s flw_lim/s
 13:20:19        all      0.00      0.00      0.00      0.00      0.00

diff --git a/tests/expected2.sadf-g b/tests/expected2.sadf-g
index d5e1544a6d2797a97f4a4c0527e096dc48ea9a24..551d01c3f55635ce0461c2f9c0da979ca38be149 100644 (file)
--- a/tests/expected2.sadf-g
+++ b/tests/expected2.sadf-g
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="6360" height="31390" fill="black" stroke="#000000" stroke-width="1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="6360" height="31700" fill="black" stroke="#000000" stroke-width="1">
 <text x="0" y="30" text-anchor="start" stroke="#000000">Linux 1.2.3-TEST (SYSSTAT.TEST)        04/18/2019      _x86_64_        (8 CPU)
 </text>
 <a xlink:href="#g1-0" xlink:title="A_CPU">
@@ -3803,7 +3803,103 @@
 <path d=" M48019,0 L48029,0 L48039,0 L48049,0 M50075,0" style="vector-effect: non-scaling-stroke; stroke: #a9a9a9; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-66.666667)"/>
 </g>
 </g>
-<g id="g30-0" transform="translate(0,10000)">
+<g id="g38-1" transform="translate(0,10000)">
+<rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
+<text x="0" y="20" style="fill: #000000; stroke: none">Fibre Channel HBA statistics (1) [host1]
+<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">fch_rxf/s (0.00, 0.42)</text>
+<text x="795" y="65" style="fill: #bebebe; stroke: none; font-size: 12px">fch_txf/s (0.00, 0.13)</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/2019</tspan>
+</text>
+<g transform="translate(70,250)">
+<text x="0" y="0" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">0.00.</text>
+<polyline points="0,0.14 720,0.14" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-481.250000)"/>
+<text x="0" y="-67" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">0.14.</text>
+<polyline points="0,0.28 720,0.28" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-481.250000)"/>
+<text x="0" y="-134" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">0.28.</text>
+<polyline points="0,0.42 720,0.42" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-481.250000)"/>
+<text x="0" y="-202" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">0.42.</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)"/>
+<text x="45" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 2:00</text>
+<polyline points="14400,0 14400,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="105" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 4:00</text>
+<polyline points="21600,0 21600,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="165" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 6:00</text>
+<polyline points="28800,0 28800,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="225" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 8:00</text>
+<polyline points="36000,0 36000,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="285" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">10:00</text>
+<polyline points="43200,0 43200,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="345" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">12:00</text>
+<polyline points="50400,0 50400,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="405" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">14:00</text>
+<polyline points="57600,0 57600,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="465" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">16:00</text>
+<polyline points="64800,0 64800,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="525" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">18:00</text>
+<polyline points="72000,0 72000,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="585" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">20:00</text>
+<polyline points="79200,0 79200,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<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=" M48039,0.42 L48049,0.00" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-481.250000)"/>
+<path d=" M48039,0.13 L48049,0.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-481.250000)"/>
+</g>
+<rect x="1060" y="0" height="300" width="1050" fill="#ffffff"/>
+<text x="1060" y="20" style="fill: #000000; stroke: none">Fibre Channel HBA statistics (2) [host1]
+<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">fch_rxw/s (0.00, 0.10)</text>
+<text x="1855" y="65" style="fill: #bebebe; stroke: none; font-size: 12px">fch_txw/s (0.00, 0.05)</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/2019</tspan>
+</text>
+<g transform="translate(1130,250)">
+<text x="0" y="0" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">0.00.</text>
+<polyline points="0,0.03 720,0.03" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-1925.000000)"/>
+<text x="0" y="-57" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">0.03.</text>
+<polyline points="0,0.07 720,0.07" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-1925.000000)"/>
+<text x="0" y="-134" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">0.07.</text>
+<polyline points="0,0.10 720,0.10" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-1925.000000)"/>
+<text x="0" y="-192" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">0.10.</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)"/>
+<text x="45" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 2:00</text>
+<polyline points="14400,0 14400,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="105" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 4:00</text>
+<polyline points="21600,0 21600,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="165" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 6:00</text>
+<polyline points="28800,0 28800,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="225" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 8:00</text>
+<polyline points="36000,0 36000,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="285" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">10:00</text>
+<polyline points="43200,0 43200,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="345" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">12:00</text>
+<polyline points="50400,0 50400,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="405" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">14:00</text>
+<polyline points="57600,0 57600,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="465" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">16:00</text>
+<polyline points="64800,0 64800,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="525" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">18:00</text>
+<polyline points="72000,0 72000,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="585" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">20:00</text>
+<polyline points="79200,0 79200,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<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=" M48039,0.10 L48049,0.00" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-1925.000000)"/>
+<path d=" M48039,0.05 L48049,0.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-1925.000000)"/>
+</g>
+</g>
+<g id="g30-0" transform="translate(0,10310)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [all]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -3850,7 +3946,7 @@
 <path d=" M47988,3522.54 L48019,3522.54 L48029,3522.54 L48039,3522.54 L48049,3522.54 M50044,3517.54 L50075,3517.54" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.056777)"/>
 </g>
 </g>
-<g id="g30-1" transform="translate(0,10310)">
+<g id="g30-1" transform="translate(0,10620)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [0]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -3897,7 +3993,7 @@
 <path d=" M47988,3566.48 L48019,3566.48 L48029,3566.48 L48039,3566.48 L48049,3566.48 M50044,3566.48 L50075,3566.48" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.056078)"/>
 </g>
 </g>
-<g id="g30-2" transform="translate(0,10620)">
+<g id="g30-2" transform="translate(0,10930)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [1]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -3944,7 +4040,7 @@
 <path d=" M47988,3566.39 L48019,3566.39 L48029,3566.39 L48039,3566.39 L48049,3566.39 M50044,3566.39 L50075,3566.39" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.056079)"/>
 </g>
 </g>
-<g id="g30-3" transform="translate(0,10930)">
+<g id="g30-3" transform="translate(0,11240)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [2]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -3991,7 +4087,7 @@
 <path d=" M47988,3492.11 L48019,3492.11 L48029,3492.11 L48039,3492.11 L48049,3492.11 M50044,3492.11 L50075,3492.11" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.057272)"/>
 </g>
 </g>
-<g id="g30-4" transform="translate(0,11240)">
+<g id="g30-4" transform="translate(0,11550)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [3]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -4038,7 +4134,7 @@
 <path d=" M47988,3566.22 L48019,3566.22 L48029,3566.22 L48039,3566.22 L48049,3566.22 M50044,3566.22 L50075,3566.22" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.056082)"/>
 </g>
 </g>
-<g id="g30-5" transform="translate(0,11550)">
+<g id="g30-5" transform="translate(0,11860)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [4]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -4085,7 +4181,7 @@
 <path d=" M47988,3505.84 L48019,3505.84 L48029,3505.84 L48039,3505.84 L48049,3505.84 M50044,3505.84 L50075,3505.84" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.057048)"/>
 </g>
 </g>
-<g id="g30-6" transform="translate(0,11860)">
+<g id="g30-6" transform="translate(0,12170)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [5]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -4132,7 +4228,7 @@
 <path d=" M47988,3493.55 L48019,3493.55 L48029,3493.55 L48039,3493.55 L48049,3493.55 M50044,3493.55 L50075,3493.55" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.057248)"/>
 </g>
 </g>
-<g id="g30-7" transform="translate(0,12170)">
+<g id="g30-7" transform="translate(0,12480)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [6]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -4179,7 +4275,7 @@
 <path d=" M47988,3492.22 L48019,3492.22 L48029,3492.22 L48039,3492.22 L48049,3492.22 M50044,3492.22 L50075,3492.22" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.057270)"/>
 </g>
 </g>
-<g id="g30-8" transform="translate(0,12480)">
+<g id="g30-8" transform="translate(0,12790)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [7]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -4226,7 +4322,7 @@
 <path d=" M47988,3497.56 L48019,3497.56 L48029,3497.56 L48039,3497.56 L48049,3497.56 M50044,3497.56 L50075,3497.56" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.057183)"/>
 </g>
 </g>
-<g id="g30-9" transform="translate(0,12790)">
+<g id="g30-9" transform="translate(0,13100)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [8]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -4273,7 +4369,7 @@
 <path d=" M50044,3497.56 L50075,3497.56" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.057183)"/>
 </g>
 </g>
-<g id="g30-10" transform="translate(0,13100)">
+<g id="g30-10" transform="translate(0,13410)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [9]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -4320,7 +4416,7 @@
 <path d=" M50044,3497.56 L50075,3497.56" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.057183)"/>
 </g>
 </g>
-<g id="g37-0" transform="translate(0,13410)">
+<g id="g37-0" transform="translate(0,13720)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Filesystems statistics (1) [/dev/sda9]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -4518,7 +4614,7 @@
 </g>
 </g>
 </g>
-<g id="g37-1" transform="translate(0,13720)">
+<g id="g37-1" transform="translate(0,14030)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Filesystems statistics (1) [/dev/sda7]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -4716,7 +4812,7 @@
 </g>
 </g>
 </g>
-<g id="g37-2" transform="translate(0,14030)">
+<g id="g37-2" transform="translate(0,14340)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Filesystems statistics (1) [/dev/sda12]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -4914,7 +5010,7 @@
 </g>
 </g>
 </g>
-<g id="g37-3" transform="translate(0,14340)">
+<g id="g37-3" transform="translate(0,14650)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Filesystems statistics (1) [/dev/sda6]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -5112,7 +5208,7 @@
 </g>
 </g>
 </g>
-<g id="g37-4" transform="translate(0,14650)">
+<g id="g37-4" transform="translate(0,14960)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Filesystems statistics (1) [/dev/sdf]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -5261,7 +5357,7 @@
 <path d=" M48029,0.46 L48039,0.46" style="vector-effect: non-scaling-stroke; stroke: #bebebe; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-104.158025)"/>
 </g>
 </g>
-<g id="g37-5" transform="translate(0,14960)">
+<g id="g37-5" transform="translate(0,15270)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Filesystems statistics (1) [/dev/sdg]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -5461,5 +5557,5 @@
 </g>
 </g>
 </g>
-<!-- Actual canvas height: 15270 -->
+<!-- Actual canvas height: 15580 -->
 </svg>

diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all
index dabf8c4b137526b7a4391a4c73b32e6f9a4bfb50..0ecd7bb000f4a9ff6384318455915c3e78231ba0 100644 (file)
--- a/tests/expected2.sar-all
+++ b/tests/expected2.sar-all
@@ -2822,8 +2822,11 @@ Average:         0.00      0.00      0.00      0.00
 13:20:19         0.00      0.00      0.00      0.00 host0
 13:20:29         0.00      0.00      0.00      0.00 host0
 13:20:39         0.00      0.00      0.00      0.00 host0
+13:20:39         0.42      0.13      0.10      0.05 host1
 13:20:49         0.00      0.00      0.00      0.00 host0
+13:20:49         0.00      0.00      0.00      0.00 host1
 Average:         0.00      0.00      0.00      0.00 host0
+Average:         0.13      0.04      0.03      0.02 host1
 
 13:20:09        CPU   total/s   dropd/s squeezd/s  rx_rps/s flw_lim/s
 13:20:19        all      0.00      0.00      0.00      0.00      0.00

diff --git a/tests/expected3.sar-all b/tests/expected3.sar-all
index a5b11665fa7bc01071a70f3cbf80628e86cc9769..3750a72434f83e1c4e8807ff6d9152341b3961a2 100644 (file)
--- a/tests/expected3.sar-all
+++ b/tests/expected3.sar-all
@@ -359,8 +359,11 @@ Average:         0.00      0.00      0.00      0.00
 13:20:19         0.00      0.00      0.00      0.00 host0
 13:20:29         0.00      0.00      0.00      0.00 host0
 13:20:39         0.00      0.00      0.00      0.00 host0
+13:20:39         0.42      0.13      0.10      0.05 host1
 13:20:49         0.00      0.00      0.00      0.00 host0
+13:20:49         0.00      0.00      0.00      0.00 host1
 Average:         0.00      0.00      0.00      0.00 host0
+Average:         0.13      0.04      0.03      0.02 host1
 
 13:20:09        CPU   total/s   dropd/s squeezd/s  rx_rps/s flw_lim/s
 13:20:19          3      0.00      0.00      0.00      0.00      0.00

diff --git a/tests/root.README b/tests/root.README
index 28abee5a4bf448ad4de8c58755af52f73ecad685..9107bfafc39f4ece1a8dc2a40eddc947804c46bc 100644 (file)
--- a/tests/root.README
+++ b/tests/root.README
@@ -34,7 +34,7 @@ virbr0-nic: unregistered
 enp6s1, wlp5s1: registered
 
 /sys/class/fc_host
-[Don't register any new hosts as the order in which filenames will be read depends on the filesystem implementation: See readdir(3).
+host2: registered
 
 ==========root5:
 /proc/stat

diff --git a/tests/root1/sys/class/fc_host/_list b/tests/root1/sys/class/fc_host/_list
new file mode 100644 (file)
index 0000000..f3aba5c
--- /dev/null
+++ b/tests/root1/sys/class/fc_host/_list
@@ -0,0 +1,3 @@
+.
+..
+host0

diff --git a/tests/root2/sys/class/fc_host/_list b/tests/root2/sys/class/fc_host/_list
new file mode 100644 (file)
index 0000000..f3aba5c
--- /dev/null
+++ b/tests/root2/sys/class/fc_host/_list
@@ -0,0 +1,3 @@
+.
+..
+host0

diff --git a/tests/root3/sys/class/fc_host/_list b/tests/root3/sys/class/fc_host/_list
new file mode 100644 (file)
index 0000000..f3aba5c
--- /dev/null
+++ b/tests/root3/sys/class/fc_host/_list
@@ -0,0 +1,3 @@
+.
+..
+host0

diff --git a/tests/root4/sys/class/fc_host/_list b/tests/root4/sys/class/fc_host/_list
new file mode 100644 (file)
index 0000000..a2439b6
--- /dev/null
+++ b/tests/root4/sys/class/fc_host/_list
@@ -0,0 +1,4 @@
+.
+..
+host0
+host1

diff --git a/tests/root4/sys/class/fc_host/host0/statistics/rx_frames b/tests/root4/sys/class/fc_host/host0/statistics/rx_frames
index f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2..74c3ca0539ad0a14678b280a20258d8569aa7898 100644 (file)
--- a/tests/root4/sys/class/fc_host/host0/statistics/rx_frames
+++ b/tests/root4/sys/class/fc_host/host0/statistics/rx_frames
@@ -1 +1 @@
-10
+0x10

diff --git a/tests/root4/sys/class/fc_host/host0/statistics/rx_words b/tests/root4/sys/class/fc_host/host0/statistics/rx_words
index b8626c4cff2849624fb67f87cd0ad72b163671ad..a249cdf3d5d7787fc6aead4b050199cb8a68f29c 100644 (file)
--- a/tests/root4/sys/class/fc_host/host0/statistics/rx_words
+++ b/tests/root4/sys/class/fc_host/host0/statistics/rx_words
@@ -1 +1 @@
-4
+0x4

diff --git a/tests/root4/sys/class/fc_host/host0/statistics/tx_frames b/tests/root4/sys/class/fc_host/host0/statistics/tx_frames
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..4403a030258fcb75bd7d8b5fd8da5d49f6712bd2 100644 (file)
--- a/tests/root4/sys/class/fc_host/host0/statistics/tx_frames
+++ b/tests/root4/sys/class/fc_host/host0/statistics/tx_frames
@@ -1 +1 @@
-5
+0x5

diff --git a/tests/root4/sys/class/fc_host/host0/statistics/tx_words b/tests/root4/sys/class/fc_host/host0/statistics/tx_words
index 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f..87c20ee33d2ca577833b10ead78415c5eeaffdc9 100644 (file)
--- a/tests/root4/sys/class/fc_host/host0/statistics/tx_words
+++ b/tests/root4/sys/class/fc_host/host0/statistics/tx_words
@@ -1 +1 @@
-2
+0x2

diff --git a/tests/root4/sys/class/fc_host/host1/statistics/rx_frames b/tests/root4/sys/class/fc_host/host1/statistics/rx_frames
new file mode 100644 (file)
index 0000000..f599e28
--- /dev/null
+++ b/tests/root4/sys/class/fc_host/host1/statistics/rx_frames
@@ -0,0 +1 @@
+10

diff --git a/tests/root4/sys/class/fc_host/host1/statistics/rx_words b/tests/root4/sys/class/fc_host/host1/statistics/rx_words
new file mode 100644 (file)
index 0000000..b8626c4
--- /dev/null
+++ b/tests/root4/sys/class/fc_host/host1/statistics/rx_words
@@ -0,0 +1 @@
+4

diff --git a/tests/root4/sys/class/fc_host/host1/statistics/tx_frames b/tests/root4/sys/class/fc_host/host1/statistics/tx_frames
new file mode 100644 (file)
index 0000000..7ed6ff8
--- /dev/null
+++ b/tests/root4/sys/class/fc_host/host1/statistics/tx_frames
@@ -0,0 +1 @@
+5

diff --git a/tests/root4/sys/class/fc_host/host1/statistics/tx_words b/tests/root4/sys/class/fc_host/host1/statistics/tx_words
new file mode 100644 (file)
index 0000000..0cfbf08
--- /dev/null
+++ b/tests/root4/sys/class/fc_host/host1/statistics/tx_words
@@ -0,0 +1 @@
+2

diff --git a/tests/root5/sys/class/fc_host/_list b/tests/root5/sys/class/fc_host/_list
new file mode 100644 (file)
index 0000000..a2439b6
--- /dev/null
+++ b/tests/root5/sys/class/fc_host/_list
@@ -0,0 +1,4 @@
+.
+..
+host0
+host1

diff --git a/tests/root5/sys/class/fc_host/host1/statistics/rx_frames b/tests/root5/sys/class/fc_host/host1/statistics/rx_frames
new file mode 100644 (file)
index 0000000..f599e28
--- /dev/null
+++ b/tests/root5/sys/class/fc_host/host1/statistics/rx_frames
@@ -0,0 +1 @@
+10

diff --git a/tests/root5/sys/class/fc_host/host1/statistics/rx_words b/tests/root5/sys/class/fc_host/host1/statistics/rx_words
new file mode 100644 (file)
index 0000000..b8626c4
--- /dev/null
+++ b/tests/root5/sys/class/fc_host/host1/statistics/rx_words
@@ -0,0 +1 @@
+4

diff --git a/tests/root5/sys/class/fc_host/host1/statistics/tx_frames b/tests/root5/sys/class/fc_host/host1/statistics/tx_frames
new file mode 100644 (file)
index 0000000..7ed6ff8
--- /dev/null
+++ b/tests/root5/sys/class/fc_host/host1/statistics/tx_frames
@@ -0,0 +1 @@
+5

diff --git a/tests/root5/sys/class/fc_host/host1/statistics/tx_words b/tests/root5/sys/class/fc_host/host1/statistics/tx_words
new file mode 100644 (file)
index 0000000..0cfbf08
--- /dev/null
+++ b/tests/root5/sys/class/fc_host/host1/statistics/tx_words
@@ -0,0 +1 @@
+2

diff --git a/tests/root6/sys/class/fc_host/_list b/tests/root6/sys/class/fc_host/_list
new file mode 100644 (file)
index 0000000..f3aba5c
--- /dev/null
+++ b/tests/root6/sys/class/fc_host/_list
@@ -0,0 +1,3 @@
+.
+..
+host0

diff --git a/tests/root7/sys/class/fc_host/_list b/tests/root7/sys/class/fc_host/_list
new file mode 100644 (file)
index 0000000..f3aba5c
--- /dev/null
+++ b/tests/root7/sys/class/fc_host/_list
@@ -0,0 +1,3 @@
+.
+..
+host0