perf pmu: Support MetricExpr header in JSON event list
Add support for parsing the MetricExpr header in the JSON event lists and storing them in the alias structure. Used in the next patch. v2: Change DividedBy to MetricExpr v3: Really catch all uses of DividedBy Signed-off-by: Andi Kleen <ak@linux.intel.com> Acked-by: Jiri Olsa <jolsa@kernel.org> Link: http://lkml.kernel.org/r/20170320201711.14142-10-andi@firstfloor.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:

committed by
Arnaldo Carvalho de Melo

parent
b90b3e9c11
commit
00636c3b48
@@ -231,7 +231,8 @@ static int perf_pmu__parse_snapshot(struct perf_pmu_alias *alias,
|
||||
static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name,
|
||||
char *desc, char *val,
|
||||
char *long_desc, char *topic,
|
||||
char *unit, char *perpkg)
|
||||
char *unit, char *perpkg,
|
||||
char *metric_expr)
|
||||
{
|
||||
struct perf_pmu_alias *alias;
|
||||
int ret;
|
||||
@@ -265,6 +266,7 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name,
|
||||
perf_pmu__parse_snapshot(alias, dir, name);
|
||||
}
|
||||
|
||||
alias->metric_expr = metric_expr ? strdup(metric_expr) : NULL;
|
||||
alias->desc = desc ? strdup(desc) : NULL;
|
||||
alias->long_desc = long_desc ? strdup(long_desc) :
|
||||
desc ? strdup(desc) : NULL;
|
||||
@@ -294,7 +296,7 @@ static int perf_pmu__new_alias(struct list_head *list, char *dir, char *name, FI
|
||||
buf[ret] = 0;
|
||||
|
||||
return __perf_pmu__new_alias(list, dir, name, NULL, buf, NULL, NULL, NULL,
|
||||
NULL);
|
||||
NULL, NULL);
|
||||
}
|
||||
|
||||
static inline bool pmu_alias_info_file(char *name)
|
||||
@@ -564,7 +566,8 @@ static void pmu_add_cpu_aliases(struct list_head *head, const char *name)
|
||||
__perf_pmu__new_alias(head, NULL, (char *)pe->name,
|
||||
(char *)pe->desc, (char *)pe->event,
|
||||
(char *)pe->long_desc, (char *)pe->topic,
|
||||
(char *)pe->unit, (char *)pe->perpkg);
|
||||
(char *)pe->unit, (char *)pe->perpkg,
|
||||
(char *)pe->metric_expr);
|
||||
}
|
||||
|
||||
out:
|
||||
|
Reference in New Issue
Block a user