X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=activity.c;h=f41f19bec71f9dc52a9f5bbcc23b1ada00727ca4;hb=c2135f6b79b5be04e0384fd27916d62d755db2ac;hp=0b749c2ffc0d1a96ec0776112d4fc6c663202ff7;hpb=6b70e7c4fbd7b6c606e9209b251c3e66c1be9907;p=sysstat diff --git a/activity.c b/activity.c index 0b749c2..f41f19b 100644 --- a/activity.c +++ b/activity.c @@ -1,6 +1,6 @@ /* * activity.c: Define system activities available for sar/sadc. - * (C) 1999-2016 by Sebastien GODARD (sysstat orange.fr) + * (C) 1999-2019 by Sebastien GODARD (sysstat orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it * @@ -21,11 +21,6 @@ #include "sa.h" -#ifdef SOURCE_SADC -#include "rd_stats.h" -#include "rd_sensors.h" -#endif - #ifdef SOURCE_SAR #include "pr_stats.h" #endif @@ -35,6 +30,8 @@ #include "xml_stats.h" #include "json_stats.h" #include "svg_stats.h" +#include "raw_stats.h" +#include "pcp_stats.h" #endif /* @@ -70,9 +67,10 @@ struct act_bitmap irq_bitmap = { */ struct activity cpu_act = { .id = A_CPU, - .options = AO_COLLECTED + AO_VOLATILE + AO_GLOBAL_ITV + AO_MULTIPLE_OUTPUTS + - AO_GRAPH_PER_ITEM, - .magic = ACTIVITY_MAGIC_BASE, + .options = AO_COLLECTED + AO_COUNTED + AO_PERSISTENT + + AO_MULTIPLE_OUTPUTS + AO_GRAPH_PER_ITEM + + AO_ALWAYS_COUNTED, + .magic = ACTIVITY_MAGIC_BASE + 1, .group = G_DEFAULT, #ifdef SOURCE_SADC .f_count_index = 0, /* wrap_get_cpu_nr() */ @@ -83,19 +81,31 @@ struct activity cpu_act = { .f_print = print_cpu_stats, .f_print_avg = print_cpu_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "CPU;%user;%nice;%system;%iowait;%steal;%idle|" + "CPU;%usr;%nice;%sys;%iowait;%steal;%irq;%soft;%guest;%gnice;%idle", +#endif + .gtypes_nr = {STATS_CPU_ULL, STATS_CPU_UL, STATS_CPU_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_cpu_stats, .f_xml_print = xml_print_cpu_stats, .f_json_print = json_print_cpu_stats, .f_svg_print = svg_print_cpu_stats, - .hdr_line = "CPU;%user;%nice;%system;%iowait;%steal;%idle|" - "CPU;%usr;%nice;%sys;%iowait;%steal;%irq;%soft;%guest;%gnice;%idle", + .f_raw_print = raw_print_cpu_stats, + .f_pcp_print = pcp_print_cpu_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "CPU utilization", +#endif .name = "A_CPU", + .item_list_sz = 0, .g_nr = 1, -#endif - .nr = -1, + .nr_ini = -1, .nr2 = 1, .nr_max = NR_CPUS + 1, + .nr = {-1, -1, -1}, + .nr_allocated = 0, .fsize = STATS_CPU_SIZE, .msize = STATS_CPU_SIZE, .opt_flags = AO_F_CPU_DEF, @@ -107,7 +117,7 @@ struct activity cpu_act = { struct activity pcsw_act = { .id = A_PCSW, .options = AO_COLLECTED, - .magic = ACTIVITY_MAGIC_BASE, + .magic = ACTIVITY_MAGIC_BASE + 1, .group = G_DEFAULT, #ifdef SOURCE_SADC .f_count_index = -1, @@ -118,18 +128,30 @@ struct activity pcsw_act = { .f_print = print_pcsw_stats, .f_print_avg = print_pcsw_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "proc/s;cswch/s", +#endif + .gtypes_nr = {STATS_PCSW_ULL, STATS_PCSW_UL, STATS_PCSW_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_pcsw_stats, .f_xml_print = xml_print_pcsw_stats, .f_json_print = json_print_pcsw_stats, .f_svg_print = svg_print_pcsw_stats, - .hdr_line = "proc/s;cswch/s", + .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", +#endif .name = "A_PCSW", + .item_list_sz = 0, .g_nr = 2, -#endif - .nr = 1, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_PCSW_SIZE, .msize = STATS_PCSW_SIZE, .opt_flags = 0, @@ -140,8 +162,8 @@ struct activity pcsw_act = { /* Interrupts statistics */ struct activity irq_act = { .id = A_IRQ, - .options = AO_NULL, - .magic = ACTIVITY_MAGIC_BASE, + .options = AO_COUNTED, + .magic = ACTIVITY_MAGIC_BASE + 1, .group = G_INT, #ifdef SOURCE_SADC .f_count_index = 1, /* wrap_get_irq_nr() */ @@ -152,17 +174,30 @@ struct activity irq_act = { .f_print = print_irq_stats, .f_print_avg = print_irq_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "INTR;intr/s", +#endif + .gtypes_nr = {STATS_IRQ_ULL, STATS_IRQ_UL, STATS_IRQ_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_irq_stats, .f_xml_print = xml_print_irq_stats, .f_json_print = json_print_irq_stats, - .hdr_line = "INTR;intr/s", + .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", +#endif .name = "A_IRQ", + .item_list_sz = 0, .g_nr = 0, -#endif - .nr = -1, + .nr_ini = -1, .nr2 = 1, .nr_max = NR_IRQS + 1, + .nr = {-1, -1, -1}, + .nr_allocated = 0, .fsize = STATS_IRQ_SIZE, .msize = STATS_IRQ_SIZE, .opt_flags = 0, @@ -185,18 +220,30 @@ struct activity swap_act = { .f_print = print_swap_stats, .f_print_avg = print_swap_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "pswpin/s;pswpout/s", +#endif + .gtypes_nr = {STATS_SWAP_ULL, STATS_SWAP_UL, STATS_SWAP_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_swap_stats, .f_xml_print = xml_print_swap_stats, .f_json_print = json_print_swap_stats, .f_svg_print = svg_print_swap_stats, - .hdr_line = "pswpin/s;pswpout/s", + .f_raw_print = raw_print_swap_stats, + .f_pcp_print = pcp_print_swap_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "Swap activity", +#endif .name = "A_SWAP", + .item_list_sz = 0, .g_nr = 1, -#endif - .nr = 1, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_SWAP_SIZE, .msize = STATS_SWAP_SIZE, .opt_flags = 0, @@ -219,19 +266,31 @@ struct activity paging_act = { .f_print = print_paging_stats, .f_print_avg = print_paging_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "pgpgin/s;pgpgout/s;fault/s;majflt/s;" + "pgfree/s;pgscank/s;pgscand/s;pgsteal/s;%vmeff", +#endif + .gtypes_nr = {STATS_PAGING_ULL, STATS_PAGING_UL, STATS_PAGING_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_paging_stats, .f_xml_print = xml_print_paging_stats, .f_json_print = json_print_paging_stats, .f_svg_print = svg_print_paging_stats, - .hdr_line = "pgpgin/s;pgpgout/s;fault/s;majflt/s;" - "pgfree/s;pgscank/s;pgscand/s;pgsteal/s;%vmeff", + .f_raw_print = raw_print_paging_stats, + .f_pcp_print = pcp_print_paging_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "Paging activity", +#endif .name = "A_PAGE", + .item_list_sz = 0, .g_nr = 3, -#endif - .nr = 1, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_PAGING_SIZE, .msize = STATS_PAGING_SIZE, .opt_flags = 0, @@ -254,18 +313,30 @@ struct activity io_act = { .f_print = print_io_stats, .f_print_avg = print_io_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .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}, #ifdef SOURCE_SADF .f_render = render_io_stats, .f_xml_print = xml_print_io_stats, .f_json_print = json_print_io_stats, .f_svg_print = svg_print_io_stats, - .hdr_line = "tps;rtps;wtps;bread/s;bwrtn/s", + .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", +#endif .name = "A_IO", + .item_list_sz = 0, .g_nr = 2, -#endif - .nr = 1, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_IO_SIZE, .msize = STATS_IO_SIZE, .opt_flags = 0, @@ -277,7 +348,7 @@ struct activity io_act = { struct activity memory_act = { .id = A_MEMORY, .options = AO_COLLECTED + AO_MULTIPLE_OUTPUTS, - .magic = ACTIVITY_MAGIC_BASE, + .magic = ACTIVITY_MAGIC_BASE + 1, .group = G_DEFAULT, #ifdef SOURCE_SADC .f_count_index = -1, @@ -288,20 +359,31 @@ struct activity memory_act = { .f_print = print_memory_stats, .f_print_avg = print_avg_memory_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "kbmemfree;kbavail;kbmemused;%memused;kbbuffers;kbcached;kbcommit;%commit;kbactive;kbinact;kbdirty&kbanonpg;kbslab;kbkstack;kbpgtbl;kbvmused|" + "kbswpfree;kbswpused;%swpused;kbswpcad;%swpcad", +#endif + .gtypes_nr = {STATS_MEMORY_ULL, STATS_MEMORY_UL, STATS_MEMORY_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_memory_stats, .f_xml_print = xml_print_memory_stats, .f_json_print = json_print_memory_stats, .f_svg_print = svg_print_memory_stats, - .hdr_line = "frmpg/s;bufpg/s;campg/s|" - "kbmemfree;kbmemused;%memused;kbbuffers;kbcached;kbcommit;%commit;kbactive;kbinact;kbdirty&kbanonpg;kbslab;kbkstack;kbpgtbl;kbvmused|" - "kbswpfree;kbswpused;%swpused;kbswpcad;%swpcad", + .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", +#endif .name = "A_MEMORY", + .item_list_sz = 0, .g_nr = 9, -#endif - .nr = 1, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_MEMORY_SIZE, .msize = STATS_MEMORY_SIZE, .opt_flags = 0, @@ -313,7 +395,7 @@ struct activity memory_act = { struct activity ktables_act = { .id = A_KTABLES, .options = AO_COLLECTED, - .magic = ACTIVITY_MAGIC_BASE, + .magic = ACTIVITY_MAGIC_BASE + 1, .group = G_DEFAULT, #ifdef SOURCE_SADC .f_count_index = -1, @@ -324,18 +406,29 @@ struct activity ktables_act = { .f_print = print_ktables_stats, .f_print_avg = print_avg_ktables_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "dentunusd;file-nr;inode-nr;pty-nr", +#endif + .gtypes_nr = {STATS_KTABLES_ULL, STATS_KTABLES_UL, STATS_KTABLES_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_ktables_stats, .f_xml_print = xml_print_ktables_stats, .f_json_print = json_print_ktables_stats, .f_svg_print = svg_print_ktables_stats, - .hdr_line = "dentunusd;file-nr;inode-nr;pty-nr", + .f_raw_print = raw_print_ktables_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "Kernel tables statistics", +#endif .name = "A_KTABLES", + .item_list_sz = 0, .g_nr = 2, -#endif - .nr = 1, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_KTABLES_SIZE, .msize = STATS_KTABLES_SIZE, .opt_flags = 0, @@ -347,7 +440,7 @@ struct activity ktables_act = { struct activity queue_act = { .id = A_QUEUE, .options = AO_COLLECTED, - .magic = ACTIVITY_MAGIC_BASE + 1, + .magic = ACTIVITY_MAGIC_BASE + 2, .group = G_DEFAULT, #ifdef SOURCE_SADC .f_count_index = -1, @@ -358,18 +451,30 @@ struct activity queue_act = { .f_print = print_queue_stats, .f_print_avg = print_avg_queue_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "runq-sz;plist-sz;ldavg-1;ldavg-5;ldavg-15;blocked", +#endif + .gtypes_nr = {STATS_QUEUE_ULL, STATS_QUEUE_UL, STATS_QUEUE_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_queue_stats, .f_xml_print = xml_print_queue_stats, .f_json_print = json_print_queue_stats, .f_svg_print = svg_print_queue_stats, - .hdr_line = "runq-sz;plist-sz;ldavg-1;ldavg-5;ldavg-15;blocked", + .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", +#endif .name = "A_QUEUE", + .item_list_sz = 0, .g_nr = 3, -#endif - .nr = 1, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_QUEUE_SIZE, .msize = STATS_QUEUE_SIZE, .opt_flags = 0, @@ -380,8 +485,8 @@ struct activity queue_act = { /* Serial lines activity */ struct activity serial_act = { .id = A_SERIAL, - .options = AO_COLLECTED, - .magic = ACTIVITY_MAGIC_BASE, + .options = AO_COLLECTED + AO_COUNTED, + .magic = ACTIVITY_MAGIC_BASE + 1, .group = G_DEFAULT, #ifdef SOURCE_SADC .f_count_index = 2, /* wrap_get_serial_nr() */ @@ -392,17 +497,29 @@ struct activity serial_act = { .f_print = print_serial_stats, .f_print_avg = print_serial_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "TTY;rcvin/s;txmtin/s;framerr/s;prtyerr/s;brk/s;ovrun/s", +#endif + .gtypes_nr = {STATS_SERIAL_ULL, STATS_SERIAL_UL, STATS_SERIAL_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_serial_stats, .f_xml_print = xml_print_serial_stats, .f_json_print = json_print_serial_stats, - .hdr_line = "TTY;rcvin/s;txmtin/s;framerr/s;prtyerr/s;brk/s;ovrun/s", + .f_svg_print = NULL, + .f_raw_print = raw_print_serial_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "TTY devices statistics", +#endif .name = "A_SERIAL", + .item_list_sz = 0, .g_nr = 0, -#endif - .nr = -1, + .nr_ini = -1, .nr2 = 1, .nr_max = MAX_NR_SERIAL_LINES, + .nr = {-1, -1, -1}, + .nr_allocated = 0, .fsize = STATS_SERIAL_SIZE, .msize = STATS_SERIAL_SIZE, .opt_flags = 0, @@ -413,8 +530,8 @@ struct activity serial_act = { /* Block devices activity */ struct activity disk_act = { .id = A_DISK, - .options = AO_NULL, - .magic = ACTIVITY_MAGIC_BASE + 1, + .options = AO_COUNTED + AO_GRAPH_PER_ITEM, + .magic = ACTIVITY_MAGIC_BASE + 2, .group = G_DISK, #ifdef SOURCE_SADC .f_count_index = 3, /* wrap_get_disk_nr() */ @@ -425,17 +542,29 @@ struct activity disk_act = { .f_print = print_disk_stats, .f_print_avg = print_disk_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "DEV;tps;rkB/s;wkB/s;dkB/s;areq-sz;aqu-sz;await;%util", +#endif + .gtypes_nr = {STATS_DISK_ULL, STATS_DISK_UL, STATS_DISK_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_disk_stats, .f_xml_print = xml_print_disk_stats, .f_json_print = json_print_disk_stats, - .hdr_line = "DEV;tps;rd_sec/s;wr_sec/s;avgrq-sz;avgqu-sz;await;svctm;%util", - .name = "A_DISK", - .g_nr = 0, + .f_svg_print = svg_print_disk_stats, + .f_raw_print = raw_print_disk_stats, + .f_count_new = count_new_disk, + .item_list = NULL, + .desc = "Block devices statistics", #endif - .nr = -1, + .name = "A_DISK", + .item_list_sz = 0, + .g_nr = 5, + .nr_ini = -1, .nr2 = 1, .nr_max = MAX_NR_DISKS, + .nr = {-1, -1, -1}, + .nr_allocated = 0, .fsize = STATS_DISK_SIZE, .msize = STATS_DISK_SIZE, .opt_flags = 0, @@ -446,8 +575,8 @@ struct activity disk_act = { /* Network interfaces activity */ struct activity net_dev_act = { .id = A_NET_DEV, - .options = AO_COLLECTED | AO_GRAPH_PER_ITEM, - .magic = ACTIVITY_MAGIC_BASE + 2, + .options = AO_COLLECTED + AO_COUNTED + AO_GRAPH_PER_ITEM, + .magic = ACTIVITY_MAGIC_BASE + 3, .group = G_DEFAULT, #ifdef SOURCE_SADC .f_count_index = 4, /* wrap_get_iface_nr() */ @@ -458,18 +587,29 @@ struct activity net_dev_act = { .f_print = print_net_dev_stats, .f_print_avg = print_net_dev_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "IFACE;rxpck/s;txpck/s;rxkB/s;txkB/s;rxcmp/s;txcmp/s;rxmcst/s;%ifutil", +#endif + .gtypes_nr = {STATS_NET_DEV_ULL, STATS_NET_DEV_UL, STATS_NET_DEV_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_dev_stats, .f_xml_print = xml_print_net_dev_stats, .f_json_print = json_print_net_dev_stats, .f_svg_print = svg_print_net_dev_stats, - .hdr_line = "IFACE;rxpck/s;txpck/s;rxkB/s;txkB/s;rxcmp/s;txcmp/s;rxmcst/s;%ifutil", + .f_raw_print = raw_print_net_dev_stats, + .f_count_new = count_new_net_dev, + .item_list = NULL, + .desc = "Network interfaces statistics", +#endif .name = "A_NET_DEV", + .item_list_sz = 0, .g_nr = 4, -#endif - .nr = -1, + .nr_ini = -1, .nr2 = 1, .nr_max = MAX_NR_IFACES, + .nr = {-1, -1, -1}, + .nr_allocated = 0, .fsize = STATS_NET_DEV_SIZE, .msize = STATS_NET_DEV_SIZE, .opt_flags = 0, @@ -477,11 +617,11 @@ struct activity net_dev_act = { .bitmap = NULL }; -/* Network interfaces activity */ +/* Network interfaces (errors) activity */ struct activity net_edev_act = { .id = A_NET_EDEV, - .options = AO_COLLECTED, - .magic = ACTIVITY_MAGIC_BASE + 1, + .options = AO_COLLECTED + AO_COUNTED + AO_GRAPH_PER_ITEM, + .magic = ACTIVITY_MAGIC_BASE + 2, .group = G_DEFAULT, #ifdef SOURCE_SADC .f_count_index = 4, /* wrap_get_iface_nr() */ @@ -492,18 +632,30 @@ struct activity net_edev_act = { .f_print = print_net_edev_stats, .f_print_avg = print_net_edev_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "IFACE;rxerr/s;txerr/s;coll/s;rxdrop/s;txdrop/s;" + "txcarr/s;rxfram/s;rxfifo/s;txfifo/s", +#endif + .gtypes_nr = {STATS_NET_EDEV_ULL, STATS_NET_EDEV_UL, STATS_NET_EDEV_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_edev_stats, .f_xml_print = xml_print_net_edev_stats, .f_json_print = json_print_net_edev_stats, - .hdr_line = "IFACE;rxerr/s;txerr/s;coll/s;rxdrop/s;txdrop/s;" - "txcarr/s;rxfram/s;rxfifo/s;txfifo/s", - .name = "A_NET_EDEV", - .g_nr = 0, + .f_svg_print = svg_print_net_edev_stats, + .f_raw_print = raw_print_net_edev_stats, + .f_count_new = count_new_net_edev, + .item_list = NULL, + .desc = "Network interfaces errors statistics", #endif - .nr = -1, + .name = "A_NET_EDEV", + .item_list_sz = 0, + .g_nr = 4, + .nr_ini = -1, .nr2 = 1, .nr_max = MAX_NR_IFACES, + .nr = {-1, -1, -1}, + .nr_allocated = 0, .fsize = STATS_NET_EDEV_SIZE, .msize = STATS_NET_EDEV_SIZE, .opt_flags = 0, @@ -526,17 +678,29 @@ struct activity net_nfs_act = { .f_print = print_net_nfs_stats, .f_print_avg = print_net_nfs_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "call/s;retrans/s;read/s;write/s;access/s;getatt/s", +#endif + .gtypes_nr = {STATS_NET_NFS_ULL, STATS_NET_NFS_UL, STATS_NET_NFS_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_nfs_stats, .f_xml_print = xml_print_net_nfs_stats, .f_json_print = json_print_net_nfs_stats, - .hdr_line = "call/s;retrans/s;read/s;write/s;access/s;getatt/s", - .name = "A_NET_NFS", - .g_nr = 0, + .f_svg_print = svg_print_net_nfs_stats, + .f_raw_print = raw_print_net_nfs_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "NFS client statistics", #endif - .nr = 1, + .name = "A_NET_NFS", + .item_list_sz = 0, + .g_nr = 3, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_NET_NFS_SIZE, .msize = STATS_NET_NFS_SIZE, .opt_flags = 0, @@ -559,18 +723,30 @@ struct activity net_nfsd_act = { .f_print = print_net_nfsd_stats, .f_print_avg = print_net_nfsd_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "scall/s;badcall/s;packet/s;udp/s;tcp/s;hit/s;miss/s;" + "sread/s;swrite/s;saccess/s;sgetatt/s", +#endif + .gtypes_nr = {STATS_NET_NFSD_ULL, STATS_NET_NFSD_UL, STATS_NET_NFSD_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_nfsd_stats, .f_xml_print = xml_print_net_nfsd_stats, .f_json_print = json_print_net_nfsd_stats, - .hdr_line = "scall/s;badcall/s;packet/s;udp/s;tcp/s;hit/s;miss/s;" - "sread/s;swrite/s;saccess/s;sgetatt/s", - .name = "A_NET_NFSD", - .g_nr = 0, + .f_svg_print = svg_print_net_nfsd_stats, + .f_raw_print = raw_print_net_nfsd_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "NFS server statistics", #endif - .nr = 1, + .name = "A_NET_NFSD", + .item_list_sz = 0, + .g_nr = 5, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_NET_NFSD_SIZE, .msize = STATS_NET_NFSD_SIZE, .opt_flags = 0, @@ -593,18 +769,29 @@ struct activity net_sock_act = { .f_print = print_net_sock_stats, .f_print_avg = print_avg_net_sock_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "totsck;tcpsck;udpsck;rawsck;ip-frag;tcp-tw", +#endif + .gtypes_nr = {STATS_NET_SOCK_ULL, STATS_NET_SOCK_UL, STATS_NET_SOCK_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_sock_stats, .f_xml_print = xml_print_net_sock_stats, .f_json_print = json_print_net_sock_stats, .f_svg_print = svg_print_net_sock_stats, - .hdr_line = "totsck;tcpsck;udpsck;rawsck;ip-frag;tcp-tw", + .f_raw_print = raw_print_net_sock_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "IPv4 sockets statistics", +#endif .name = "A_NET_SOCK", + .item_list_sz = 0, .g_nr = 2, -#endif - .nr = 1, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_NET_SOCK_SIZE, .msize = STATS_NET_SOCK_SIZE, .opt_flags = 0, @@ -616,7 +803,7 @@ struct activity net_sock_act = { struct activity net_ip_act = { .id = A_NET_IP, .options = AO_NULL, - .magic = ACTIVITY_MAGIC_BASE + 1, + .magic = ACTIVITY_MAGIC_BASE + 2, .group = G_SNMP, #ifdef SOURCE_SADC .f_count_index = -1, @@ -627,17 +814,29 @@ struct activity net_ip_act = { .f_print = print_net_ip_stats, .f_print_avg = print_net_ip_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "irec/s;fwddgm/s;idel/s;orq/s;asmrq/s;asmok/s;fragok/s;fragcrt/s", +#endif + .gtypes_nr = {STATS_NET_IP_ULL, STATS_NET_IP_UL, STATS_NET_IP_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_ip_stats, .f_xml_print = xml_print_net_ip_stats, .f_json_print = json_print_net_ip_stats, - .hdr_line = "irec/s;fwddgm/s;idel/s;orq/s;asmrq/s;asmok/s;fragok/s;fragcrt/s", - .name = "A_NET_IP", - .g_nr = 0, + .f_svg_print = svg_print_net_ip_stats, + .f_raw_print = raw_print_net_ip_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "IPv4 traffic statistics", #endif - .nr = 1, + .name = "A_NET_IP", + .item_list_sz = 0, + .g_nr = 3, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_NET_IP_SIZE, .msize = STATS_NET_IP_SIZE, .opt_flags = 0, @@ -649,7 +848,7 @@ struct activity net_ip_act = { struct activity net_eip_act = { .id = A_NET_EIP, .options = AO_NULL, - .magic = ACTIVITY_MAGIC_BASE + 1, + .magic = ACTIVITY_MAGIC_BASE + 2, .group = G_SNMP, #ifdef SOURCE_SADC .f_count_index = -1, @@ -660,17 +859,29 @@ struct activity net_eip_act = { .f_print = print_net_eip_stats, .f_print_avg = print_net_eip_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "ihdrerr/s;iadrerr/s;iukwnpr/s;idisc/s;odisc/s;onort/s;asmf/s;fragf/s", +#endif + .gtypes_nr = {STATS_NET_EIP_ULL, STATS_NET_EIP_UL, STATS_NET_EIP_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_eip_stats, .f_xml_print = xml_print_net_eip_stats, .f_json_print = json_print_net_eip_stats, - .hdr_line = "ihdrerr/s;iadrerr/s;iukwnpr/s;idisc/s;odisc/s;onort/s;asmf/s;fragf/s", - .name = "A_NET_EIP", - .g_nr = 0, + .f_svg_print = svg_print_net_eip_stats, + .f_raw_print = raw_print_net_eip_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "IPv4 traffic errors statistics", #endif - .nr = 1, + .name = "A_NET_EIP", + .item_list_sz = 0, + .g_nr = 3, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_NET_EIP_SIZE, .msize = STATS_NET_EIP_SIZE, .opt_flags = 0, @@ -693,18 +904,30 @@ struct activity net_icmp_act = { .f_print = print_net_icmp_stats, .f_print_avg = print_net_icmp_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "imsg/s;omsg/s;iech/s;iechr/s;oech/s;oechr/s;itm/s;itmr/s;otm/s;" + "otmr/s;iadrmk/s;iadrmkr/s;oadrmk/s;oadrmkr/s", +#endif + .gtypes_nr = {STATS_NET_ICMP_ULL, STATS_NET_ICMP_UL, STATS_NET_ICMP_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_icmp_stats, .f_xml_print = xml_print_net_icmp_stats, .f_json_print = json_print_net_icmp_stats, - .hdr_line = "imsg/s;omsg/s;iech/s;iechr/s;oech/s;oechr/s;itm/s;itmr/s;otm/s;" - "otmr/s;iadrmk/s;iadrmkr/s;oadrmk/s;oadrmkr/s", - .name = "A_NET_ICMP", - .g_nr = 0, + .f_svg_print = svg_print_net_icmp_stats, + .f_raw_print = raw_print_net_icmp_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "ICMPv4 traffic statistics", #endif - .nr = 1, + .name = "A_NET_ICMP", + .item_list_sz = 0, + .g_nr = 4, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_NET_ICMP_SIZE, .msize = STATS_NET_ICMP_SIZE, .opt_flags = 0, @@ -727,18 +950,30 @@ struct activity net_eicmp_act = { .f_print = print_net_eicmp_stats, .f_print_avg = print_net_eicmp_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "ierr/s;oerr/s;idstunr/s;odstunr/s;itmex/s;otmex/s;" + "iparmpb/s;oparmpb/s;isrcq/s;osrcq/s;iredir/s;oredir/s", +#endif + .gtypes_nr = {STATS_NET_EICMP_ULL, STATS_NET_EICMP_UL, STATS_NET_EICMP_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_eicmp_stats, .f_xml_print = xml_print_net_eicmp_stats, .f_json_print = json_print_net_eicmp_stats, - .hdr_line = "ierr/s;oerr/s;idstunr/s;odstunr/s;itmex/s;otmex/s;" - "iparmpb/s;oparmpb/s;isrcq/s;osrcq/s;iredir/s;oredir/s", - .name = "A_NET_EICMP", - .g_nr = 0, + .f_svg_print = svg_print_net_eicmp_stats, + .f_raw_print = raw_print_net_eicmp_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "ICMPv4 traffic errors statistics", #endif - .nr = 1, + .name = "A_NET_EICMP", + .item_list_sz = 0, + .g_nr = 6, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_NET_EICMP_SIZE, .msize = STATS_NET_EICMP_SIZE, .opt_flags = 0, @@ -761,17 +996,29 @@ struct activity net_tcp_act = { .f_print = print_net_tcp_stats, .f_print_avg = print_net_tcp_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "active/s;passive/s;iseg/s;oseg/s", +#endif + .gtypes_nr = {STATS_NET_TCP_ULL, STATS_NET_TCP_UL, STATS_NET_TCP_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_tcp_stats, .f_xml_print = xml_print_net_tcp_stats, .f_json_print = json_print_net_tcp_stats, - .hdr_line = "active/s;passive/s;iseg/s;oseg/s", - .name = "A_NET_TCP", - .g_nr = 0, + .f_svg_print = svg_print_net_tcp_stats, + .f_raw_print = raw_print_net_tcp_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "TCPv4 traffic statistics", #endif - .nr = 1, + .name = "A_NET_TCP", + .item_list_sz = 0, + .g_nr = 2, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_NET_TCP_SIZE, .msize = STATS_NET_TCP_SIZE, .opt_flags = 0, @@ -794,17 +1041,29 @@ struct activity net_etcp_act = { .f_print = print_net_etcp_stats, .f_print_avg = print_net_etcp_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "atmptf/s;estres/s;retrans/s;isegerr/s;orsts/s", +#endif + .gtypes_nr = {STATS_NET_ETCP_ULL, STATS_NET_ETCP_UL, STATS_NET_ETCP_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_etcp_stats, .f_xml_print = xml_print_net_etcp_stats, .f_json_print = json_print_net_etcp_stats, - .hdr_line = "atmptf/s;estres/s;retrans/s;isegerr/s;orsts/s", - .name = "A_NET_ETCP", - .g_nr = 0, + .f_svg_print = svg_print_net_etcp_stats, + .f_raw_print = raw_print_net_etcp_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "TCPv4 traffic errors statistics", #endif - .nr = 1, + .name = "A_NET_ETCP", + .item_list_sz = 0, + .g_nr = 2, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_NET_ETCP_SIZE, .msize = STATS_NET_ETCP_SIZE, .opt_flags = 0, @@ -827,17 +1086,29 @@ struct activity net_udp_act = { .f_print = print_net_udp_stats, .f_print_avg = print_net_udp_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "idgm/s;odgm/s;noport/s;idgmerr/s", +#endif + .gtypes_nr = {STATS_NET_UDP_ULL, STATS_NET_UDP_UL, STATS_NET_UDP_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_udp_stats, .f_xml_print = xml_print_net_udp_stats, .f_json_print = json_print_net_udp_stats, - .hdr_line = "idgm/s;odgm/s;noport/s;idgmerr/s", - .name = "A_NET_UDP", - .g_nr = 0, + .f_svg_print = svg_print_net_udp_stats, + .f_raw_print = raw_print_net_udp_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "UDPv4 traffic statistics", #endif - .nr = 1, + .name = "A_NET_UDP", + .item_list_sz = 0, + .g_nr = 2, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_NET_UDP_SIZE, .msize = STATS_NET_UDP_SIZE, .opt_flags = 0, @@ -860,18 +1131,29 @@ struct activity net_sock6_act = { .f_print = print_net_sock6_stats, .f_print_avg = print_avg_net_sock6_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "tcp6sck;udp6sck;raw6sck;ip6-frag", +#endif + .gtypes_nr = {STATS_NET_SOCK6_ULL, STATS_NET_SOCK6_UL, STATS_NET_SOCK6_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_sock6_stats, .f_xml_print = xml_print_net_sock6_stats, .f_json_print = json_print_net_sock6_stats, .f_svg_print = svg_print_net_sock6_stats, - .hdr_line = "tcp6sck;udp6sck;raw6sck;ip6-frag", + .f_raw_print = raw_print_net_sock6_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "IPv6 sockets statistics", +#endif .name = "A_NET_SOCK6", + .item_list_sz = 0, .g_nr = 1, -#endif - .nr = 1, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_NET_SOCK6_SIZE, .msize = STATS_NET_SOCK6_SIZE, .opt_flags = 0, @@ -883,7 +1165,7 @@ struct activity net_sock6_act = { struct activity net_ip6_act = { .id = A_NET_IP6, .options = AO_NULL, - .magic = ACTIVITY_MAGIC_BASE + 1, + .magic = ACTIVITY_MAGIC_BASE + 2, .group = G_IPV6, #ifdef SOURCE_SADC .f_count_index = -1, @@ -894,18 +1176,30 @@ struct activity net_ip6_act = { .f_print = print_net_ip6_stats, .f_print_avg = print_net_ip6_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "irec6/s;fwddgm6/s;idel6/s;orq6/s;asmrq6/s;asmok6/s;" + "imcpck6/s;omcpck6/s;fragok6/s;fragcr6/s", +#endif + .gtypes_nr = {STATS_NET_IP6_ULL, STATS_NET_IP6_UL, STATS_NET_IP6_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_ip6_stats, .f_xml_print = xml_print_net_ip6_stats, .f_json_print = json_print_net_ip6_stats, - .hdr_line = "irec6/s;fwddgm6/s;idel6/s;orq6/s;asmrq6/s;asmok6/s;" - "imcpck6/s;omcpck6/s;fragok6/s;fragcr6/s", - .name = "A_NET_IP6", - .g_nr = 0, + .f_svg_print = svg_print_net_ip6_stats, + .f_raw_print = raw_print_net_ip6_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "IPv6 traffic statistics", #endif - .nr = 1, + .name = "A_NET_IP6", + .item_list_sz = 0, + .g_nr = 4, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_NET_IP6_SIZE, .msize = STATS_NET_IP6_SIZE, .opt_flags = 0, @@ -917,7 +1211,7 @@ struct activity net_ip6_act = { struct activity net_eip6_act = { .id = A_NET_EIP6, .options = AO_NULL, - .magic = ACTIVITY_MAGIC_BASE + 1, + .magic = ACTIVITY_MAGIC_BASE + 2, .group = G_IPV6, #ifdef SOURCE_SADC .f_count_index = -1, @@ -928,18 +1222,30 @@ struct activity net_eip6_act = { .f_print = print_net_eip6_stats, .f_print_avg = print_net_eip6_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "ihdrer6/s;iadrer6/s;iukwnp6/s;i2big6/s;idisc6/s;odisc6/s;" + "inort6/s;onort6/s;asmf6/s;fragf6/s;itrpck6/s", +#endif + .gtypes_nr = {STATS_NET_EIP6_ULL, STATS_NET_EIP6_UL, STATS_NET_EIP6_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_eip6_stats, .f_xml_print = xml_print_net_eip6_stats, .f_json_print = json_print_net_eip6_stats, - .hdr_line = "ihdrer6/s;iadrer6/s;iukwnp6/s;i2big6/s;idisc6/s;odisc6/s;" - "inort6/s;onort6/s;asmf6/s;fragf6/s;itrpck6/s", - .name = "A_NET_EIP6", - .g_nr = 0, + .f_svg_print = svg_print_net_eip6_stats, + .f_raw_print = raw_print_net_eip6_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "IPv6 traffic errors statistics", #endif - .nr = 1, + .name = "A_NET_EIP6", + .item_list_sz = 0, + .g_nr = 4, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_NET_EIP6_SIZE, .msize = STATS_NET_EIP6_SIZE, .opt_flags = 0, @@ -962,19 +1268,31 @@ struct activity net_icmp6_act = { .f_print = print_net_icmp6_stats, .f_print_avg = print_net_icmp6_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "imsg6/s;omsg6/s;iech6/s;iechr6/s;oechr6/s;igmbq6/s;igmbr6/s;ogmbr6/s;" + "igmbrd6/s;ogmbrd6/s;irtsol6/s;ortsol6/s;irtad6/s;inbsol6/s;onbsol6/s;" + "inbad6/s;onbad6/s", +#endif + .gtypes_nr = {STATS_NET_ICMP6_ULL, STATS_NET_ICMP6_UL, STATS_NET_ICMP6_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_icmp6_stats, .f_xml_print = xml_print_net_icmp6_stats, .f_json_print = json_print_net_icmp6_stats, - .hdr_line = "imsg6/s;omsg6/s;iech6/s;iechr6/s;oechr6/s;igmbq6/s;igmbr6/s;ogmbr6/s;" - "igmbrd6/s;ogmbrd6/s;irtsol6/s;ortsol6/s;irtad6/s;inbsol6/s;onbsol6/s;" - "inbad6/s;onbad6/s", - .name = "A_NET_ICMP6", - .g_nr = 0, + .f_svg_print = svg_print_net_icmp6_stats, + .f_raw_print = raw_print_net_icmp6_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "ICMPv6 traffic statistics", #endif - .nr = 1, + .name = "A_NET_ICMP6", + .item_list_sz = 0, + .g_nr = 5, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_NET_ICMP6_SIZE, .msize = STATS_NET_ICMP6_SIZE, .opt_flags = 0, @@ -997,18 +1315,30 @@ struct activity net_eicmp6_act = { .f_print = print_net_eicmp6_stats, .f_print_avg = print_net_eicmp6_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "ierr6/s;idtunr6/s;odtunr6/s;itmex6/s;otmex6/s;" + "iprmpb6/s;oprmpb6/s;iredir6/s;oredir6/s;ipck2b6/s;opck2b6/s", +#endif + .gtypes_nr = {STATS_NET_EICMP6_ULL, STATS_NET_EICMP6_UL, STATS_NET_EICMP6_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_eicmp6_stats, .f_xml_print = xml_print_net_eicmp6_stats, .f_json_print = json_print_net_eicmp6_stats, - .hdr_line = "ierr6/s;idtunr6/s;odtunr6/s;itmex6/s;otmex6/s;" - "iprmpb6/s;oprmpb6/s;iredir6/s;oredir6/s;ipck2b6/s;opck2b6/s", - .name = "A_NET_EICMP6", - .g_nr = 0, + .f_svg_print = svg_print_net_eicmp6_stats, + .f_raw_print = raw_print_net_eicmp6_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "ICMPv6 traffic errors statistics", #endif - .nr = 1, + .name = "A_NET_EICMP6", + .item_list_sz = 0, + .g_nr = 6, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_NET_EICMP6_SIZE, .msize = STATS_NET_EICMP6_SIZE, .opt_flags = 0, @@ -1031,17 +1361,29 @@ struct activity net_udp6_act = { .f_print = print_net_udp6_stats, .f_print_avg = print_net_udp6_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "idgm6/s;odgm6/s;noport6/s;idgmer6/s", +#endif + .gtypes_nr = {STATS_NET_UDP6_ULL, STATS_NET_UDP6_UL, STATS_NET_UDP6_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_net_udp6_stats, .f_xml_print = xml_print_net_udp6_stats, .f_json_print = json_print_net_udp6_stats, - .hdr_line = "idgm6/s;odgm6/s;noport6/s;idgmer6/s", - .name = "A_NET_UDP6", - .g_nr = 0, + .f_svg_print = svg_print_net_udp6_stats, + .f_raw_print = raw_print_net_udp6_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "UDPv6 traffic statistics", #endif - .nr = 1, + .name = "A_NET_UDP6", + .item_list_sz = 0, + .g_nr = 2, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_NET_UDP6_SIZE, .msize = STATS_NET_UDP6_SIZE, .opt_flags = 0, @@ -1051,8 +1393,8 @@ struct activity net_udp6_act = { /* CPU frequency */ struct activity pwr_cpufreq_act = { - .id = A_PWR_CPUFREQ, - .options = AO_VOLATILE + AO_GRAPH_PER_ITEM, + .id = A_PWR_CPU, + .options = AO_COUNTED + AO_GRAPH_PER_ITEM, .magic = ACTIVITY_MAGIC_BASE, .group = G_POWER, #ifdef SOURCE_SADC @@ -1064,18 +1406,29 @@ struct activity pwr_cpufreq_act = { .f_print = print_pwr_cpufreq_stats, .f_print_avg = print_avg_pwr_cpufreq_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "CPU;MHz", +#endif + .gtypes_nr = {STATS_PWR_CPUFREQ_ULL, STATS_PWR_CPUFREQ_UL, STATS_PWR_CPUFREQ_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_pwr_cpufreq_stats, .f_xml_print = xml_print_pwr_cpufreq_stats, .f_json_print = json_print_pwr_cpufreq_stats, .f_svg_print = svg_print_pwr_cpufreq_stats, - .hdr_line = "CPU;MHz", - .name = "A_PWR_CPUFREQ", - .g_nr = 1, + .f_raw_print = raw_print_pwr_cpufreq_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "CPU clock frequency", #endif - .nr = -1, + .name = "A_PWR_CPU", + .item_list_sz = 0, + .g_nr = 1, + .nr_ini = -1, .nr2 = 1, .nr_max = NR_CPUS + 1, + .nr = {-1, -1, -1}, + .nr_allocated = 0, .fsize = STATS_PWR_CPUFREQ_SIZE, .msize = STATS_PWR_CPUFREQ_SIZE, .opt_flags = 0, @@ -1086,7 +1439,7 @@ struct activity pwr_cpufreq_act = { /* Fan */ struct activity pwr_fan_act = { .id = A_PWR_FAN, - .options = AO_GRAPH_PER_ITEM, + .options = AO_COUNTED + AO_GRAPH_PER_ITEM, .magic = ACTIVITY_MAGIC_BASE, .group = G_POWER, #ifdef SOURCE_SADC @@ -1098,18 +1451,29 @@ struct activity pwr_fan_act = { .f_print = print_pwr_fan_stats, .f_print_avg = print_avg_pwr_fan_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "FAN;DEVICE;rpm;drpm", +#endif + .gtypes_nr = {STATS_PWR_FAN_ULL, STATS_PWR_FAN_UL, STATS_PWR_FAN_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_pwr_fan_stats, .f_xml_print = xml_print_pwr_fan_stats, .f_json_print = json_print_pwr_fan_stats, .f_svg_print = svg_print_pwr_fan_stats, - .hdr_line = "FAN;DEVICE;rpm;drpm", + .f_raw_print = raw_print_pwr_fan_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "Fans speed", +#endif .name = "A_PWR_FAN", + .item_list_sz = 0, .g_nr = 1, -#endif - .nr = -1, + .nr_ini = -1, .nr2 = 1, .nr_max = MAX_NR_FANS, + .nr = {-1, -1, -1}, + .nr_allocated = 0, .fsize = STATS_PWR_FAN_SIZE, .msize = STATS_PWR_FAN_SIZE, .opt_flags = 0, @@ -1120,7 +1484,7 @@ struct activity pwr_fan_act = { /* Temperature */ struct activity pwr_temp_act = { .id = A_PWR_TEMP, - .options = AO_GRAPH_PER_ITEM, + .options = AO_COUNTED + AO_GRAPH_PER_ITEM, .magic = ACTIVITY_MAGIC_BASE, .group = G_POWER, #ifdef SOURCE_SADC @@ -1132,18 +1496,29 @@ struct activity pwr_temp_act = { .f_print = print_pwr_temp_stats, .f_print_avg = print_avg_pwr_temp_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "TEMP;DEVICE;degC;%temp", +#endif + .gtypes_nr = {STATS_PWR_TEMP_ULL, STATS_PWR_TEMP_UL, STATS_PWR_TEMP_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_pwr_temp_stats, .f_xml_print = xml_print_pwr_temp_stats, .f_json_print = json_print_pwr_temp_stats, .f_svg_print = svg_print_pwr_temp_stats, - .hdr_line = "TEMP;DEVICE;degC;%temp", + .f_raw_print = raw_print_pwr_temp_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "Devices temperature", +#endif .name = "A_PWR_TEMP", + .item_list_sz = 0, .g_nr = 2, -#endif - .nr = -1, + .nr_ini = -1, .nr2 = 1, .nr_max = MAX_NR_TEMP_SENSORS, + .nr = {-1, -1, -1}, + .nr_allocated = 0, .fsize = STATS_PWR_TEMP_SIZE, .msize = STATS_PWR_TEMP_SIZE, .opt_flags = 0, @@ -1154,7 +1529,7 @@ struct activity pwr_temp_act = { /* Voltage inputs */ struct activity pwr_in_act = { .id = A_PWR_IN, - .options = AO_NULL, + .options = AO_COUNTED + AO_GRAPH_PER_ITEM, .magic = ACTIVITY_MAGIC_BASE, .group = G_POWER, #ifdef SOURCE_SADC @@ -1166,17 +1541,29 @@ struct activity pwr_in_act = { .f_print = print_pwr_in_stats, .f_print_avg = print_avg_pwr_in_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "IN;DEVICE;inV;%in", +#endif + .gtypes_nr = {STATS_PWR_IN_ULL, STATS_PWR_IN_UL, STATS_PWR_IN_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_pwr_in_stats, .f_xml_print = xml_print_pwr_in_stats, .f_json_print = json_print_pwr_in_stats, - .hdr_line = "IN;DEVICE;inV;%in", - .name = "A_PWR_IN", - .g_nr = 0, + .f_svg_print = svg_print_pwr_in_stats, + .f_raw_print = raw_print_pwr_in_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "Voltage inputs statistics", #endif - .nr = -1, + .name = "A_PWR_IN", + .item_list_sz = 0, + .g_nr = 2, + .nr_ini = -1, .nr2 = 1, .nr_max = MAX_NR_IN_SENSORS, + .nr = {-1, -1, -1}, + .nr_allocated = 0, .fsize = STATS_PWR_IN_SIZE, .msize = STATS_PWR_IN_SIZE, .opt_flags = 0, @@ -1188,7 +1575,7 @@ struct activity pwr_in_act = { struct activity huge_act = { .id = A_HUGE, .options = AO_COLLECTED, - .magic = ACTIVITY_MAGIC_BASE, + .magic = ACTIVITY_MAGIC_BASE + 1, .group = G_DEFAULT, #ifdef SOURCE_SADC .f_count_index = -1, @@ -1199,18 +1586,29 @@ struct activity huge_act = { .f_print = print_huge_stats, .f_print_avg = print_avg_huge_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "kbhugfree;kbhugused;%hugused;kbhugrsvd;kbhugsurp", +#endif + .gtypes_nr = {STATS_HUGE_ULL, STATS_HUGE_UL, STATS_HUGE_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_huge_stats, .f_xml_print = xml_print_huge_stats, .f_json_print = json_print_huge_stats, .f_svg_print = svg_print_huge_stats, - .hdr_line = "kbhugfree;kbhugused;%hugused", + .f_raw_print = raw_print_huge_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "Huge pages utilization", +#endif .name = "A_HUGE", + .item_list_sz = 0, .g_nr = 2, -#endif - .nr = 1, + .nr_ini = 1, .nr2 = 1, .nr_max = 1, + .nr = {1, 1, 1}, + .nr_allocated = 0, .fsize = STATS_HUGE_SIZE, .msize = STATS_HUGE_SIZE, .opt_flags = 0, @@ -1220,30 +1618,42 @@ struct activity huge_act = { /* CPU weighted frequency */ struct activity pwr_wghfreq_act = { - .id = A_PWR_WGHFREQ, - .options = AO_VOLATILE, - .magic = ACTIVITY_MAGIC_BASE, + .id = A_PWR_FREQ, + .options = AO_COUNTED + AO_MATRIX, + .magic = ACTIVITY_MAGIC_BASE + 1, .group = G_POWER, #ifdef SOURCE_SADC .f_count_index = 0, /* wrap_get_cpu_nr() */ .f_count2 = wrap_get_freq_nr, - .f_read = wrap_read_time_in_state, + .f_read = wrap_read_cpu_wghfreq, #endif #ifdef SOURCE_SAR .f_print = print_pwr_wghfreq_stats, .f_print_avg = print_pwr_wghfreq_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "CPU;wghMHz", +#endif + .gtypes_nr = {STATS_PWR_WGHFREQ_ULL, STATS_PWR_WGHFREQ_UL, STATS_PWR_WGHFREQ_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_pwr_wghfreq_stats, .f_xml_print = xml_print_pwr_wghfreq_stats, .f_json_print = json_print_pwr_wghfreq_stats, - .hdr_line = "CPU;wghMHz", - .name = "A_PWR_WGHFREQ", + .f_svg_print = NULL, + .f_raw_print = raw_print_pwr_wghfreq_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "CPU weighted frequency", +#endif + .name = "A_PWR_FREQ", + .item_list_sz = 0, .g_nr = 0, -#endif - .nr = -1, + .nr_ini = -1, .nr2 = -1, .nr_max = NR_CPUS + 1, + .nr = {-1, -1, -1}, + .nr_allocated = 0, .fsize = STATS_PWR_WGHFREQ_SIZE, .msize = STATS_PWR_WGHFREQ_SIZE, .opt_flags = 0, @@ -1254,7 +1664,7 @@ struct activity pwr_wghfreq_act = { /* USB devices plugged into the system */ struct activity pwr_usb_act = { .id = A_PWR_USB, - .options = AO_CLOSE_MARKUP, + .options = AO_COUNTED + AO_CLOSE_MARKUP, .magic = ACTIVITY_MAGIC_BASE, .group = G_POWER, #ifdef SOURCE_SADC @@ -1266,17 +1676,29 @@ struct activity pwr_usb_act = { .f_print = print_pwr_usb_stats, .f_print_avg = print_avg_pwr_usb_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "manufact;product;BUS;idvendor;idprod;maxpower", +#endif + .gtypes_nr = {STATS_PWR_USB_ULL, STATS_PWR_USB_UL, STATS_PWR_USB_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_pwr_usb_stats, .f_xml_print = xml_print_pwr_usb_stats, .f_json_print = json_print_pwr_usb_stats, - .hdr_line = "manufact;product;BUS;idvendor;idprod;maxpower", + .f_svg_print = NULL, + .f_raw_print = raw_print_pwr_usb_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "USB devices", +#endif .name = "A_PWR_USB", + .item_list_sz = 0, .g_nr = 0, -#endif - .nr = -1, + .nr_ini = -1, .nr2 = 1, .nr_max = MAX_NR_USB, + .nr = {-1, -1, -1}, + .nr_allocated = 0, .fsize = STATS_PWR_USB_SIZE, .msize = STATS_PWR_USB_SIZE, .opt_flags = 0, @@ -1286,9 +1708,9 @@ struct activity pwr_usb_act = { /* Filesystem usage activity */ struct activity filesystem_act = { - .id = A_FILESYSTEM, - .options = AO_NULL, - .magic = ACTIVITY_MAGIC_BASE, + .id = A_FS, + .options = AO_COUNTED + AO_GRAPH_PER_ITEM + AO_MULTIPLE_OUTPUTS, + .magic = ACTIVITY_MAGIC_BASE + 1, .group = G_XDISK, #ifdef SOURCE_SADC .f_count_index = 9, /* wrap_get_filesystem_nr() */ @@ -1299,17 +1721,30 @@ struct activity filesystem_act = { .f_print = print_filesystem_stats, .f_print_avg = print_avg_filesystem_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "FILESYSTEM;MBfsfree;MBfsused;%fsused;%ufsused;Ifree;Iused;%Iused|" + "MOUNTPOINT;MBfsfree;MBfsused;%fsused;%ufsused;Ifree;Iused;%Iused", +#endif + .gtypes_nr = {STATS_FILESYSTEM_ULL, STATS_FILESYSTEM_UL, STATS_FILESYSTEM_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_filesystem_stats, .f_xml_print = xml_print_filesystem_stats, .f_json_print = json_print_filesystem_stats, - .hdr_line = "FILESYSTEM;MBfsfree;MBfsused;%fsused;%ufsused;Ifree;Iused;%Iused", - .name = "A_FILESYSTEM", - .g_nr = 0, -#endif - .nr = -1, + .f_svg_print = svg_print_filesystem_stats, + .f_raw_print = raw_print_filesystem_stats, + .f_count_new = count_new_filesystem, + .item_list = NULL, + .desc = "Filesystems statistics", +#endif + .name = "A_FS", + .item_list_sz = 0, + .g_nr = 4, + .nr_ini = -1, .nr2 = 1, .nr_max = MAX_NR_FS, + .nr = {-1, -1, -1}, + .nr_allocated = 0, .fsize = STATS_FILESYSTEM_SIZE, .msize = STATS_FILESYSTEM_SIZE, .opt_flags = 0, @@ -1320,7 +1755,7 @@ struct activity filesystem_act = { /* Fibre Channel HBA usage activity */ struct activity fchost_act = { .id = A_NET_FC, - .options = AO_CLOSE_MARKUP, + .options = AO_COUNTED + AO_GRAPH_PER_ITEM, .magic = ACTIVITY_MAGIC_BASE, .group = G_DISK, #ifdef SOURCE_SADC @@ -1332,17 +1767,29 @@ struct activity fchost_act = { .f_print = print_fchost_stats, .f_print_avg = print_fchost_stats, #endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "FCHOST;fch_rxf/s;fch_txf/s;fch_rxw/s;fch_txw/s", +#endif + .gtypes_nr = {STATS_FCHOST_ULL, STATS_FCHOST_UL, STATS_FCHOST_U}, + .ftypes_nr = {0, 0, 0}, #ifdef SOURCE_SADF .f_render = render_fchost_stats, .f_xml_print = xml_print_fchost_stats, .f_json_print = json_print_fchost_stats, - .hdr_line = "FCHOST;fch_rxf/s;fch_txf/s;fch_rxw/s;fch_txw/s", - .name = "A_FCHOST", - .g_nr = 0, -#endif - .nr = -1, + .f_svg_print = svg_print_fchost_stats, + .f_raw_print = raw_print_fchost_stats, + .f_count_new = count_new_fchost, + .item_list = NULL, + .desc = "Fibre Channel HBA statistics", +#endif + .name = "A_NET_FC", + .item_list_sz = 0, + .g_nr = 2, + .nr_ini = -1, .nr2 = 1, .nr_max = MAX_NR_FCHOSTS, + .nr = {-1, -1, -1}, + .nr_allocated = 0, .fsize = STATS_FCHOST_SIZE, .msize = STATS_FCHOST_SIZE, .opt_flags = 0, @@ -1350,6 +1797,52 @@ struct activity fchost_act = { .bitmap = NULL }; +/* Softnet activity */ +struct activity softnet_act = { + .id = A_NET_SOFT, + .options = AO_COLLECTED + AO_COUNTED + AO_CLOSE_MARKUP + + AO_GRAPH_PER_ITEM + AO_PERSISTENT, + .magic = ACTIVITY_MAGIC_BASE, + .group = G_DEFAULT, +#ifdef SOURCE_SADC + .f_count_index = 0, /* wrap_get_cpu_nr() */ + .f_count2 = NULL, + .f_read = wrap_read_softnet, +#endif +#ifdef SOURCE_SAR + .f_print = print_softnet_stats, + .f_print_avg = print_softnet_stats, +#endif +#if defined(SOURCE_SAR) || defined(SOURCE_SADF) + .hdr_line = "CPU;total/s;dropd/s;squeezd/s;rx_rps/s;flw_lim/s", +#endif + .gtypes_nr = {STATS_SOFTNET_ULL, STATS_SOFTNET_UL, STATS_SOFTNET_U}, + .ftypes_nr = {0, 0, 0}, +#ifdef SOURCE_SADF + .f_render = render_softnet_stats, + .f_xml_print = xml_print_softnet_stats, + .f_json_print = json_print_softnet_stats, + .f_svg_print = svg_print_softnet_stats, + .f_raw_print = raw_print_softnet_stats, + .f_count_new = NULL, + .item_list = NULL, + .desc = "Software-based network processing statistics", +#endif + .name = "A_NET_SOFT", + .item_list_sz = 0, + .g_nr = 2, + .nr_ini = -1, + .nr2 = 1, + .nr_max = NR_CPUS + 1, + .nr = {-1, -1, -1}, + .nr_allocated = 0, + .fsize = STATS_SOFTNET_SIZE, + .msize = STATS_SOFTNET_SIZE, + .opt_flags = 0, + .buf = {NULL, NULL, NULL}, + .bitmap = &cpu_bitmap +}; + #ifdef SOURCE_SADC /* * Array of functions used to count number of items. @@ -1405,7 +1898,8 @@ struct activity *act[NR_ACT] = { &net_icmp6_act, &net_eicmp6_act, &net_udp6_act, - &fchost_act, /* AO_CLOSE_MARKUP */ + &fchost_act, + &softnet_act, /* AO_CLOSE_MARKUP */ /* */ /* */ &pwr_cpufreq_act,