mpstat: Update simulation tests results

Offline CPU are no longer displayed.

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

diff --git a/tests/expected.mpstat-A b/tests/expected.mpstat-A
index 004817dab6b760a914a6eb543d4ce7b1f08b2ab6..577d9d935fc0f5929a5e848c4771e8d0efde5fbf 100644 (file)
--- a/tests/expected.mpstat-A
+++ b/tests/expected.mpstat-A
@@ -26,7 +26,6 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (9 CPU)
 00:00:01       5     42.67
 00:00:01       6     62.88
 00:00:01       7     42.22
-00:00:01       8      0.00
 
 00:00:00     CPU        0/s        8/s        9/s       16/s       17/s       18/s       19/s       23/s       24/s       25/s       26/s       27/s       28/s       29/s       30/s       31/s       32/s       33/s       34/s       35/s       36/s      NMI/s      LOC/s      SPU/s      PMI/s      IWI/s      RTR/s      RES/s      CAL/s      TLB/s      TRM/s      THR/s      DFR/s      MCE/s      MCP/s      HYP/s      HRE/s      HVS/s      ERR/s      MIS/s      PIN/s      NPI/s      PIW/s
 00:00:01       0       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.03    5434.36       0.00       0.03       0.00       0.00     149.37      69.87     105.97       0.00       0.00       0.00       0.00       0.03       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00
@@ -37,7 +36,6 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (9 CPU)
 00:00:01       5       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00    5828.49       0.00       0.00       0.00       0.00       2.69      17.32      32.34       0.00       0.00       0.00       0.00       0.03       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00
 00:00:01       6       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00     149.98       0.00       0.00       0.03    4691.08       0.00       0.03       0.00       0.00       9.11      18.67      29.71       0.00       0.00       0.00       0.00       0.03       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00
 00:00:01       7       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00     468.33       0.00       0.00       0.00       0.00       3.21      31.15      84.57       0.00       0.00       0.00       0.00       0.03       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00
-00:00:01       8       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00
 
 00:00:00     CPU       HI/s    TIMER/s   NET_TX/s   NET_RX/s    BLOCK/s IRQ_POLL/s  TASKLET/s    SCHED/s  HRTIMER/s      RCU/s
 00:00:01       0       0.00      13.09       0.00       0.00       0.00       0.00       0.00      19.44       0.00       8.25
@@ -48,7 +46,6 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (9 CPU)
 00:00:01       5       0.00      19.19       0.00       0.00       0.77       0.00       0.00      11.87       0.00      10.84
 00:00:01       6       0.00      31.41       0.00       0.00       0.00       0.00       0.00      15.01       0.00      16.46
 00:00:01       7       0.00      20.08       0.00       0.00       0.00       0.00       0.00       9.82       0.00      12.32
-00:00:01       8       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00
 
 00:00:01     CPU    %usr   %nice    %sys %iowait    %irq   %soft  %steal  %guest  %gnice   %idle
 00:00:02     all    2.28    0.00    1.55    0.48    0.19    0.19    0.00    0.00    0.00   95.31
@@ -73,9 +70,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (9 CPU)
 00:00:02       3      0.00
 00:00:02       4     92.96
 00:00:02       5     75.35
-00:00:02       6      0.00
 00:00:02       7     34.86
-00:00:02       8      0.00
 
 00:00:01     CPU        0/s        8/s        9/s       16/s       17/s       18/s       19/s       23/s       24/s       25/s       26/s       27/s       28/s       29/s       30/s       31/s       32/s       33/s       34/s       35/s       36/s      NMI/s      LOC/s      SPU/s      PMI/s      IWI/s      RTR/s      RES/s      CAL/s      TLB/s      TRM/s      THR/s      DFR/s      MCE/s      MCP/s      HYP/s      HRE/s      HVS/s      ERR/s      MIS/s      PIN/s      NPI/s      PIW/s
 00:00:02       0       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00    2967.32       0.00       0.00       0.00       0.00     130.12       5.35      15.72       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00
@@ -84,9 +79,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (9 CPU)
 00:00:02       3       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00      10.21       0.00       0.00       0.00       0.10    1010.24       0.00       0.10       0.00       0.00       0.16       0.38       0.32       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00
 00:00:02       4       0.00       0.00       0.00       0.00       0.00       0.00      23.34      23.88       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00    4783.96       0.00       0.00       0.00       0.00       4.61       5.09      13.48       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00
 00:00:02       5       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.03    2852.85       0.00       0.03       0.00       0.00       3.36      12.64      24.20       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00
-00:00:02       6       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00     137.10       0.00       0.00       0.00    6864.76       0.00       0.00       0.00       0.00       4.29       7.75      20.52       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00
 00:00:02       7       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00    1132.78       0.00       0.00       0.00       0.00       2.37       3.68      10.69       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00
-00:00:02       8       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00
 
 00:00:01     CPU       HI/s    TIMER/s   NET_TX/s   NET_RX/s    BLOCK/s IRQ_POLL/s  TASKLET/s    SCHED/s  HRTIMER/s      RCU/s
 00:00:02       0       0.00      31.91       0.00       0.00       0.00       0.00       0.00      26.50       0.00      17.57
