/*
* activity.c: Define system activities available for sar/sadc.
- * (C) 1999-201
5 by Sebastien GODARD (sysstat <at> orange.fr)
+ * (C) 1999-201
6 by Sebastien GODARD (sysstat <at> orange.fr)
*
***************************************************************************
* This program is free software; you can redistribute it and/or modify it *
* *
* You should have received a copy of the GNU General Public License along *
* with this program; if not, write to the Free Software Foundation, Inc., *
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA *
***************************************************************************
*/
#include "rndr_stats.h"
#include "xml_stats.h"
#include "json_stats.h"
+#include "svg_stats.h"
#endif
/*
*/
struct activity cpu_act = {
.id = A_CPU,
- .options = AO_COLLECTED + AO_VOLATILE + AO_GLOBAL_ITV + AO_MULTIPLE_OUTPUTS,
+ .options = AO_COLLECTED + AO_VOLATILE + AO_GLOBAL_ITV + AO_MULTIPLE_OUTPUTS +
+ AO_GRAPH_PER_ITEM,
.magic = ACTIVITY_MAGIC_BASE,
.group = G_DEFAULT,
#ifdef SOURCE_SADC
.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
#ifdef SOURCE_SADF
.f_render = render_cpu_stats,
.f_xml_print = xml_print_cpu_stats,
.f_json_print = json_print_cpu_stats,
- .hdr_line = "CPU;%user;%nice;%system;%iowait;%steal;%idle|"
- "CPU;%usr;%nice;%sys;%iowait;%steal;%irq;%soft;%guest;%gnice;%idle",
+ .f_svg_print = svg_print_cpu_stats,
.name = "A_CPU",
+ .g_nr = 1,
#endif
.nr = -1,
.nr2 = 1,
+ .nr_max = NR_CPUS + 1,
.fsize = STATS_CPU_SIZE,
.msize = STATS_CPU_SIZE,
.opt_flags = AO_F_CPU_DEF,
.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
#ifdef SOURCE_SADF
.f_render = render_pcsw_stats,
.f_xml_print = xml_print_pcsw_stats,
.f_json_print = json_print_pcsw_stats,
- .hdr_line = "proc/s;cswch/s",
+ .f_svg_print = svg_print_pcsw_stats,
.name = "A_PCSW",
+ .g_nr = 2,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_PCSW_SIZE,
.msize = STATS_PCSW_SIZE,
.opt_flags = 0,
.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
#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",
.name = "A_IRQ",
+ .g_nr = 0,
#endif
.nr = -1,
.nr2 = 1,
+ .nr_max = NR_IRQS + 1,
.fsize = STATS_IRQ_SIZE,
.msize = STATS_IRQ_SIZE,
.opt_flags = 0,
.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
#ifdef SOURCE_SADF
.f_render = render_swap_stats,
.f_xml_print = xml_print_swap_stats,
.f_json_print = json_print_swap_stats,
- .hdr_line = "pswpin/s;pswpout/s",
+ .f_svg_print = svg_print_swap_stats,
.name = "A_SWAP",
+ .g_nr = 1,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_SWAP_SIZE,
.msize = STATS_SWAP_SIZE,
.opt_flags = 0,
.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
#ifdef SOURCE_SADF
.f_render = render_paging_stats,
.f_xml_print = xml_print_paging_stats,
.f_json_print = json_print_paging_stats,
- .hdr_line = "pgpgin/s;pgpgout/s;fault/s;majflt/s;"
- "pgfree/s;pgscank/s;pgscand/s;pgsteal/s;%vmeff",
+ .f_svg_print = svg_print_paging_stats,
.name = "A_PAGE",
+ .g_nr = 3,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_PAGING_SIZE,
.msize = STATS_PAGING_SIZE,
.opt_flags = 0,
.f_print = print_io_stats,
.f_print_avg = print_io_stats,
#endif
+#if defined(SOURCE_SAR) || defined(SOURCE_SADF)
+ .hdr_line = "tps;rtps;wtps;bread/s;bwrtn/s",
+#endif
#ifdef SOURCE_SADF
.f_render = render_io_stats,
.f_xml_print = xml_print_io_stats,
.f_json_print = json_print_io_stats,
- .hdr_line = "tps;rtps;wtps;bread/s;bwrtn/s",
+ .f_svg_print = svg_print_io_stats,
.name = "A_IO",
+ .g_nr = 2,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_IO_SIZE,
.msize = STATS_IO_SIZE,
.opt_flags = 0,
.f_print = print_memory_stats,
.f_print_avg = print_avg_memory_stats,
#endif
+#if defined(SOURCE_SAR) || defined(SOURCE_SADF)
+ .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",
+#endif
#ifdef SOURCE_SADF
.f_render = render_memory_stats,
.f_xml_print = xml_print_memory_stats,
.f_json_print = json_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_svg_print = svg_print_memory_stats,
.name = "A_MEMORY",
+ .g_nr = 9,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_MEMORY_SIZE,
.msize = STATS_MEMORY_SIZE,
.opt_flags = 0,
.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
#ifdef SOURCE_SADF
.f_render = render_ktables_stats,
.f_xml_print = xml_print_ktables_stats,
.f_json_print = json_print_ktables_stats,
- .hdr_line = "dentunusd;file-nr;inode-nr;pty-nr",
+ .f_svg_print = svg_print_ktables_stats,
.name = "A_KTABLES",
+ .g_nr = 2,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_KTABLES_SIZE,
.msize = STATS_KTABLES_SIZE,
.opt_flags = 0,
.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
#ifdef SOURCE_SADF
.f_render = render_queue_stats,
.f_xml_print = xml_print_queue_stats,
.f_json_print = json_print_queue_stats,
- .hdr_line = "runq-sz;plist-sz;ldavg-1;ldavg-5;ldavg-15;blocked",
+ .f_svg_print = svg_print_queue_stats,
.name = "A_QUEUE",
+ .g_nr = 3,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_QUEUE_SIZE,
.msize = STATS_QUEUE_SIZE,
.opt_flags = 0,
.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
#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",
.name = "A_SERIAL",
+ .g_nr = 0,
#endif
.nr = -1,
.nr2 = 1,
+ .nr_max = MAX_NR_SERIAL_LINES,
.fsize = STATS_SERIAL_SIZE,
.msize = STATS_SERIAL_SIZE,
.opt_flags = 0,
/* Block devices activity */
struct activity disk_act = {
.id = A_DISK,
- .options = AO_NULL,
+ .options = AO_GRAPH_PER_ITEM,
.magic = ACTIVITY_MAGIC_BASE + 1,
.group = G_DISK,
#ifdef SOURCE_SADC
.f_print = print_disk_stats,
.f_print_avg = print_disk_stats,
#endif
+#if defined(SOURCE_SAR) || defined(SOURCE_SADF)
+ .hdr_line = "DEV;tps;rd_sec/s;wr_sec/s;avgrq-sz;avgqu-sz;await;svctm;%util",
+#endif
#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",
+ .f_svg_print = svg_print_disk_stats,
.name = "A_DISK",
+ .g_nr = 5,
#endif
.nr = -1,
.nr2 = 1,
+ .nr_max = MAX_NR_DISKS,
.fsize = STATS_DISK_SIZE,
.msize = STATS_DISK_SIZE,
.opt_flags = 0,
/* Network interfaces activity */
struct activity net_dev_act = {
.id = A_NET_DEV,
- .options = AO_COLLECTED,
+ .options = AO_COLLECTED + AO_GRAPH_PER_ITEM,
.magic = ACTIVITY_MAGIC_BASE + 2,
.group = G_DEFAULT,
#ifdef SOURCE_SADC
.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
#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,
- .hdr_line = "IFACE;rxpck/s;txpck/s;rxkB/s;txkB/s;rxcmp/s;txcmp/s;rxmcst/s;%ifutil",
+ .f_svg_print = svg_print_net_dev_stats,
.name = "A_NET_DEV",
+ .g_nr = 4,
#endif
.nr = -1,
.nr2 = 1,
+ .nr_max = MAX_NR_IFACES,
.fsize = STATS_NET_DEV_SIZE,
.msize = STATS_NET_DEV_SIZE,
.opt_flags = 0,
.bitmap = NULL
};
-/* Network interfaces activity */
+/* Network interfaces (errors) activity */
struct activity net_edev_act = {
.id = A_NET_EDEV,
- .options = AO_COLLECTED,
+ .options = AO_COLLECTED + AO_GRAPH_PER_ITEM,
.magic = ACTIVITY_MAGIC_BASE + 1,
.group = G_DEFAULT,
#ifdef SOURCE_SADC
.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
#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",
+ .f_svg_print = svg_print_net_edev_stats,
.name = "A_NET_EDEV",
+ .g_nr = 4,
#endif
.nr = -1,
.nr2 = 1,
+ .nr_max = MAX_NR_IFACES,
.fsize = STATS_NET_EDEV_SIZE,
.msize = STATS_NET_EDEV_SIZE,
.opt_flags = 0,
.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
#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",
+ .f_svg_print = svg_print_net_nfs_stats,
.name = "A_NET_NFS",
+ .g_nr = 3,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_NET_NFS_SIZE,
.msize = STATS_NET_NFS_SIZE,
.opt_flags = 0,
.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
#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",
+ .f_svg_print = svg_print_net_nfsd_stats,
.name = "A_NET_NFSD",
+ .g_nr = 5,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_NET_NFSD_SIZE,
.msize = STATS_NET_NFSD_SIZE,
.opt_flags = 0,
.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
#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,
- .hdr_line = "totsck;tcpsck;udpsck;rawsck;ip-frag;tcp-tw",
+ .f_svg_print = svg_print_net_sock_stats,
.name = "A_NET_SOCK",
+ .g_nr = 2,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_NET_SOCK_SIZE,
.msize = STATS_NET_SOCK_SIZE,
.opt_flags = 0,
.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
#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",
+ .f_svg_print = svg_print_net_ip_stats,
.name = "A_NET_IP",
+ .g_nr = 3,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_NET_IP_SIZE,
.msize = STATS_NET_IP_SIZE,
.opt_flags = 0,
.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
#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",
+ .f_svg_print = svg_print_net_eip_stats,
.name = "A_NET_EIP",
+ .g_nr = 3,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_NET_EIP_SIZE,
.msize = STATS_NET_EIP_SIZE,
.opt_flags = 0,
.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
#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",
+ .f_svg_print = svg_print_net_icmp_stats,
.name = "A_NET_ICMP",
+ .g_nr = 4,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_NET_ICMP_SIZE,
.msize = STATS_NET_ICMP_SIZE,
.opt_flags = 0,
.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
#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",
+ .f_svg_print = svg_print_net_eicmp_stats,
.name = "A_NET_EICMP",
+ .g_nr = 6,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_NET_EICMP_SIZE,
.msize = STATS_NET_EICMP_SIZE,
.opt_flags = 0,
.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
#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",
+ .f_svg_print = svg_print_net_tcp_stats,
.name = "A_NET_TCP",
+ .g_nr = 2,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_NET_TCP_SIZE,
.msize = STATS_NET_TCP_SIZE,
.opt_flags = 0,
.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
#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",
+ .f_svg_print = svg_print_net_etcp_stats,
.name = "A_NET_ETCP",
+ .g_nr = 2,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_NET_ETCP_SIZE,
.msize = STATS_NET_ETCP_SIZE,
.opt_flags = 0,
.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
#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",
+ .f_svg_print = svg_print_net_udp_stats,
.name = "A_NET_UDP",
+ .g_nr = 2,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_NET_UDP_SIZE,
.msize = STATS_NET_UDP_SIZE,
.opt_flags = 0,
.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
#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,
- .hdr_line = "tcp6sck;udp6sck;raw6sck;ip6-frag",
+ .f_svg_print = svg_print_net_sock6_stats,
.name = "A_NET_SOCK6",
+ .g_nr = 1,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_NET_SOCK6_SIZE,
.msize = STATS_NET_SOCK6_SIZE,
.opt_flags = 0,
.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
#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",
+ .f_svg_print = svg_print_net_ip6_stats,
.name = "A_NET_IP6",
+ .g_nr = 4,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_NET_IP6_SIZE,
.msize = STATS_NET_IP6_SIZE,
.opt_flags = 0,
.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
#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",
+ .f_svg_print = svg_print_net_eip6_stats,
.name = "A_NET_EIP6",
+ .g_nr = 4,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_NET_EIP6_SIZE,
.msize = STATS_NET_EIP6_SIZE,
.opt_flags = 0,
.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
#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",
+ .f_svg_print = svg_print_net_icmp6_stats,
.name = "A_NET_ICMP6",
+ .g_nr = 5,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_NET_ICMP6_SIZE,
.msize = STATS_NET_ICMP6_SIZE,
.opt_flags = 0,
.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
#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",
+ .f_svg_print = svg_print_net_eicmp6_stats,
.name = "A_NET_EICMP6",
+ .g_nr = 6,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_NET_EICMP6_SIZE,
.msize = STATS_NET_EICMP6_SIZE,
.opt_flags = 0,
/* UDPv6 network traffic activity */
struct activity net_udp6_act = {
.id = A_NET_UDP6,
- .options = AO_CLOSE_MARKUP,
+ .options = AO_NULL,
.magic = ACTIVITY_MAGIC_BASE,
.group = G_IPV6,
#ifdef SOURCE_SADC
.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
#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",
+ .f_svg_print = svg_print_net_udp6_stats,
.name = "A_NET_UDP6",
+ .g_nr = 2,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_NET_UDP6_SIZE,
.msize = STATS_NET_UDP6_SIZE,
.opt_flags = 0,
/* CPU frequency */
struct activity pwr_cpufreq_act = {
.id = A_PWR_CPUFREQ,
- .options = AO_VOLATILE,
+ .options = AO_VOLATILE + AO_GRAPH_PER_ITEM,
.magic = ACTIVITY_MAGIC_BASE,
.group = G_POWER,
#ifdef SOURCE_SADC
.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
#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,
- .hdr_line = "CPU;MHz",
+ .f_svg_print = svg_print_pwr_cpufreq_stats,
.name = "A_PWR_CPUFREQ",
+ .g_nr = 1,
#endif
.nr = -1,
.nr2 = 1,
+ .nr_max = NR_CPUS + 1,
.fsize = STATS_PWR_CPUFREQ_SIZE,
.msize = STATS_PWR_CPUFREQ_SIZE,
.opt_flags = 0,
/* Fan */
struct activity pwr_fan_act = {
.id = A_PWR_FAN,
- .options = AO_NULL,
+ .options = AO_GRAPH_PER_ITEM,
.magic = ACTIVITY_MAGIC_BASE,
.group = G_POWER,
#ifdef SOURCE_SADC
.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
#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,
- .hdr_line = "FAN;DEVICE;rpm;drpm",
+ .f_svg_print = svg_print_pwr_fan_stats,
.name = "A_PWR_FAN",
+ .g_nr = 1,
#endif
.nr = -1,
.nr2 = 1,
+ .nr_max = MAX_NR_FANS,
.fsize = STATS_PWR_FAN_SIZE,
.msize = STATS_PWR_FAN_SIZE,
.opt_flags = 0,
/* Temperature */
struct activity pwr_temp_act = {
.id = A_PWR_TEMP,
- .options = AO_NULL,
+ .options = AO_GRAPH_PER_ITEM,
.magic = ACTIVITY_MAGIC_BASE,
.group = G_POWER,
#ifdef SOURCE_SADC
.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
#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,
- .hdr_line = "TEMP;DEVICE;degC;%temp",
+ .f_svg_print = svg_print_pwr_temp_stats,
.name = "A_PWR_TEMP",
+ .g_nr = 2,
#endif
.nr = -1,
.nr2 = 1,
+ .nr_max = MAX_NR_TEMP_SENSORS,
.fsize = STATS_PWR_TEMP_SIZE,
.msize = STATS_PWR_TEMP_SIZE,
.opt_flags = 0,
/* Voltage inputs */
struct activity pwr_in_act = {
.id = A_PWR_IN,
- .options = AO_NULL,
+ .options = AO_GRAPH_PER_ITEM,
.magic = ACTIVITY_MAGIC_BASE,
.group = G_POWER,
#ifdef SOURCE_SADC
.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
#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",
+ .f_svg_print = svg_print_pwr_in_stats,
.name = "A_PWR_IN",
+ .g_nr = 2,
#endif
.nr = -1,
.nr2 = 1,
+ .nr_max = MAX_NR_IN_SENSORS,
.fsize = STATS_PWR_IN_SIZE,
.msize = STATS_PWR_IN_SIZE,
.opt_flags = 0,
.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",
+#endif
#ifdef SOURCE_SADF
.f_render = render_huge_stats,
.f_xml_print = xml_print_huge_stats,
.f_json_print = json_print_huge_stats,
- .hdr_line = "kbhugfree;kbhugused;%hugused",
+ .f_svg_print = svg_print_huge_stats,
.name = "A_HUGE",
+ .g_nr = 2,
#endif
.nr = 1,
.nr2 = 1,
+ .nr_max = 1,
.fsize = STATS_HUGE_SIZE,
.msize = STATS_HUGE_SIZE,
.opt_flags = 0,
.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
#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",
+ .g_nr = 0,
#endif
.nr = -1,
- .nr2 = 1,
+ .nr2 = -1,
+ .nr_max = NR_CPUS + 1,
.fsize = STATS_PWR_WGHFREQ_SIZE,
.msize = STATS_PWR_WGHFREQ_SIZE,
.opt_flags = 0,
.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
#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",
.name = "A_PWR_USB",
+ .g_nr = 0,
#endif
.nr = -1,
.nr2 = 1,
+ .nr_max = MAX_NR_USB,
.fsize = STATS_PWR_USB_SIZE,
.msize = STATS_PWR_USB_SIZE,
.opt_flags = 0,
/* Filesystem usage activity */
struct activity filesystem_act = {
.id = A_FILESYSTEM,
- .options = AO_NULL,
+ .options = AO_GRAPH_PER_ITEM + AO_MULTIPLE_OUTPUTS,
.magic = ACTIVITY_MAGIC_BASE,
.group = G_XDISK,
#ifdef SOURCE_SADC
.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
#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",
+ .f_svg_print = svg_print_filesystem_stats,
.name = "A_FILESYSTEM",
+ .g_nr = 4,
#endif
.nr = -1,
.nr2 = 1,
+ .nr_max = MAX_NR_FS,
.fsize = STATS_FILESYSTEM_SIZE,
.msize = STATS_FILESYSTEM_SIZE,
.opt_flags = 0,
};
/* Fibre Channel HBA usage activity */
-struct activity fc_act = {
- .id = A_FC,
- .options = AO_NULL,
+struct activity fchost_act = {
+ .id = A_NET_FC,
+ .options = AO_GRAPH_PER_ITEM,
.magic = ACTIVITY_MAGIC_BASE,
.group = G_DISK,
#ifdef SOURCE_SADC
- .f_count_index = 10, /* wrap_get_hba_nr() */
+ .f_count_index = 10, /* wrap_get_fchost_nr() */
.f_count2 = NULL,
- .f_read = wrap_read_hba,
+ .f_read = wrap_read_fchost,
#endif
#ifdef SOURCE_SAR
- .f_print = print_fc_stats,
- .f_print_avg = print_avg_hba_stats,
+ .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
#ifdef SOURCE_SADF
- .f_render = render_hba_stats,
- .f_xml_print = xml_print_fc_stats,
- .f_json_print = json_print_fc_stats,
- .hdr_line = "FCHBA;hba_rxf/s;hba_txf/s;hba_rxw/s;hba_txw/s",
- .name = "A_FC",
+ .f_render = render_fchost_stats,
+ .f_xml_print = xml_print_fchost_stats,
+ .f_json_print = json_print_fchost_stats,
+ .f_svg_print = svg_print_fchost_stats,
+ .name = "A_FCHOST",
+ .g_nr = 2,
#endif
.nr = -1,
.nr2 = 1,
- .fsize = STATS_FC_SIZE,
- .msize = STATS_FC_SIZE,
+ .nr_max = MAX_NR_FCHOSTS,
+ .fsize = STATS_FCHOST_SIZE,
+ .msize = STATS_FCHOST_SIZE,
.opt_flags = 0,
.buf = {NULL, NULL, NULL},
.bitmap = NULL
};
+/* Softnet activity */
+struct activity softnet_act = {
+ .id = A_NET_SOFT,
+ .options = AO_COLLECTED + AO_CLOSE_MARKUP + AO_GRAPH_PER_ITEM,
+ .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
+#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,
+ .name = "A_NET_SOFT",
+ .g_nr = 2,
+#endif
+ .nr = -1,
+ .nr2 = 1,
+ .nr_max = NR_CPUS + 1,
+ .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.
wrap_get_in_nr,
wrap_get_usb_nr,
wrap_get_filesystem_nr,
- wrap_get_hba_nr
+ wrap_get_fchost_nr
};
#endif
&net_eip6_act,
&net_icmp6_act,
&net_eicmp6_act,
- &net_udp6_act, /* AO_CLOSE_MARKUP */
+ &net_udp6_act,
+ &fchost_act,
+ &softnet_act, /* AO_CLOSE_MARKUP */
/* </network> */
/* <power-management> */
&pwr_cpufreq_act,
&pwr_wghfreq_act,
&pwr_usb_act, /* AO_CLOSE_MARKUP */
/* </power-management> */
- &filesystem_act,
- &fc_act
+ &filesystem_act
};
projects / sysstat / blobdiff