sadf: PCP: Add support for A_IRQ activity

Add metric displayed by "sar -I SUM" (total number of interrupts per
second) to PCP archive.
Individual interrupts are not taken into account.

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

activity.c

@@ -185,6 +185,7 @@ struct activity irq_act = {
 	.f_json_print	= json_print_irq_stats,
 	.f_svg_print	= NULL,
 	.f_raw_print	= raw_print_irq_stats,
+	.f_pcp_print	= pcp_print_irq_stats,
 	.f_count_new	= NULL,
 	.item_list	= NULL,
 	.desc		= "Interrupts statistics",

pcp_def_metrics.c

@@ -165,6 +165,26 @@ void pcp_def_pcsw_metrics(void)
 #endif /* HAVE_PCP */
 }
 
+/*
+ ***************************************************************************
+ * Define PCP metrics for interrupts statistics.
+ *
+ * IN:
+ * @a		Activity structure with statistics.
+ ***************************************************************************
+ */
+void pcp_def_irq_metrics(struct activity *a)
+{
+#ifdef HAVE_PCP
+	if (a->bitmap->b_array[0] & 1) {
+		/* Interrupt "sum" */
+		pmiAddMetric("kernel.all.intr",
+			     PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
+			     pmiUnits(0, -1, 1, 0, PM_TIME_SEC, PM_COUNT_ONE));
+	}
+#endif /* HAVE_PCP */
+}
+
 /*
  ***************************************************************************
  * Define PCP metrics for memory statistics.

pcp_def_metrics.h

@@ -14,6 +14,7 @@
 
 void pcp_def_cpu_metrics(struct activity *);
 void pcp_def_pcsw_metrics(void);
+void pcp_def_irq_metrics(struct activity *);
 void pcp_def_memory_metrics(struct activity *);
 void pcp_def_queue_metrics(void);
 

pcp_stats.c

@@ -211,6 +211,32 @@ __print_funct_t pcp_print_pcsw_stats(struct activity *a, int curr, unsigned long
 #endif	/* HAVE_PCP */
 }
 
+/*
+ ***************************************************************************
+ * Display interrupts statistics in PCP format.
+ *
+ * IN:
+ * @a		Activity structure with statistics.
+ * @curr	Index in array for current sample statistics.
+ * @itv		Interval of time in 1/100th of a second.
+ * @record_hdr	Record header for current sample.
+ ***************************************************************************
+ */
+__print_funct_t pcp_print_irq_stats(struct activity *a, int curr, unsigned long long itv,
+				    struct record_header *record_hdr)
+{
+#ifdef HAVE_PCP
+	char buf[64];
+	struct stats_irq
+		*sic = (struct stats_irq *) a->buf[curr],
+		*sip = (struct stats_irq *) a->buf[!curr];
+
+	snprintf(buf, sizeof(buf), "%f",
+		 S_VALUE(sip->irq_nr, sic->irq_nr, itv));
+	pmiPutValue("kernel.all.intr", NULL, buf);
+#endif	/* HAVE_PCP */
+}
+
 /*
  ***************************************************************************
  * Display memory statistics in PCP format.

pcp_stats.h

@@ -17,6 +17,8 @@ __print_funct_t pcp_print_cpu_stats
 	(struct activity *, int, unsigned long long, struct record_header *);
 __print_funct_t pcp_print_pcsw_stats
 	(struct activity *, int, unsigned long long, struct record_header *);
+__print_funct_t pcp_print_irq_stats
+	(struct activity *, int, unsigned long long, struct record_header *);
 __print_funct_t pcp_print_memory_stats
 	(struct activity *, int, unsigned long long, struct record_header *);
 __print_funct_t pcp_print_queue_stats

sadf_misc.c

@@ -505,6 +505,10 @@ __printf_funct_t print_pcp_statistics(int *tab, int action, struct activity *act
 					pcp_def_pcsw_metrics();
 					break;
 
+				case A_IRQ:
+					pcp_def_irq_metrics(act[p]);
+					break;
+
 				case A_MEMORY:
 					pcp_def_memory_metrics(act[p]);
 					break;