sadf: PCP: Add support for A_PAGE activity

[sysstat] / activity.c

diff --git a/activity.c b/activity.c
index 9a01449c2506ea7e28d3b50584b40bec4d93d6fa..f41f19bec71f9dc52a9f5bbcc23b1ada00727ca4 100644 (file)
--- a/activity.c
+++ b/activity.c
@@ -1,6 +1,6 @@
 /*
  * activity.c: Define system activities available for sar/sadc.
- * (C) 1999-2018 by Sebastien GODARD (sysstat <at> orange.fr)
+ * (C) 1999-2019 by Sebastien GODARD (sysstat <at> orange.fr)
  *
  ***************************************************************************
  * This program is free software; you can redistribute it and/or modify it *
@@ -31,6 +31,7 @@
 #include "json_stats.h"
 #include "svg_stats.h"
 #include "raw_stats.h"
+#include "pcp_stats.h"
 #endif
 
 /*
@@ -67,7 +68,8 @@ struct act_bitmap irq_bitmap = {
 struct activity cpu_act = {
        .id             = A_CPU,
        .options        = AO_COLLECTED + AO_COUNTED + AO_PERSISTENT +
-                         AO_MULTIPLE_OUTPUTS + AO_GRAPH_PER_ITEM,
+                         AO_MULTIPLE_OUTPUTS + AO_GRAPH_PER_ITEM +
+                         AO_ALWAYS_COUNTED,
        .magic          = ACTIVITY_MAGIC_BASE + 1,
        .group          = G_DEFAULT,
 #ifdef SOURCE_SADC
@@ -91,6 +93,7 @@ struct activity cpu_act = {
        .f_json_print   = json_print_cpu_stats,
        .f_svg_print    = svg_print_cpu_stats,
        .f_raw_print    = raw_print_cpu_stats,
+       .f_pcp_print    = pcp_print_cpu_stats,
        .f_count_new    = NULL,
        .item_list      = NULL,
        .desc           = "CPU utilization",
@@ -136,6 +139,7 @@ struct activity pcsw_act = {
        .f_json_print   = json_print_pcsw_stats,
        .f_svg_print    = svg_print_pcsw_stats,
        .f_raw_print    = raw_print_pcsw_stats,
+       .f_pcp_print    = pcp_print_pcsw_stats,
        .f_count_new    = NULL,
        .item_list      = NULL,
        .desc           = "Task creation and switching activity",
@@ -181,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",
@@ -226,6 +231,7 @@ struct activity swap_act = {
        .f_json_print   = json_print_swap_stats,
        .f_svg_print    = svg_print_swap_stats,
        .f_raw_print    = raw_print_swap_stats,
+       .f_pcp_print    = pcp_print_swap_stats,
        .f_count_new    = NULL,
        .item_list      = NULL,
        .desc           = "Swap activity",
@@ -272,6 +278,7 @@ struct activity paging_act = {
        .f_json_print   = json_print_paging_stats,
        .f_svg_print    = svg_print_paging_stats,
        .f_raw_print    = raw_print_paging_stats,
+       .f_pcp_print    = pcp_print_paging_stats,
        .f_count_new    = NULL,
        .item_list      = NULL,
        .desc           = "Paging activity",
@@ -307,7 +314,7 @@ struct activity io_act = {
        .f_print_avg    = print_io_stats,
 #endif
 #if defined(SOURCE_SAR) || defined(SOURCE_SADF)
-       .hdr_line       = "tps;rtps;wtps;bread/s;bwrtn/s",
+       .hdr_line       = "tps;rtps;wtps;dtps;bread/s;bwrtn/s;bdscd/s",
 #endif
        .gtypes_nr      = {STATS_IO_ULL, STATS_IO_UL, STATS_IO_U},
        .ftypes_nr      = {0, 0, 0},
@@ -317,6 +324,7 @@ struct activity io_act = {
        .f_json_print   = json_print_io_stats,
        .f_svg_print    = svg_print_io_stats,
        .f_raw_print    = raw_print_io_stats,
+       .f_pcp_print    = pcp_print_io_stats,
        .f_count_new    = NULL,
        .item_list      = NULL,
        .desc           = "I/O and transfer rate statistics",
@@ -363,6 +371,7 @@ struct activity memory_act = {
        .f_json_print   = json_print_memory_stats,
        .f_svg_print    = svg_print_memory_stats,
        .f_raw_print    = raw_print_memory_stats,
+       .f_pcp_print    = pcp_print_memory_stats,
        .f_count_new    = NULL,
        .item_list      = NULL,
        .desc           = "Memory and/or swap utilization",
@@ -453,6 +462,7 @@ struct activity queue_act = {
        .f_json_print   = json_print_queue_stats,
        .f_svg_print    = svg_print_queue_stats,
        .f_raw_print    = raw_print_queue_stats,
+       .f_pcp_print    = pcp_print_queue_stats,
        .f_count_new    = NULL,
        .item_list      = NULL,
        .desc           = "Queue length and load average statistics",