Adding support for name term being specified within
the alias definition and gives the name for the alias.
Alias could be now defined like:
name=BR_MISP_EXEC.ALL_BRANCHES,event=0x89,umask=0xff
It'll be handy for having single file with multiple
alias definitions.
Signed-off-by: Jiri Olsa <jo...@redhat.com>
Cc: Corey Ashford <cjash...@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweis...@gmail.com>
Cc: Ingo Molnar <mi...@elte.hu>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Peter Zijlstra <a.p.zijls...@chello.nl>
Cc: Arnaldo Carvalho de Melo <a...@redhat.com>
Cc: Andi Kleen <a...@linux.intel.com>
Cc: Stephane Eranian <eran...@google.com>
---
tools/perf/util/parse-events.c | 19 ++-----------------
tools/perf/util/pmu.c | 35 +++++++++++++++++++++++++++++++++++
tools/perf/util/pmu.h | 3 +++
3 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 83362f2..0143c90 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -616,22 +616,6 @@ int parse_events_add_numeric(struct list_head **list, int
*idx,
return add_event(list, idx, &attr, NULL);
}
-static int parse_events__is_name_term(struct parse_events_term *term)
-{
- return term->type_term == PARSE_EVENTS__TERM_TYPE_NAME;
-}
-
-static char *pmu_event_name(struct list_head *head_terms)
-{
- struct parse_events_term *term;
-
- list_for_each_entry(term, head_terms, list)
- if (parse_events__is_name_term(term))
- return term->val.str;
-
- return NULL;
-}
-
int parse_events_add_pmu(struct list_head **list, int *idx,
char *name, struct list_head *head_config)
{
@@ -656,7 +640,8 @@ int parse_events_add_pmu(struct list_head **list, int *idx,
if (perf_pmu__config(pmu, &attr, head_config))
return -EINVAL;
- return __add_event(list, idx, &attr, pmu_event_name(head_config),
+ return __add_event(list, idx, &attr,
+ perf_pmu__event_name(head_config, false),
pmu->cpus);
}
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index f7852e9..0d45ccd 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -95,6 +95,27 @@ static int pmu_format(char *name, struct list_head *format)
return 0;
}
+static int parse_events__is_name_term(struct parse_events_term *term)
+{
+ return term->type_term == PARSE_EVENTS__TERM_TYPE_NAME;
+}
+
+char *perf_pmu__event_name(struct list_head *head_terms, bool remove)
+{
+ struct parse_events_term *term;
+
+ list_for_each_entry(term, head_terms, list)
+ if (parse_events__is_name_term(term)) {
+ if (remove) {
+ list_del(&term->list);
+ free(term);
+ }
+ return term->val.str;
+ }
+
+ return NULL;
+}
+
static int perf_pmu__new_alias(struct list_head *list, char *name, char *data)
{
struct perf_pmu_alias *alias;
@@ -111,6 +132,20 @@ static int perf_pmu__new_alias(struct list_head *list,
char *name, char *data)
return ret;
}
+ /*
+ * Use NAME term to get alias name. In case there's no name
+ * at all, bail out. In case we find NAME term, remove it
+ * not to mangle with event term name.
+ */
+ if (!name) {
+ name = perf_pmu__event_name(&alias->terms, true);
+
+ if (!name) {
+ free(alias);
+ return -EINVAL;
+ }
+ }
+
alias->name = strdup(name);
list_add_tail(&alias->list, list);
return 0;
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
index 32fe55b..54cd809 100644
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -3,6 +3,7 @@
#include <linux/bitops.h>
#include <linux/perf_event.h>
+#include <stdbool.h>
enum {
PERF_PMU_FORMAT_VALUE_CONFIG,
@@ -40,5 +41,7 @@ int perf_pmu__format_parse(char *dir, struct list_head *head);
struct perf_pmu *perf_pmu__scan(struct perf_pmu *pmu);
+char *perf_pmu__event_name(struct list_head *head_terms, bool remove);
+
int perf_pmu__test(void);
#endif /* __PMU_H */
--
1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
