sadc: Don't count items several times

This patch makes sure that sadc doesn't count items several times.

Items here means CPU, network interfaces, etc.
sadc needs to count these items to allocate its structures for each
selected activity. But there are different activities based on the same
items (eg. A_CPU, A_PWR_CPUFREQ and A_PWR_WGHFREQ are all related to CPU
activities, or A_NET_DEV and A_NET_EDEV are related to network
interfaces). And so, when different activities based on the same
items were selected, the number of these items was counted several
times, which is inefficient.

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

diff --git a/activity.c b/activity.c
index 3ca43804fb510f198db32882448ded7d49072e23..23f82fed124ee6cfc3feb96a6c861fb78a93e280 100644 (file)
--- a/activity.c
+++ b/activity.c
@@ -73,7 +73,7 @@ struct activity cpu_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_DEFAULT,
 #ifdef SOURCE_SADC
-       .f_count        = wrap_get_cpu_nr,
+       .f_count_index  = 0,    /* wrap_get_cpu_nr() */
        .f_count2       = NULL,
        .f_read         = wrap_read_stat_cpu,
 #endif
@@ -105,7 +105,7 @@ struct activity pcsw_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_DEFAULT,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_stat_pcsw,
 #endif
@@ -136,7 +136,7 @@ struct activity irq_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_INT,
 #ifdef SOURCE_SADC
-       .f_count        = wrap_get_irq_nr,
+       .f_count_index  = 1,    /* wrap_get_irq_nr() */
        .f_count2       = NULL,
        .f_read         = wrap_read_stat_irq,
 #endif
@@ -167,7 +167,7 @@ struct activity swap_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_DEFAULT,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_swap,
 #endif
@@ -198,7 +198,7 @@ struct activity paging_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_DEFAULT,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_paging,
 #endif
