From: Sebastien GODARD Date: Sat, 25 May 2019 14:31:12 +0000 (+0200) Subject: sadf: PCP: Add support for A_PWR_IN activity X-Git-Tag: v12.1.5~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01a8b7d20ea22b77ebfc1f0b8ae48d86850ad297;p=sysstat sadf: PCP: Add support for A_PWR_IN activity Add metrics displayed by "sar -m IN" (voltage inputs statistics) to PCP archive. Signed-off-by: Sebastien GODARD --- diff --git a/activity.c b/activity.c index 43853e6..52056dc 100644 --- a/activity.c +++ b/activity.c @@ -1576,6 +1576,7 @@ struct activity pwr_in_act = { .f_json_print = json_print_pwr_in_stats, .f_svg_print = svg_print_pwr_in_stats, .f_raw_print = raw_print_pwr_in_stats, + .f_pcp_print = pcp_print_pwr_in_stats, .f_count_new = NULL, .item_list = NULL, .desc = "Voltage inputs statistics", diff --git a/pcp_def_metrics.c b/pcp_def_metrics.c index e1152c4..bc1a4ab 100644 --- a/pcp_def_metrics.c +++ b/pcp_def_metrics.c @@ -1565,6 +1565,45 @@ void pcp_def_pwr_temp_metrics(struct activity *a) #endif /* HAVE_PCP */ } +/* + *************************************************************************** + * Define PCP metrics for voltage inputs statistics. + * + * IN: + * @a Activity structure with statistics. + *************************************************************************** + */ +void pcp_def_pwr_in_metrics(struct activity *a) +{ +#ifdef HAVE_PCP + int inst = 0; + static pmInDom indom = PM_INDOM_NULL; + char buf[16]; + + if (indom == PM_INDOM_NULL) { + /* Create domain */ + indom = pmInDom_build(0, PM_INDOM_IN); + + for (inst = 0; inst < a->item_list_sz; inst++) { + sprintf(buf, "in%d", inst); + pmiAddInstance(indom, buf, inst); + } + } + + pmiAddMetric("power.in.inV", + PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT, + pmiUnits(0, 0, 0, 0, 0, 0)); + + pmiAddMetric("power.in.in_pct", + PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT, + pmiUnits(0, 0, 0, 0, 0, 0)); + + pmiAddMetric("power.in.device", + PM_IN_NULL, PM_TYPE_STRING, indom, PM_SEM_DISCRETE, + pmiUnits(0, 0, 0, 0, 0, 0)); +#endif /* HAVE_PCP */ +} + /* *************************************************************************** * Define PCP metrics for USB devices statistics. diff --git a/pcp_def_metrics.h b/pcp_def_metrics.h index b51ddc5..bc5cd89 100644 --- a/pcp_def_metrics.h +++ b/pcp_def_metrics.h @@ -43,6 +43,7 @@ void pcp_def_net_udp6_metrics(void); void pcp_def_huge_metrics(void); void pcp_def_pwr_fan_metrics(struct activity *); void pcp_def_pwr_temp_metrics(struct activity *); +void pcp_def_pwr_in_metrics(struct activity *); void pcp_def_pwr_usb_metrics(struct activity *); void pcp_def_filesystem_metrics(struct activity *); void pcp_def_fchost_metrics(struct activity *); @@ -59,5 +60,6 @@ void pcp_def_fchost_metrics(struct activity *); #define PM_INDOM_DISK 8 #define PM_INDOM_FAN 9 #define PM_INDOM_TEMP 10 +#define PM_INDOM_IN 11 #endif /* _PCP_DEF_METRICS_H */ diff --git a/pcp_stats.c b/pcp_stats.c index 843246e..836ab7b 100644 --- a/pcp_stats.c +++ b/pcp_stats.c @@ -1900,6 +1900,47 @@ __print_funct_t pcp_print_pwr_temp_stats(struct activity *a, int curr, unsigned #endif /* HAVE_PCP */ } +/* + *************************************************************************** + * Display voltage inputs 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_pwr_in_stats(struct activity *a, int curr, unsigned long long itv, + struct record_header *record_hdr) +{ +#ifdef HAVE_PCP + int i; + struct stats_pwr_in *spc; + char buf[64], instance[32]; + + for (i = 0; i < a->nr[curr]; i++) { + + spc = (struct stats_pwr_in *) ((char *) a->buf[curr] + i * a->msize); + sprintf(instance, "in%d", i); + + snprintf(buf, sizeof(buf), "%f", + spc->in); + pmiPutValue("power.in.inV", instance, buf); + + snprintf(buf, sizeof(buf), "%f", + (spc->in_max - spc->in_min) ? + (spc->in - spc->in_min) / (spc->in_max - spc->in_min) * 100 : + 0.0); + pmiPutValue("power.in.in_pct", instance, buf); + + snprintf(buf, sizeof(buf), "%s", + spc->device); + pmiPutValue("power.in.device", instance, buf); + } +#endif /* HAVE_PCP */ +} + /* *************************************************************************** * Display huge pages statistics in PCP format. diff --git a/pcp_stats.h b/pcp_stats.h index 5a37df5..8e21297 100644 --- a/pcp_stats.h +++ b/pcp_stats.h @@ -77,6 +77,8 @@ __print_funct_t pcp_print_pwr_fan_stats (struct activity *, int, unsigned long long, struct record_header *); __print_funct_t pcp_print_pwr_temp_stats (struct activity *, int, unsigned long long, struct record_header *); +__print_funct_t pcp_print_pwr_in_stats + (struct activity *, int, unsigned long long, struct record_header *); __print_funct_t pcp_print_huge_stats (struct activity *, int, unsigned long long, struct record_header *); __print_funct_t pcp_print_pwr_usb_stats diff --git a/sadf_misc.c b/sadf_misc.c index e472843..d1abca1 100644 --- a/sadf_misc.c +++ b/sadf_misc.c @@ -777,6 +777,10 @@ __printf_funct_t print_pcp_statistics(int *tab, int action, struct activity *act pcp_def_pwr_temp_metrics(act[p]); break; + case A_PWR_IN: + pcp_def_pwr_in_metrics(act[p]); + break; + case A_PWR_USB: pcp_def_pwr_usb_metrics(act[p]); break;