From e7b9cfa3e2564d4a20a04ce84d8cfce1b953044c Mon Sep 17 00:00:00 2001 From: Sebastien GODARD Date: Tue, 14 Apr 2020 13:48:12 +0200 Subject: [PATCH] PSI: Update non regression tests results Signed-off-by: Sebastien GODARD --- tests/expected.data-11.6.5-sadf-x | 6 +- tests/expected.data-wghfreq-sadf-x | 6 +- tests/expected.sa2 | 12 + tests/expected.sadf-H | 5 +- tests/expected.sadf-d | 21 ++ tests/expected.sadf-g | 420 ++++++++++++++++++++++++- tests/expected.sadf-j | 35 ++- tests/expected.sadf-p | 100 ++++++ tests/expected.sadf-r | 48 +++ tests/expected.sadf-x | 31 +- tests/expected.sar-dec | 33 ++ tests/expected.sar-human | 33 ++ tests/expected0.sadf-x | 6 +- tests/expected2.sadf-g | 488 ++++++++++++++++++++++++++--- tests/expected2.sar-all | 33 ++ tests/expected3.sar-all | 21 ++ tests/root.README | 2 + tests/root1/proc/pressure/cpu | 1 + tests/root1/proc/pressure/io | 2 + tests/root1/proc/pressure/memory | 2 + tests/root2/proc/pressure/cpu | 1 + tests/root2/proc/pressure/io | 2 + tests/root2/proc/pressure/memory | 2 + tests/root3/proc/pressure/cpu | 1 + tests/root3/proc/pressure/io | 2 + tests/root3/proc/pressure/memory | 2 + tests/root4/proc/pressure/cpu | 1 + tests/root4/proc/pressure/io | 2 + tests/root4/proc/pressure/memory | 2 + tests/root5/proc/pressure/cpu | 1 + tests/root5/proc/pressure/io | 2 + tests/root5/proc/pressure/memory | 2 + 32 files changed, 1253 insertions(+), 72 deletions(-) create mode 100644 tests/root1/proc/pressure/cpu create mode 100644 tests/root1/proc/pressure/io create mode 100644 tests/root1/proc/pressure/memory create mode 100644 tests/root2/proc/pressure/cpu create mode 100644 tests/root2/proc/pressure/io create mode 100644 tests/root2/proc/pressure/memory create mode 100644 tests/root3/proc/pressure/cpu create mode 100644 tests/root3/proc/pressure/io create mode 100644 tests/root3/proc/pressure/memory create mode 100644 tests/root4/proc/pressure/cpu create mode 100644 tests/root4/proc/pressure/io create mode 100644 tests/root4/proc/pressure/memory create mode 100644 tests/root5/proc/pressure/cpu create mode 100644 tests/root5/proc/pressure/io create mode 100644 tests/root5/proc/pressure/memory diff --git a/tests/expected.data-11.6.5-sadf-x b/tests/expected.data-11.6.5-sadf-x index 63996b5..42331ee 100644 --- a/tests/expected.data-11.6.5-sadf-x +++ b/tests/expected.data-11.6.5-sadf-x @@ -1,11 +1,11 @@ - + - 3.8 + 3.9 Linux 4.17.18-200.fc28.x86_64 diff --git a/tests/expected.data-wghfreq-sadf-x b/tests/expected.data-wghfreq-sadf-x index 9086579..7ce47c5 100644 --- a/tests/expected.data-wghfreq-sadf-x +++ b/tests/expected.data-wghfreq-sadf-x @@ -1,11 +1,11 @@ - + - 3.8 + 3.9 Linux 1.2.3-TEST diff --git a/tests/expected.sa2 b/tests/expected.sa2 index 0e02816..148fb85 100644 --- a/tests/expected.sa2 +++ b/tests/expected.sa2 @@ -117,3 +117,15 @@ Average: 4 0.00 0.00 0.00 0.00 0.00 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 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 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 diff --git a/tests/expected.sadf-H b/tests/expected.sadf-H index 8c377a0..4fb2940 100644 --- a/tests/expected.sadf-H +++ b/tests/expected.sadf-H @@ -8,7 +8,7 @@ Timezone: GMT File composition: (1,1,12),(0,0,9),(2,0,1) Size of a long int: 8 HZ = 100 -Number of activities in file: 34 +Number of activities in file: 37 Extra structures available: N List of activities: 01: [8b] A_CPU Y: 9 (10,0,0) @@ -45,3 +45,6 @@ List of activities: 39: [8a] A_NET_SOFT Y: 9 (0,0,5) 30: [8a] A_PWR_CPU Y: 9 (0,1,0) 37: [8b] A_FS Y: 4 (5,0,0) +40: [8a] A_PSI_CPU N: 1 (1,3,0) +41: [8a] A_PSI_IO N: 1 (2,6,0) +42: [8a] A_PSI_MEM N: 1 (2,6,0) diff --git a/tests/expected.sadf-d b/tests/expected.sadf-d index e4a2d0f..54a8919 100644 --- a/tests/expected.sadf-d +++ b/tests/expected.sadf-d @@ -2331,6 +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 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) @@ -2954,3 +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 +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 +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 +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 2b60719..fdf3b68 100644 --- a/tests/expected.sadf-g +++ b/tests/expected.sadf-g @@ -1,6 +1,6 @@ - + Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) @@ -13626,5 +13626,421 @@ - + + +CPU pressure trends (some tasks) +(Min, Max values) + + +s_acpu10 (0.00, 0.00) +s_acpu60 (0.00, 0.00) +s_acpu300 (0.00, 0.00) + +0.00. + +0.33. + +0.67. + +1.00. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + + +CPU stall time (some tasks) +(Min, Max values) + + +s_tcpu/s (0.00, 2304.90) + +0. + +700. + +1400. + +2100. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + + +I/O pressure trends (some tasks) +(Min, Max values) + + +s_aio10 (0.00, 3.19) +s_aio60 (0.00, 1.14) +s_aio300 (0.00, 0.43) + +0. + +1. + +2. + +3. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + + +I/O stall time (some tasks) +(Min, Max values) + + +s_tio/s (0.00, 23292.75) + +0. + +7000. + +14000. + +21000. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + +I/O pressure trends (full) +(Min, Max values) + + +f_aio10 (0.00, 3.19) +f_aio60 (0.00, 1.14) +f_aio300 (0.00, 0.42) + +0. + +1. + +2. + +3. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + + +I/O stall time (full) +(Min, Max values) + + +f_tio/s (0.00, 22495.67) + +0. + +7000. + +14000. + +21000. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + + +Memory pressure trends (some tasks) +(Min, Max values) + + +s_amem10 (0.00, 99.80) +s_amem60 (0.00, 70.16) +s_amem300 (0.00, 38.70) + +0. + +30. + +60. + +90. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + + +Memory stall time (some tasks) +(Min, Max values) + + +s_tmem/s (0.00, 2072.85) + +0. + +600. + +1200. + +1800. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + +Memory pressure trends (full) +(Min, Max values) + + +f_amem10 (0.00, 0.00) +f_amem60 (0.00, 0.00) +f_amem300 (0.00, 0.00) + +0.00. + +0.33. + +0.67. + +1.00. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + + +Memory stall time (full) +(Min, Max values) + + +f_tmem/s (0.00, 1507.06) + +0. + +500. + +1000. + +1500. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + diff --git a/tests/expected.sadf-j b/tests/expected.sadf-j index 0e899c0..c39f884 100644 --- a/tests/expected.sadf-j +++ b/tests/expected.sadf-j @@ -606,7 +606,12 @@ {"filesystem": "/dev/sda7", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, {"filesystem": "/dev/sda12", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, {"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} + } }, { "timestamp": {"date": "2019-04-18", "time": "13:20:29", "utc": 1, "interval": 31}, @@ -1204,7 +1209,12 @@ {"filesystem": "/dev/sda6", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, {"filesystem": "/dev/sdf", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, {"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} + } }, { "timestamp": {"date": "2019-04-18", "time": "13:20:39", "utc": 1, "interval": 39}, @@ -1806,7 +1816,12 @@ {"filesystem": "/dev/sda6", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, {"filesystem": "/dev/sdf", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, {"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} + } }, { "timestamp": {"date": "2019-04-18", "time": "13:20:49", "utc": 1, "interval": 22}, @@ -2410,7 +2425,12 @@ {"filesystem": "/dev/sda7", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, {"filesystem": "/dev/sda12", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, {"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} + } }, { "timestamp": {"date": "2019-04-18", "time": "13:54:35", "utc": 1, "interval": 31}, @@ -3021,7 +3041,12 @@ {"filesystem": "/dev/sda7", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, {"filesystem": "/dev/sda12", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, {"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} + } } ], "restarts": [ diff --git a/tests/expected.sadf-p b/tests/expected.sadf-p index 2dcbb69..c0d9e30 100644 --- a/tests/expected.sadf-p +++ b/tests/expected.sadf-p @@ -4331,6 +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 -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) @@ -5491,3 +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 diff --git a/tests/expected.sadf-r b/tests/expected.sadf-r index 93fb15c..f6f7c0b 100644 --- a/tests/expected.sadf-r +++ b/tests/expected.sadf-r @@ -2612,6 +2612,45 @@ 13:20:49 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; 13:20:49 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; # 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; +# 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; +# 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; +# 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; +# 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; +# 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; +# 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; +# 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; +# 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; +# 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; +# 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; +# 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; +# 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 13:39:09 UTC; COM Testing sysstat! @@ -3272,3 +3311,12 @@ 13:54:35 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; 13:54:35 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; 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; +# 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; +# 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; diff --git a/tests/expected.sadf-x b/tests/expected.sadf-x index 7e6acf0..e7c961a 100644 --- a/tests/expected.sadf-x +++ b/tests/expected.sadf-x @@ -1,11 +1,11 @@ - + - 3.8 + 3.9 Linux 1.2.3-TEST @@ -638,6 +638,11 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> + + + + + @@ -1262,6 +1267,11 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> + + + + + @@ -1890,6 +1900,11 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> + + + + + @@ -2520,6 +2535,11 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> + + + + + @@ -3157,6 +3177,11 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> + + + + + diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec index 50237e8..05b80a4 100644 --- a/tests/expected.sar-dec +++ b/tests/expected.sar-dec @@ -2948,6 +2948,27 @@ 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 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 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:37:29 LINUX RESTART (8 CPU) 13:54:09 LINUX RESTART (10 CPU) @@ -4191,3 +4212,15 @@ Summary: 85582 7774 8 13 6008414 102818 Summary: 279700 15464 5 10 19201593 455 0 /dev/sda7 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: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: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: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 91c8d15..3991621 100644 --- a/tests/expected.sar-human +++ b/tests/expected.sar-human @@ -2948,6 +2948,27 @@ 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 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 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:37:29 LINUX RESTART (8 CPU) 13:54:09 LINUX RESTART (10 CPU) @@ -4191,3 +4212,15 @@ Summary: 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7 Summary: 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda7 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 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 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 diff --git a/tests/expected0.sadf-x b/tests/expected0.sadf-x index 934e5df..bfe26fb 100644 --- a/tests/expected0.sadf-x +++ b/tests/expected0.sadf-x @@ -1,11 +1,11 @@ - + - 3.8 + 3.9 Linux 1.2.3-TEST diff --git a/tests/expected2.sadf-g b/tests/expected2.sadf-g index fa60e76..a42de92 100644 --- a/tests/expected2.sadf-g +++ b/tests/expected2.sadf-g @@ -1,6 +1,6 @@ - + Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) @@ -67,7 +67,13 @@ CPU clock frequency Filesystems statistics - + +Pressure-stall CPU statistics + +Pressure-stall I/O statistics + +Pressure-stall memory statistics + CPU utilization [all] (Min, Max values) @@ -145,7 +151,7 @@ - + CPU utilization [0] (Min, Max values) @@ -223,7 +229,7 @@ - + CPU utilization [1] (Min, Max values) @@ -298,7 +304,7 @@ - + CPU utilization [2] (Min, Max values) @@ -376,7 +382,7 @@ - + CPU utilization [3] (Min, Max values) @@ -454,7 +460,7 @@ - + CPU utilization [4] (Min, Max values) @@ -532,7 +538,7 @@ - + CPU utilization [5] (Min, Max values) @@ -607,7 +613,7 @@ - + CPU utilization [6] (Min, Max values) @@ -685,7 +691,7 @@ - + CPU utilization [7] (Min, Max values) @@ -760,7 +766,7 @@ - + CPU utilization [8] (Min, Max values) @@ -838,7 +844,7 @@ - + CPU utilization [9] (Min, Max values) @@ -916,7 +922,7 @@ - + Task creation (Min, Max values) @@ -1012,7 +1018,7 @@ - + I/O and transfer rate statistics (1) (Min, Max values) @@ -1114,7 +1120,7 @@ - + Memory utilization (1) (Min, Max values) @@ -1416,7 +1422,7 @@ - + Swap utilization (1) (Min, Max values) @@ -1467,7 +1473,7 @@ - + Kernel tables statistics (1) (Min, Max values) @@ -1565,7 +1571,7 @@ - + Queue length (Min, Max values) @@ -1708,7 +1714,7 @@ - + Block devices statistics (1) [dev8-0] (Min, Max values) @@ -1947,7 +1953,7 @@ - + Block devices statistics (1) [dev8-1] (Min, Max values) @@ -2190,7 +2196,7 @@ - + Block devices statistics (1) [dev8-16] (Min, Max values) @@ -2429,7 +2435,7 @@ - + Block devices statistics (1) [dev8-80] (Min, Max values) @@ -2672,7 +2678,7 @@ - + Block devices statistics (1) [dev8-96] (Min, Max values) @@ -2909,7 +2915,7 @@ - + Block devices statistics (1) [dev104-0] (Min, Max values) @@ -3001,7 +3007,7 @@ - + Block devices statistics (1) [dev104-2] (Min, Max values) @@ -3093,7 +3099,7 @@ - + Network interfaces statistics (1) [enp6s0] (Min, Max values) @@ -3289,7 +3295,7 @@ - + Network interfaces statistics (1) [enp6s1] (Min, Max values) @@ -3440,7 +3446,7 @@ - + Network interfaces statistics (1) [wlp5s1] (Min, Max values) @@ -3536,7 +3542,7 @@ - + Network interfaces statistics (1) [enp6s2] (Min, Max values) @@ -3683,7 +3689,7 @@ - + Network interfaces statistics (1) [wlp5s2] (Min, Max values) @@ -3779,7 +3785,7 @@ - + Network interfaces errors statistics (4) [wlp5s1] (Min, Max values) @@ -3830,7 +3836,7 @@ - + IPv4 sockets statistics (1) (Min, Max values) @@ -3930,7 +3936,7 @@ - + IPv6 sockets statistics (Min, Max values) @@ -3983,7 +3989,7 @@ - + Fibre Channel HBA statistics (1) [host1] (Min, Max values) @@ -4079,7 +4085,7 @@ - + CPU clock frequency [all] (Min, Max values) @@ -4126,7 +4132,7 @@ - + CPU clock frequency [0] (Min, Max values) @@ -4173,7 +4179,7 @@ - + CPU clock frequency [1] (Min, Max values) @@ -4220,7 +4226,7 @@ - + CPU clock frequency [2] (Min, Max values) @@ -4267,7 +4273,7 @@ - + CPU clock frequency [3] (Min, Max values) @@ -4314,7 +4320,7 @@ - + CPU clock frequency [4] (Min, Max values) @@ -4361,7 +4367,7 @@ - + CPU clock frequency [5] (Min, Max values) @@ -4408,7 +4414,7 @@ - + CPU clock frequency [6] (Min, Max values) @@ -4455,7 +4461,7 @@ - + CPU clock frequency [7] (Min, Max values) @@ -4502,7 +4508,7 @@ - + CPU clock frequency [8] (Min, Max values) @@ -4549,7 +4555,7 @@ - + CPU clock frequency [9] (Min, Max values) @@ -4596,7 +4602,7 @@ - + Filesystems statistics (1) [/dev/sda9] (Min, Max values) @@ -4794,7 +4800,7 @@ - + Filesystems statistics (1) [/dev/sda7] (Min, Max values) @@ -4992,7 +4998,7 @@ - + Filesystems statistics (1) [/dev/sda12] (Min, Max values) @@ -5190,7 +5196,7 @@ - + Filesystems statistics (1) [/dev/sda6] (Min, Max values) @@ -5388,7 +5394,7 @@ - + Filesystems statistics (1) [/dev/sdf] (Min, Max values) @@ -5537,7 +5543,7 @@ - + Filesystems statistics (1) [/dev/sdg] (Min, Max values) @@ -5737,5 +5743,383 @@ - + + +CPU stall time (some tasks) +(Min, Max values) + + +s_tcpu/s (0.00, 2304.90) +SYSSTAT.TEST +04/18/19 + + +0. + +700. + +1400. + +2100. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +I/O pressure trends (some tasks) +(Min, Max values) + + +s_aio10 (0.00, 3.19) +s_aio60 (0.00, 1.14) +s_aio300 (0.00, 0.43) +SYSSTAT.TEST +04/18/19 + + +0. + +1. + +2. + +3. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +I/O stall time (some tasks) +(Min, Max values) + + +s_tio/s (0.00, 23292.75) +SYSSTAT.TEST +04/18/19 + + +0. + +7000. + +14000. + +21000. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + +I/O pressure trends (full) +(Min, Max values) + + +f_aio10 (0.00, 3.19) +f_aio60 (0.00, 1.14) +f_aio300 (0.00, 0.42) +SYSSTAT.TEST +04/18/19 + + +0. + +1. + +2. + +3. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +I/O stall time (full) +(Min, Max values) + + +f_tio/s (0.00, 22495.67) +SYSSTAT.TEST +04/18/19 + + +0. + +7000. + +14000. + +21000. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +Memory pressure trends (some tasks) +(Min, Max values) + + +s_amem10 (0.00, 99.80) +s_amem60 (0.00, 70.16) +s_amem300 (0.00, 38.70) +SYSSTAT.TEST +04/18/19 + + +0. + +30. + +60. + +90. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +Memory stall time (some tasks) +(Min, Max values) + + +s_tmem/s (0.00, 2072.85) +SYSSTAT.TEST +04/18/19 + + +0. + +600. + +1200. + +1800. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + +Memory stall time (full) +(Min, Max values) + + +f_tmem/s (0.00, 1507.06) +SYSSTAT.TEST +04/18/19 + + +0. + +500. + +1000. + +1500. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all index 6737502..b35de71 100644 --- a/tests/expected2.sar-all +++ b/tests/expected2.sar-all @@ -2948,6 +2948,27 @@ 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:37:29 LINUX RESTART (8 CPU) 13:54:09 LINUX RESTART (10 CPU) @@ -4191,3 +4212,15 @@ Summary: 85582 7774 8.33 13.45 6008414 102818 1.6 Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 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: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: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: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 3750a72..26767e7 100644 --- a/tests/expected3.sar-all +++ b/tests/expected3.sar-all @@ -407,4 +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:37:29 LINUX RESTART (8 CPU) diff --git a/tests/root.README b/tests/root.README index 0f8917a..f713506 100644 --- a/tests/root.README +++ b/tests/root.README @@ -104,6 +104,8 @@ enp6s0-2,wlp5s0-2: available /sys/devices/system/cpu directory non existent Determine number of CPU using /proc/stat +/proc/pressure/ non existent. + PID: 8741[8741 8785 9109 8789 8835] 21342[21342 21344 8365] diff --git a/tests/root1/proc/pressure/cpu b/tests/root1/proc/pressure/cpu new file mode 100644 index 0000000..ed779a7 --- /dev/null +++ b/tests/root1/proc/pressure/cpu @@ -0,0 +1 @@ +some avg10=0.00 avg60=0.00 avg300=0.00 total=1473177 diff --git a/tests/root1/proc/pressure/io b/tests/root1/proc/pressure/io new file mode 100644 index 0000000..51aa753 --- /dev/null +++ b/tests/root1/proc/pressure/io @@ -0,0 +1,2 @@ +some avg10=0.45 avg60=0.34 avg300=0.20 total=96242289 +full avg10=0.45 avg60=0.33 avg300=0.20 total=92732851 diff --git a/tests/root1/proc/pressure/memory b/tests/root1/proc/pressure/memory new file mode 100644 index 0000000..30c03cc --- /dev/null +++ b/tests/root1/proc/pressure/memory @@ -0,0 +1,2 @@ +some avg10=0.00 avg60=0.00 avg300=0.00 total=0 +full avg10=0.00 avg60=0.00 avg300=0.00 total=0 diff --git a/tests/root2/proc/pressure/cpu b/tests/root2/proc/pressure/cpu new file mode 100644 index 0000000..6f99a54 --- /dev/null +++ b/tests/root2/proc/pressure/cpu @@ -0,0 +1 @@ +some avg10=0.00 avg60=0.00 avg300=0.00 total=1481906 diff --git a/tests/root2/proc/pressure/io b/tests/root2/proc/pressure/io new file mode 100644 index 0000000..7bf3e8b --- /dev/null +++ b/tests/root2/proc/pressure/io @@ -0,0 +1,2 @@ +some avg10=3.19 avg60=1.14 avg300=0.43 total=96968324 +full avg10=3.19 avg60=1.14 avg300=0.42 total=93434041 diff --git a/tests/root2/proc/pressure/memory b/tests/root2/proc/pressure/memory new file mode 100644 index 0000000..327d6c8 --- /dev/null +++ b/tests/root2/proc/pressure/memory @@ -0,0 +1,2 @@ +some avg10=3.12 avg60=1.40 avg300=0.03 total=16030 +full avg10=0.00 avg60=0.00 avg300=0.00 total=7200 diff --git a/tests/root3/proc/pressure/cpu b/tests/root3/proc/pressure/cpu new file mode 100644 index 0000000..2448ec8 --- /dev/null +++ b/tests/root3/proc/pressure/cpu @@ -0,0 +1 @@ +some avg10=0.00 avg60=0.00 avg300=0.00 total=1553911 diff --git a/tests/root3/proc/pressure/io b/tests/root3/proc/pressure/io new file mode 100644 index 0000000..9caed78 --- /dev/null +++ b/tests/root3/proc/pressure/io @@ -0,0 +1,2 @@ +some avg10=0.00 avg60=0.16 avg300=0.29 total=97403226 +full avg10=0.00 avg60=0.15 avg300=0.28 total=93822846 diff --git a/tests/root3/proc/pressure/memory b/tests/root3/proc/pressure/memory new file mode 100644 index 0000000..a19f101 --- /dev/null +++ b/tests/root3/proc/pressure/memory @@ -0,0 +1,2 @@ +some avg10=21.06 avg60=14.31 avg300=3.80 total=24037 +full avg10=0.00 avg60=0.00 avg300=0.00 total=9803 diff --git a/tests/root4/proc/pressure/cpu b/tests/root4/proc/pressure/cpu new file mode 100644 index 0000000..64e42ee --- /dev/null +++ b/tests/root4/proc/pressure/cpu @@ -0,0 +1 @@ +some avg10=0.00 avg60=0.00 avg300=0.00 total=1556997 diff --git a/tests/root4/proc/pressure/io b/tests/root4/proc/pressure/io new file mode 100644 index 0000000..5d9665c --- /dev/null +++ b/tests/root4/proc/pressure/io @@ -0,0 +1,2 @@ +some avg10=0.00 avg60=0.07 avg300=0.25 total=97408223 +full avg10=0.00 avg60=0.07 avg300=0.24 total=93827811 diff --git a/tests/root4/proc/pressure/memory b/tests/root4/proc/pressure/memory new file mode 100644 index 0000000..be5cd21 --- /dev/null +++ b/tests/root4/proc/pressure/memory @@ -0,0 +1,2 @@ +some avg10=99.80 avg60=70.16 avg300=38.70 total=56879 +full avg10=0.00 avg60=0.00 avg300=0.00 total=12037 diff --git a/tests/root5/proc/pressure/cpu b/tests/root5/proc/pressure/cpu new file mode 100644 index 0000000..801ead1 --- /dev/null +++ b/tests/root5/proc/pressure/cpu @@ -0,0 +1 @@ +some avg10=0.00 avg60=0.00 avg300=0.00 total=1608139 diff --git a/tests/root5/proc/pressure/io b/tests/root5/proc/pressure/io new file mode 100644 index 0000000..b06f26c --- /dev/null +++ b/tests/root5/proc/pressure/io @@ -0,0 +1,2 @@ +some avg10=0.00 avg60=0.00 avg300=0.03 total=97617263 +full avg10=0.00 avg60=0.00 avg300=0.03 total=94001210 diff --git a/tests/root5/proc/pressure/memory b/tests/root5/proc/pressure/memory new file mode 100644 index 0000000..355a358 --- /dev/null +++ b/tests/root5/proc/pressure/memory @@ -0,0 +1,2 @@ +some avg10=23.00 avg60=3.00 avg300=0.36 total=103290 +full avg10=0.00 avg60=0.00 avg300=0.00 total=45780 -- 2.40.0