@@ -230,7 +230,7 @@ struct activity io_act = {
        .magic          = ACTIVITY_MAGIC_BASE + 1,
        .group          = G_DEFAULT,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_io,
 #endif
@@ -261,7 +261,7 @@ struct activity memory_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_DEFAULT,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_meminfo,
 #endif
@@ -294,7 +294,7 @@ struct activity ktables_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_DEFAULT,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_kernel_tables,
 #endif
@@ -325,7 +325,7 @@ struct activity queue_act = {
        .magic          = ACTIVITY_MAGIC_BASE + 1,
        .group          = G_DEFAULT,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_loadavg,
 #endif
@@ -356,7 +356,7 @@ struct activity serial_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_DEFAULT,
 #ifdef SOURCE_SADC
-       .f_count        = wrap_get_serial_nr,
+       .f_count_index  = 2,    /* wrap_get_serial_nr() */
        .f_count2       = NULL,
        .f_read         = wrap_read_tty_driver_serial,
 #endif
@@ -387,7 +387,7 @@ struct activity disk_act = {
        .magic          = ACTIVITY_MAGIC_BASE + 1,
        .group          = G_DISK,
 #ifdef SOURCE_SADC
-       .f_count        = wrap_get_disk_nr,
+       .f_count_index  = 3,    /* wrap_get_disk_nr() */
        .f_count2       = NULL,
        .f_read         = wrap_read_disk,
 #endif
@@ -418,7 +418,7 @@ struct activity net_dev_act = {
        .magic          = ACTIVITY_MAGIC_BASE + 2,
        .group          = G_DEFAULT,
 #ifdef SOURCE_SADC
-       .f_count        = wrap_get_iface_nr,
+       .f_count_index  = 4,    /* wrap_get_iface_nr() */
        .f_count2       = NULL,
        .f_read         = wrap_read_net_dev,
 #endif
@@ -449,7 +449,7 @@ struct activity net_edev_act = {
        .magic          = ACTIVITY_MAGIC_BASE + 1,
        .group          = G_DEFAULT,
 #ifdef SOURCE_SADC
-       .f_count        = wrap_get_iface_nr,
+       .f_count_index  = 4,    /* wrap_get_iface_nr() */
        .f_count2       = NULL,
        .f_read         = wrap_read_net_edev,
 #endif
@@ -481,7 +481,7 @@ struct activity net_nfs_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_DEFAULT,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_net_nfs,
 #endif
@@ -512,7 +512,7 @@ struct activity net_nfsd_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_DEFAULT,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_net_nfsd,
 #endif
@@ -544,7 +544,7 @@ struct activity net_sock_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_DEFAULT,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_net_sock,
 #endif
@@ -575,7 +575,7 @@ struct activity net_ip_act = {
        .magic          = ACTIVITY_MAGIC_BASE + 1,
        .group          = G_SNMP,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_net_ip,
 #endif
@@ -606,7 +606,7 @@ struct activity net_eip_act = {
        .magic          = ACTIVITY_MAGIC_BASE + 1,
        .group          = G_SNMP,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_net_eip,
 #endif
@@ -637,7 +637,7 @@ struct activity net_icmp_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_SNMP,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_net_icmp,
 #endif
@@ -669,7 +669,7 @@ struct activity net_eicmp_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_SNMP,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_net_eicmp,
 #endif
@@ -701,7 +701,7 @@ struct activity net_tcp_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_SNMP,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_net_tcp,
 #endif
@@ -732,7 +732,7 @@ struct activity net_etcp_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_SNMP,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_net_etcp,
 #endif
@@ -763,7 +763,7 @@ struct activity net_udp_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_SNMP,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_net_udp,
 #endif
@@ -794,7 +794,7 @@ struct activity net_sock6_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_IPV6,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_net_sock6,
 #endif
@@ -825,7 +825,7 @@ struct activity net_ip6_act = {
        .magic          = ACTIVITY_MAGIC_BASE + 1,
        .group          = G_IPV6,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_net_ip6,
 #endif
@@ -857,7 +857,7 @@ struct activity net_eip6_act = {
        .magic          = ACTIVITY_MAGIC_BASE + 1,
        .group          = G_IPV6,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_net_eip6,
 #endif
@@ -889,7 +889,7 @@ struct activity net_icmp6_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_IPV6,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_net_icmp6,
 #endif
@@ -922,7 +922,7 @@ struct activity net_eicmp6_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_IPV6,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_net_eicmp6,
 #endif
@@ -954,7 +954,7 @@ struct activity net_udp6_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_IPV6,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_net_udp6,
 #endif
@@ -985,7 +985,7 @@ struct activity pwr_cpufreq_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_POWER,
 #ifdef SOURCE_SADC
-       .f_count        = wrap_get_cpu_nr,
+       .f_count_index  = 0,    /* wrap_get_cpu_nr() */
        .f_count2       = NULL,
        .f_read         = wrap_read_cpuinfo,
 #endif
@@ -1016,7 +1016,7 @@ struct activity pwr_fan_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_POWER,
 #ifdef SOURCE_SADC
-       .f_count        = wrap_get_fan_nr,
+       .f_count_index  = 5,    /* wrap_get_fan_nr() */
        .f_count2       = NULL,
        .f_read         = wrap_read_fan,
 #endif
@@ -1047,7 +1047,7 @@ struct activity pwr_temp_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_POWER,
 #ifdef SOURCE_SADC
-       .f_count        = wrap_get_temp_nr,
+       .f_count_index  = 6,    /* wrap_get_temp_nr() */
        .f_count2       = NULL,
        .f_read         = wrap_read_temp,
 #endif
@@ -1078,7 +1078,7 @@ struct activity pwr_in_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_POWER,
 #ifdef SOURCE_SADC
-       .f_count        = wrap_get_in_nr,
+       .f_count_index  = 7,    /* wrap_get_in_nr() */
        .f_count2       = NULL,
        .f_read         = wrap_read_in,
 #endif
@@ -1109,7 +1109,7 @@ struct activity huge_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_DEFAULT,
 #ifdef SOURCE_SADC
-       .f_count        = NULL,
+       .f_count_index  = -1,
        .f_count2       = NULL,
        .f_read         = wrap_read_meminfo_huge,
 #endif
@@ -1140,7 +1140,7 @@ struct activity pwr_wghfreq_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_POWER,
 #ifdef SOURCE_SADC
-       .f_count        = wrap_get_cpu_nr,
+       .f_count_index  = 0,    /* wrap_get_cpu_nr() */
        .f_count2       = wrap_get_freq_nr,
        .f_read         = wrap_read_time_in_state,
 #endif
@@ -1171,7 +1171,7 @@ struct activity pwr_usb_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_POWER,
 #ifdef SOURCE_SADC
-       .f_count        = wrap_get_usb_nr,
+       .f_count_index  = 8,    /* wrap_get_usb_nr() */
        .f_count2       = NULL,
        .f_read         = wrap_read_bus_usb_dev,
 #endif
@@ -1202,7 +1202,7 @@ struct activity filesystem_act = {
        .magic          = ACTIVITY_MAGIC_BASE,
        .group          = G_XDISK,
 #ifdef SOURCE_SADC
-       .f_count        = wrap_get_filesystem_nr,
+       .f_count_index  = 9,    /* wrap_get_filesystem_nr() */
        .f_count2       = NULL,
        .f_read         = wrap_read_filesystem,
 #endif
@@ -1226,6 +1226,23 @@ struct activity filesystem_act = {
        .bitmap         = NULL
 };
 
+#ifdef SOURCE_SADC
+/*
+ * Array of functions used to count number of items.
+ */
+__nr_t (*f_count[NR_F_COUNT]) (struct activity *) = {
+       wrap_get_cpu_nr,
+       wrap_get_irq_nr,
+       wrap_get_serial_nr,
+       wrap_get_disk_nr,
+       wrap_get_iface_nr,
+       wrap_get_fan_nr,
+       wrap_get_temp_nr,
+       wrap_get_in_nr,
+       wrap_get_usb_nr,
+       wrap_get_filesystem_nr
+};
+#endif
 
 /*
  * Array of activities.

diff --git a/sa.h b/sa.h
index 784964cf6a44a25ff158c883a11c514b77aaa58c..4d884ff739348c44f33de3b746ba32b4a90cf75c 100644 (file)
--- a/sa.h
+++ b/sa.h
@@ -22,6 +22,9 @@
 /* Number of activities */
 #define NR_ACT 37
 
+/* Number of functions used to count items */
+#define NR_F_COUNT     10
+
 /* Activities */
 #define A_CPU          1
 #define A_PCSW         2
@@ -325,18 +328,19 @@ struct activity {
         */
        unsigned int group;
        /*
-        * The f_count() function is used to count the number of
-        * items (serial lines, network interfaces, etc.) -> @nr
+        * Index in f_count[] array to determine function used to count
+        * the number of items (serial lines, network interfaces, etc.) -> @nr
         * Such a function should _always_ return a value greater than
         * or equal to 0.
         *
-        * A NULL value for this function pointer indicates that the number of items
+        * A value of -1 indicates that the number of items
         * is a constant (and @nr is set to this value).
         *
-        * This function is called even if activity has not been selected, to make
-        * sure that all items have been calculated (including #CPU, etc.)
+        * These functions are called even if corresponding activities have not
+        * been selected, to make sure that all items have been calculated
+        * (including #CPU, etc.)
         */
-       __nr_t (*f_count) (struct activity *);
+       int f_count_index;
        /*
         * The f_count2() function is used to count the number of
         * sub-items -> @nr2

diff --git a/sadc.c b/sadc.c
index 567233afb51df3702536fd792ed3caf03dd53d11..55e76f5ac2179b306685fc56b6ba17a7feeacb27 100644 (file)
--- a/sadc.c
+++ b/sadc.c
@@ -71,6 +71,7 @@ unsigned int id_seq[NR_ACT];
 unsigned int vol_id_seq[NR_ACT];
 
 extern struct activity *act[];
+extern __nr_t (*f_count[]) (struct activity *);
 
 struct sigaction alrm_act, int_act;
 
@@ -290,13 +291,27 @@ void reset_stats(void)
  */
 void sa_sys_init(void)
 {
-       int i;
+       int i, idx;
+       __nr_t f_count_results[NR_F_COUNT];
+
+       /* Init array. Means that no items have been counted yet */
+       for (i = 0; i < NR_F_COUNT; i++) {
+               f_count_results[i] = -1;
+       }
 
        for (i = 0; i < NR_ACT; i++) {
 
-               if (act[i]->f_count) {
+               idx = act[i]->f_count_index;
+
+               if (idx >= 0) {
                        /* Number of items is not a constant and should be calculated */
-                       act[i]->nr = (*act[i]->f_count)(act[i]);
+                       if (f_count_results[idx] >= 0) {
+                               act[i]->nr = f_count_results[idx];
+                       }
+                       else {
+                               act[i]->nr = (f_count[idx])(act[i]);
+                               f_count_results[idx] = act[i]->nr;
+                       }
                }
 
                if (act[i]->nr > 0) {