Skip to content

Commit

Permalink
sadf: PCP: Add support for A_PWR_CPU activity
Browse files Browse the repository at this point in the history 
Add metrics displayed by "sar -m CPU" (CPU frequency statistics) to PCP
archive.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
  • Loading branch information
@sysstat
sysstat committed Apr 6, 2019
1 parent bb91d9c commit 8deb1e1
Show file tree
Hide file tree
Showing 5 changed files with 139 additions and 64 deletions.
1 change: 1 addition & 0 deletions activity.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1437,6 +1437,7 @@ struct activity pwr_cpufreq_act = {
.f_json_print = json_print_pwr_cpufreq_stats,
.f_svg_print = svg_print_pwr_cpufreq_stats,
.f_raw_print = raw_print_pwr_cpufreq_stats,
.f_pcp_print = pcp_print_pwr_cpufreq_stats,
.f_count_new = NULL,
.item_list = NULL,
.desc = "CPU clock frequency",
Expand Down
155 changes: 91 additions & 64 deletions pcp_def_metrics.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
void pcp_def_cpu_metrics(struct activity *a)
{
#ifdef HAVE_PCP
int i, first = TRUE;
int i, first = TRUE, create = FALSE;
char buf[64];
pmInDom indom;
static pmInDom indom = PM_INDOM_NULL;

for (i = 0; (i < a->nr_ini) && (i < a->bitmap->b_size + 1); i++) {

Expand All @@ -56,94 +56,121 @@ void pcp_def_cpu_metrics(struct activity *a)
continue;

if (!i) {
/* This is CPU "all" */
pmiAddMetric("kernel.all.cpu.user",
if (a->id == A_CPU) {
/* This is CPU "all" */
pmiAddMetric("kernel.all.cpu.user",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.all.cpu.nice",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.all.cpu.nice",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.all.cpu.sys",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.all.cpu.sys",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.all.cpu.idle",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.all.cpu.idle",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.all.cpu.iowait",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.all.cpu.iowait",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.all.cpu.steal",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.all.cpu.steal",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.all.cpu.hardirq",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.all.cpu.hardirq",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.all.cpu.softirq",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.all.cpu.softirq",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.all.cpu.guest",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.all.cpu.guest",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.all.cpu.guest_nice",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.all.cpu.guest_nice",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
}

else if (a->id == A_PWR_CPU) {
/* Create metric for A_PWR_CPU */
pmiAddMetric("kernel.all.cpu.freqMHz",
PM_IN_NULL, PM_TYPE_FLOAT, PM_INDOM_NULL, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
}
}
else {
if (first) {
/* This is not CPU "all" */
if (indom == PM_INDOM_NULL) {
/* Create domain */
indom = pmInDom_build(0, PM_INDOM_CPU);
create = TRUE;
}
if (create) {
/* Create instance for current CPU */
sprintf(buf, "cpu%d", i - 1);
pmiAddInstance(indom, buf, i - 1);
}

pmiAddMetric("kernel.percpu.cpu.user",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
if (first) {
if (a->id == A_CPU) {
/* Create metrics for A_CPU */
pmiAddMetric("kernel.percpu.cpu.user",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.percpu.cpu.nice",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.percpu.cpu.nice",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.percpu.cpu.sys",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.percpu.cpu.sys",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.percpu.cpu.idle",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.percpu.cpu.idle",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.percpu.cpu.iowait",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.percpu.cpu.iowait",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.percpu.cpu.steal",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.percpu.cpu.steal",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.percpu.cpu.hardirq",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.percpu.cpu.hardirq",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.percpu.cpu.softirq",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.percpu.cpu.softirq",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.percpu.cpu.guest",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.percpu.cpu.guest",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));

pmiAddMetric("kernel.percpu.cpu.guest_nice",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
pmiAddMetric("kernel.percpu.cpu.guest_nice",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
}

else if (a->id == A_PWR_CPU) {
/* Create metric for A_PWR_CPU */
pmiAddMetric("kernel.percpu.cpu.freqMHz",
PM_IN_NULL, PM_TYPE_FLOAT, indom, PM_SEM_INSTANT,
pmiUnits(0, 0, 0, 0, 0, 0));
}
first = FALSE;
}
sprintf(buf, "cpu%d", i - 1);
pmiAddInstance(indom, buf, i - 1);
}
}
#endif /* HAVE_PCP */
Expand Down
44 changes: 44 additions & 0 deletions pcp_stats.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1691,3 +1691,47 @@ __print_funct_t pcp_print_net_udp6_stats(struct activity *a, int curr, unsigned
pmiPutValue("network.snmp.udp6.udpInErrors", NULL, buf);
#endif /* HAVE_PCP */
}

/*
***************************************************************************
* Display CPU frequency 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_cpufreq_stats(struct activity *a, int curr, unsigned long long itv,
struct record_header *record_hdr)
{
#ifdef HAVE_PCP
int i;
struct stats_pwr_cpufreq *spc;
char buf[64], cpuno[64];
char *str;

for (i = 0; (i < a->nr[curr]) && (i < a->bitmap->b_size + 1); i++) {

spc = (struct stats_pwr_cpufreq *) ((char *) a->buf[curr] + i * a->msize);

/* Should current CPU (including CPU "all") be displayed? */
if (!(a->bitmap->b_array[i >> 3] & (1 << (i & 0x07))))
/* No */
continue;

if (!i) {
/* This is CPU "all" */
str = NULL;
}
else {
sprintf(cpuno, "cpu%d", i - 1);
str = cpuno;
}

snprintf(buf, sizeof(buf), "%f", ((double) spc->cpufreq) / 100);
pmiPutValue(i ? "kernel.percpu.cpu.freqMHz" : "kernel.all.cpu.freqMHz", str, buf);
}
#endif /* HAVE_PCP */
}
2 changes: 2 additions & 0 deletions pcp_stats.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,7 @@ __print_funct_t pcp_print_net_eicmp6_stats
(struct activity *, int, unsigned long long, struct record_header *);
__print_funct_t pcp_print_net_udp6_stats
(struct activity *, int, unsigned long long, struct record_header *);
__print_funct_t pcp_print_pwr_cpufreq_stats
(struct activity *, int, unsigned long long, struct record_header *);

#endif /* _PCP_STATS_H */
1 change: 1 addition & 0 deletions sadf_misc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,7 @@ __printf_funct_t print_pcp_statistics(int *tab, int action, struct activity *act
switch (act[p]->id) {

case A_CPU:
case A_PWR_CPU:
pcp_def_cpu_metrics(act[p]);
break;

Expand Down

0 comments on commit 8deb1e1

Please sign in to comment.