[PATCH RFC 03/10] perf,tools: don't validate counter read event

[kan . liang]

From: Kan Liang <kan.liang@xxxxxxxxx>

Counter read event (:C) doesn't do sampling. So perf tool should not
validate its sample_type, read_format and sample_id_all.

Signed-off-by: Kan Liang <kan.liang@xxxxxxxxx>
---
 tools/perf/util/evlist.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 603ee3e..af6215f 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1258,6 +1258,17 @@ int perf_evlist__set_filter_pid(struct perf_evlist *evlist, pid_t pid)
 	return perf_evlist__set_filter_pids(evlist, 1, &pid);
 }
 
+static inline bool is_counter_read_event(struct perf_event_attr *attr)
+{
+	if ((attr->read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) &&
+	    (attr->read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) &&
+	    !attr->sample_freq && !attr->sample_period &&
+	    !attr->sample_type)
+		return true;
+
+	return false;
+}
+
 bool perf_evlist__valid_sample_type(struct perf_evlist *evlist)
 {
 	struct perf_evsel *pos;
@@ -1269,6 +1280,8 @@ bool perf_evlist__valid_sample_type(struct perf_evlist *evlist)
 		return false;
 
 	evlist__for_each(evlist, pos) {
+		if (is_counter_read_event(&pos->attr))
+			continue;
 		if (pos->id_pos != evlist->id_pos ||
 		    pos->is_pos != evlist->is_pos)
 			return false;
@@ -1313,6 +1326,8 @@ bool perf_evlist__valid_read_format(struct perf_evlist *evlist)
 	u64 sample_type = first->attr.sample_type;
 
 	evlist__for_each(evlist, pos) {
+		if (is_counter_read_event(&pos->attr))
+			continue;
 		if (read_format != pos->attr.read_format)
 			return false;
 	}
@@ -1370,6 +1385,8 @@ bool perf_evlist__valid_sample_id_all(struct perf_evlist *evlist)
 	struct perf_evsel *first = perf_evlist__first(evlist), *pos = first;
 
 	evlist__for_each_continue(evlist, pos) {
+		if (is_counter_read_event(&pos->attr))
+			continue;
 		if (first->attr.sample_id_all != pos->attr.sample_id_all)
 			return false;
 	}
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/