perf tools: Use perf_header__set/has_feat whenever possible
And drop the alternate checks/sets using set_bit or other kind
of helpers.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
LKML-Reference: <1257911467-28276-5-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 915b56e..9709d38 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -148,11 +148,6 @@
DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS);
};
-void perf_header__feat_trace_info(struct perf_header *header)
-{
- set_bit(HEADER_TRACE_INFO, header->adds_features);
-}
-
void perf_header__set_feat(struct perf_header *self, int feat)
{
set_bit(feat, self->adds_features);
@@ -195,9 +190,8 @@
{
struct perf_file_section trace_sec;
u64 cur_offset = lseek(fd, 0, SEEK_CUR);
- unsigned long *feat_mask = self->adds_features;
- if (test_bit(HEADER_TRACE_INFO, feat_mask)) {
+ if (perf_header__has_feat(self, HEADER_TRACE_INFO)) {
/* Write trace info */
trace_sec.offset = lseek(fd, sizeof(trace_sec), SEEK_CUR);
read_tracing_data(fd, attrs, nr_counters);
@@ -314,9 +308,7 @@
static void perf_header__adds_read(struct perf_header *self, int fd)
{
- const unsigned long *feat_mask = self->adds_features;
-
- if (test_bit(HEADER_TRACE_INFO, feat_mask)) {
+ if (perf_header__has_feat(self, HEADER_TRACE_INFO)) {
struct perf_file_section trace_sec;
do_read(fd, &trace_sec, sizeof(trace_sec));