From e19072321dde1fe01675866eaa8d9b83cbb76e0b Mon Sep 17 00:00:00 2001 From: Sebastien GODARD Date: Sun, 24 Mar 2019 15:00:16 +0100 Subject: [PATCH] sadf: PCP: Add support for A_NET_NFS activity Add metrics displayed by "sar -n NFS" (NFS client statistics) to PCP archive. Signed-off-by: Sebastien GODARD --- activity.c | 1 + pcp_def_metrics.c | 34 ++++++++++++++++++++++++++++++++++ pcp_def_metrics.h | 1 + pcp_stats.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ pcp_stats.h | 2 ++ sadf_misc.c | 4 ++++ 6 files changed, 88 insertions(+) diff --git a/activity.c b/activity.c index d214228..b2a3ef2 100644 --- a/activity.c +++ b/activity.c @@ -693,6 +693,7 @@ struct activity net_nfs_act = { .f_json_print = json_print_net_nfs_stats, .f_svg_print = svg_print_net_nfs_stats, .f_raw_print = raw_print_net_nfs_stats, + .f_pcp_print = pcp_print_net_nfs_stats, .f_count_new = NULL, .item_list = NULL, .desc = "NFS client statistics", diff --git a/pcp_def_metrics.c b/pcp_def_metrics.c index 0c2ecaf..9313590 100644 --- a/pcp_def_metrics.c +++ b/pcp_def_metrics.c @@ -598,3 +598,37 @@ void pcp_def_serial_metrics(struct activity *a) } #endif /* HAVE_PCP */ } + +/* + *************************************************************************** + * Define PCP metrics for NFS client statistics. + *************************************************************************** + */ +void pcp_def_net_nfs_metrics(void) +{ +#ifdef HAVE_PCP + pmiAddMetric("network.fs.client.call", + PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT, + pmiUnits(0, -1, 1, 0, PM_TIME_SEC, PM_COUNT_ONE)); + + pmiAddMetric("network.fs.client.retrans", + PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT, + pmiUnits(0, -1, 1, 0, PM_TIME_SEC, PM_COUNT_ONE)); + + pmiAddMetric("network.fs.client.read", + PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT, + pmiUnits(0, -1, 1, 0, PM_TIME_SEC, PM_COUNT_ONE)); + + pmiAddMetric("network.fs.client.write", + PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT, + pmiUnits(0, -1, 1, 0, PM_TIME_SEC, PM_COUNT_ONE)); + + pmiAddMetric("network.fs.client.access", + PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT, + pmiUnits(0, -1, 1, 0, PM_TIME_SEC, PM_COUNT_ONE)); + + pmiAddMetric("network.fs.client.getatt", + PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT, + pmiUnits(0, -1, 1, 0, PM_TIME_SEC, PM_COUNT_ONE)); +#endif /* HAVE_PCP */ +} diff --git a/pcp_def_metrics.h b/pcp_def_metrics.h index 789619b..1ec2cd1 100644 --- a/pcp_def_metrics.h +++ b/pcp_def_metrics.h @@ -23,6 +23,7 @@ void pcp_def_ktables_metrics(void); void pcp_def_queue_metrics(void); void pcp_def_serial_metrics(struct activity *); void pcp_def_net_dev_metrics(struct activity *); +void pcp_def_net_nfs_metrics(void); /* Define domains number */ #define PM_INDOM_CPU 0 diff --git a/pcp_stats.c b/pcp_stats.c index 2063e0c..692f11e 100644 --- a/pcp_stats.c +++ b/pcp_stats.c @@ -792,3 +792,49 @@ __print_funct_t pcp_print_serial_stats(struct activity *a, int curr, unsigned lo } #endif /* HAVE_PCP */ } + +/* + *************************************************************************** + * Display NFS client statistics in PCP format. + * + * IN: + * @a Activity structure with statistics. + * @curr Index in array for current sample statistics. + * @itv Interval of time in 1/100th of a second. + * @record_hdr Record header for current sample. + *************************************************************************** + */ +__print_funct_t pcp_print_net_nfs_stats(struct activity *a, int curr, unsigned long long itv, + struct record_header *record_hdr) +{ +#ifdef HAVE_PCP + char buf[64]; + struct stats_net_nfs + *snnc = (struct stats_net_nfs *) a->buf[curr], + *snnp = (struct stats_net_nfs *) a->buf[!curr]; + + snprintf(buf, sizeof(buf), "%f", + S_VALUE(snnp->nfs_rpccnt, snnc->nfs_rpccnt, itv)); + pmiPutValue("network.fs.client.call", NULL, buf); + + snprintf(buf, sizeof(buf), "%f", + S_VALUE(snnp->nfs_rpcretrans, snnc->nfs_rpcretrans, itv)); + pmiPutValue("network.fs.client.retrans", NULL, buf); + + snprintf(buf, sizeof(buf), "%f", + S_VALUE(snnp->nfs_readcnt, snnc->nfs_readcnt, itv)); + pmiPutValue("network.fs.client.read", NULL, buf); + + snprintf(buf, sizeof(buf), "%f", + S_VALUE(snnp->nfs_writecnt, snnc->nfs_writecnt, itv)); + pmiPutValue("network.fs.client.write", NULL, buf); + + snprintf(buf, sizeof(buf), "%f", + S_VALUE(snnp->nfs_accesscnt, snnc->nfs_accesscnt, itv)); + pmiPutValue("network.fs.client.access", NULL, buf); + + snprintf(buf, sizeof(buf), "%f", + S_VALUE(snnp->nfs_getattcnt, snnc->nfs_getattcnt, itv)); + pmiPutValue("network.fs.client.getatt", NULL, buf); +#endif /* HAVE_PCP */ +} diff --git a/pcp_stats.h b/pcp_stats.h index 1d8e435..7a7f96b 100644 --- a/pcp_stats.h +++ b/pcp_stats.h @@ -37,5 +37,7 @@ __print_funct_t pcp_print_net_dev_stats (struct activity *, int, unsigned long long, struct record_header *); __print_funct_t pcp_print_net_edev_stats (struct activity *, int, unsigned long long, struct record_header *); +__print_funct_t pcp_print_net_nfs_stats + (struct activity *, int, unsigned long long, struct record_header *); #endif /* _PCP_STATS_H */ diff --git a/sadf_misc.c b/sadf_misc.c index fd4162b..d9153cc 100644 --- a/sadf_misc.c +++ b/sadf_misc.c @@ -541,6 +541,10 @@ __printf_funct_t print_pcp_statistics(int *tab, int action, struct activity *act case A_NET_EDEV: pcp_def_net_dev_metrics(act[p]); break; + + case A_NET_NFS: + pcp_def_net_nfs_metrics(); + break; } } } -- 2.49.0