@@ -95,9 +88,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (9 CPU)
 00:00:02       3       0.00      23.50       0.13       0.83       0.00       0.00       0.00      13.25       0.00      14.79
 00:00:02       4       6.47      29.00       0.00       0.00       0.42       0.00      21.96      19.49       0.00      15.62
 00:00:02       5       0.00      36.14       0.00       0.00       0.99       0.00       0.00      18.21       0.00      20.01
-00:00:02       6       0.00      33.07       0.00       0.00       0.00       0.00       0.00      15.72       0.00      18.25
 00:00:02       7       0.00      16.77       0.00       0.00       0.00       0.00       0.00       8.51       0.00       9.57
-00:00:02       8       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00       0.00
 
 Average:     CPU    %usr   %nice    %sys %iowait    %irq   %soft  %steal  %guest  %gnice   %idle
 Average:     all    2.20    7.13    1.71    0.27    0.27    0.19    0.00    0.00    0.00   88.22

diff --git a/tests/expected.mpstat-A-JSON b/tests/expected.mpstat-A-JSON
index 587c3a91746bb9eb7cb7260bb4fbb34498022af3..73be6997690bfae7609b2bd9d0351e8d6603463a 100644 (file)
--- a/tests/expected.mpstat-A-JSON
+++ b/tests/expected.mpstat-A-JSON
@@ -35,8 +35,7 @@
                                                {"cpu": "4", "intr": 68.85},
                                                {"cpu": "5", "intr": 42.67},
                                                {"cpu": "6", "intr": 62.88},
-                                               {"cpu": "7", "intr": 42.22},
-                                               {"cpu": "8", "intr": 0.00}
+                                               {"cpu": "7", "intr": 42.22}
                                        ],
                                        "individual-interrupts": [
                                                {"cpu": "0", "intr": [
@@ -398,51 +397,6 @@
                                                        {"name": "PIN", "value": 0.00},
                                                        {"name": "NPI", "value": 0.00},
                                                        {"name": "PIW", "value": 0.00}
-                                               ] },
-                                               {"cpu": "8", "intr": [
-                                                       {"name": "0", "value": 0.00},
-                                                       {"name": "8", "value": 0.00},
-                                                       {"name": "9", "value": 0.00},
-                                                       {"name": "16", "value": 0.00},
-                                                       {"name": "17", "value": 0.00},
-                                                       {"name": "18", "value": 0.00},
-                                                       {"name": "19", "value": 0.00},
-                                                       {"name": "23", "value": 0.00},
-                                                       {"name": "24", "value": 0.00},
-                                                       {"name": "25", "value": 0.00},
-                                                       {"name": "26", "value": 0.00},
-                                                       {"name": "27", "value": 0.00},
-                                                       {"name": "28", "value": 0.00},
-                                                       {"name": "29", "value": 0.00},
-                                                       {"name": "30", "value": 0.00},
-                                                       {"name": "31", "value": 0.00},
-                                                       {"name": "32", "value": 0.00},
-                                                       {"name": "33", "value": 0.00},
-                                                       {"name": "34", "value": 0.00},
-                                                       {"name": "35", "value": 0.00},
-                                                       {"name": "36", "value": 0.00},
-                                                       {"name": "NMI", "value": 0.00},
-                                                       {"name": "LOC", "value": 0.00},
-                                                       {"name": "SPU", "value": 0.00},
-                                                       {"name": "PMI", "value": 0.00},
-                                                       {"name": "IWI", "value": 0.00},
-                                                       {"name": "RTR", "value": 0.00},
-                                                       {"name": "RES", "value": 0.00},
-                                                       {"name": "CAL", "value": 0.00},
-                                                       {"name": "TLB", "value": 0.00},
-                                                       {"name": "TRM", "value": 0.00},
-                                                       {"name": "THR", "value": 0.00},
-                                                       {"name": "DFR", "value": 0.00},
-                                                       {"name": "MCE", "value": 0.00},
-                                                       {"name": "MCP", "value": 0.00},
-                                                       {"name": "HYP", "value": 0.00},
-                                                       {"name": "HRE", "value": 0.00},
-                                                       {"name": "HVS", "value": 0.00},
-                                                       {"name": "ERR", "value": 0.00},
-                                                       {"name": "MIS", "value": 0.00},
-                                                       {"name": "PIN", "value": 0.00},
-                                                       {"name": "NPI", "value": 0.00},
-                                                       {"name": "PIW", "value": 0.00}
                                                ] }
                                        ],
                                        "soft-interrupts": [
@@ -541,18 +495,6 @@
                                                        {"name": "SCHED", "value": 9.82},
                                                        {"name": "HRTIMER", "value": 0.00},
                                                        {"name": "RCU", "value": 12.32}
-                                               ] },
-                                               {"cpu": "8", "intr": [
-                                                       {"name": "HI", "value": 0.00},
-                                                       {"name": "TIMER", "value": 0.00},
-                                                       {"name": "NET_TX", "value": 0.00},
-                                                       {"name": "NET_RX", "value": 0.00},
-                                                       {"name": "BLOCK", "value": 0.00},
-                                                       {"name": "IRQ_POLL", "value": 0.00},
-                                                       {"name": "TASKLET", "value": 0.00},
-                                                       {"name": "SCHED", "value": 0.00},
-                                                       {"name": "HRTIMER", "value": 0.00},
-                                                       {"name": "RCU", "value": 0.00}
                                                ] }
                                        ]
                                }