From: Sebastien GODARD <sysstat@users.noreply.github.com>
Date: Sat, 12 Feb 2022 14:55:36 +0000 (+0100)
Subject: PCP: Make sure instances for per-CPU interrupts are created for all CPU
X-Git-Tag: v12.5.6~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a25646ea251d22541dd5327b3674e722ef069d0;p=sysstat

PCP: Make sure instances for per-CPU interrupts are created for all CPU

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

diff --git a/pcp_def_metrics.c b/pcp_def_metrics.c
index 24e9309..65d7c05 100644
--- a/pcp_def_metrics.c
+++ b/pcp_def_metrics.c
@@ -179,7 +179,12 @@ void pcp_def_cpu_metrics(struct activity *a)
 				pmiAddInstance(indom, buf, i - 1);
 			}
 
-			if (first) {
+			if (a->id == A_IRQ) {
+				/* Create per-CPU interrupts metrics */
+				pcp_def_percpu_int_metrics(a, i - 1);
+			}
+
+			else if (first) {
 				if (a->id == A_CPU) {
 					/* Create metrics for A_CPU */
 					pmiAddMetric("kernel.percpu.cpu.user",
@@ -253,10 +258,6 @@ void pcp_def_cpu_metrics(struct activity *a)
 						     pmiUnits(0, 0, 1, 0, 0, PM_COUNT_ONE));
 				}
 
-				else if (a->id == A_IRQ) {
-					/* Create per-CPU interrupts metrics */
-					pcp_def_percpu_int_metrics(a, i - 1);
-				}
 				first = FALSE;
 			}
 		}