From: Sebastien GODARD Date: Fri, 3 Jun 2016 11:35:03 +0000 (+0200) Subject: SVG: Add SVG output for UDPv6 network statistics X-Git-Tag: v11.3.5~20 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d11172ea29e4bbeb9c0029ed52181e00ff34671;p=sysstat SVG: Add SVG output for UDPv6 network statistics These graphs correspond to the output of "sar -n UDP6". Signed-off-by: Sebastien GODARD --- diff --git a/activity.c b/activity.c index f25e1fe..970b98b 100644 --- a/activity.c +++ b/activity.c @@ -1041,9 +1041,10 @@ struct activity net_udp6_act = { .f_render = render_net_udp6_stats, .f_xml_print = xml_print_net_udp6_stats, .f_json_print = json_print_net_udp6_stats, + .f_svg_print = svg_print_net_udp6_stats, .hdr_line = "idgm6/s;odgm6/s;noport6/s;idgmer6/s", .name = "A_NET_UDP6", - .g_nr = 0, + .g_nr = 2, #endif .nr = 1, .nr2 = 1, diff --git a/svg_stats.c b/svg_stats.c index 0000405..4dc7681 100644 --- a/svg_stats.c +++ b/svg_stats.c @@ -2693,6 +2693,76 @@ __print_funct_t svg_print_net_icmp6_stats(struct activity *a, int curr, int acti } } +/* + *************************************************************************** + * Display UDPv6 network statistics in SVG. + * + * IN: + * @a Activity structure with statistics. + * @curr Index in array for current sample statistics. + * @action Action expected from current function. + * @svg_p SVG specific parameters: Current graph number (.@graph_no), + * flag indicating that a restart record has been previously + * found (.@restart) and time used for the X axis origin + * (@ust_time_ref). + * @itv Interval of time in jiffies (only with F_MAIN action). + * @record_hdr Pointer on record header of current stats sample. + *************************************************************************** + */ +__print_funct_t svg_print_net_udp6_stats(struct activity *a, int curr, int action, struct svg_parm *svg_p, + unsigned long long itv, struct record_header *record_hdr) +{ + struct stats_net_udp6 + *snuc = (struct stats_net_udp6 *) a->buf[curr], + *snup = (struct stats_net_udp6 *) a->buf[!curr]; + int group[] = {2, 2}; + char *title[] = {"UDPv6 network statistics (1)", "UDPv6 network statistics (2)"}; + char *g_title[] = {"idgm6/s", "odgm6/s", + "noport6/s", "idgmer6/s"}; + static double *spmin, *spmax; + static char **out; + static int *outsize; + + if (action & F_BEGIN) { + /* + * Allocate arrays that will contain the graphs data + * and the min/max values. + */ + out = allocate_graph_lines(4, &outsize, &spmin, &spmax); + } + + if (action & F_MAIN) { + /* Check for min/max values */ + save_extrema(0, 4, 0, (void *) a->buf[curr], (void *) a->buf[!curr], + itv, spmin, spmax); + + /* idgm6/s */ + lnappend(record_hdr->ust_time - svg_p->ust_time_ref, + S_VALUE(snup->InDatagrams6, snuc->InDatagrams6, itv), + out, outsize, svg_p->restart); + /* odgm6/s */ + lnappend(record_hdr->ust_time - svg_p->ust_time_ref, + S_VALUE(snup->OutDatagrams6, snuc->OutDatagrams6, itv), + out + 1, outsize + 1, svg_p->restart); + /* noport6/s */ + lnappend(record_hdr->ust_time - svg_p->ust_time_ref, + S_VALUE(snup->NoPorts6, snuc->NoPorts6, itv), + out + 2, outsize + 2, svg_p->restart); + /* idgmer6/s */ + lnappend(record_hdr->ust_time - svg_p->ust_time_ref, + S_VALUE(snup->InErrors6, snuc->InErrors6, itv), + out + 3, outsize + 3, svg_p->restart); + } + + if (action & F_END) { + draw_activity_graphs(a->g_nr, SVG_LINE_GRAPH, title, g_title, NULL, group, + spmin, spmax, out, outsize, svg_p, record_hdr); + + /* Free remaining structures */ + free_graphs(out, outsize, spmin, spmax); + } +} + /* *************************************************************************** * Display CPU frequency statistics in SVG. diff --git a/svg_stats.h b/svg_stats.h index 219be2d..b748f1d 100644 --- a/svg_stats.h +++ b/svg_stats.h @@ -65,6 +65,9 @@ __print_funct_t svg_print_net_ip6_stats __print_funct_t svg_print_net_icmp6_stats (struct activity *, int, int, struct svg_parm *, unsigned long long, struct record_header *); +__print_funct_t svg_print_net_udp6_stats + (struct activity *, int, int, struct svg_parm *, unsigned long long, + struct record_header *); __print_funct_t svg_print_pwr_cpufreq_stats (struct activity *, int, int, struct svg_parm *, unsigned long long, struct record_header *);