Currently if the term is specified without any value like
-e 'cpu/...,precise,../', the number '1' is assigned as
its default value.
Adding special treatment for 'precise' term to use the
maximum allowed precise value in such case using the
perf_precise__get function.
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: David Ahern <dsah...@gmail.com>
Cc: Stephane Eranian <eran...@google.com>
---
tools/perf/util/parse-events.c | 29 ++++++++++++++++++++++++++---
tools/perf/util/parse-events.h | 2 ++
tools/perf/util/parse-events.y | 2 +-
3 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 6be4599..5297c44 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -590,9 +590,14 @@ do {
\
break;
case PARSE_EVENTS__TERM_TYPE_PRECISE:
CHECK_TYPE_VAL(NUM);
- if ((unsigned)term->val.num > 2)
- return -EINVAL;
- attr->precise_ip = term->val.num;
+ /* No value specified, try to get it from sysfs. */
+ if (term->val.num == (u64) -1)
+ attr->precise_ip = precise_default();
+ else {
+ if ((unsigned)term->val.num > 2)
+ return -EINVAL;
+ attr->precise_ip = term->val.num;
+ }
break;
default:
return -EINVAL;
@@ -1245,6 +1250,24 @@ int parse_events_term__num(struct parse_events_term
**term,
config, NULL, num);
}
+int parse_events_term__num_default(struct parse_events_term **term,
+ int type_term, char *config)
+{
+ /*
+ * If no value is specified for term, we use 1 as default.
+ * The PRECISE term is an exception, because we force special
+ * functionality when there's no value specified for it,
+ * so we need to recognize it.
+ */
+ u64 num = 1;
+
+ if (type_term == PARSE_EVENTS__TERM_TYPE_PRECISE)
+ num = (u64) -1;
+
+ return new_term(term, PARSE_EVENTS__TERM_TYPE_NUM, type_term,
+ config, NULL, num);
+}
+
int parse_events_term__str(struct parse_events_term **term,
int type_term, char *config, char *str)
{
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 13d7c66..6810397 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -75,6 +75,8 @@ struct parse_events_terms {
int parse_events__is_hardcoded_term(struct parse_events_term *term);
int parse_events_term__num(struct parse_events_term **_term,
int type_term, char *config, u64 num);
+int parse_events_term__num_default(struct parse_events_term **term,
+ int type_term, char *config);
int parse_events_term__str(struct parse_events_term **_term,
int type_term, char *config, char *str);
int parse_events_term__sym_hw(struct parse_events_term **term,
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index afc44c1..da77510 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -408,7 +408,7 @@ PE_TERM
{
struct parse_events_term *term;
- ABORT_ON(parse_events_term__num(&term, (int)$1, NULL, 1));
+ ABORT_ON(parse_events_term__num_default(&term, (int)$1, NULL));
$$ = term;
}
--
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/
