Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Frederic Weisbecker and committed by
Ingo Molnar
3e13ab2d 4778d2e4

+4 -13
+2 -2
tools/perf/builtin-record.c
··· 431 431 header = perf_header__new(); 432 432 433 433 if (raw_samples) { 434 - perf_header__feat_trace_info(header); 434 + perf_header__set_feat(header, HEADER_TRACE_INFO); 435 435 } else { 436 436 for (i = 0; i < nr_counters; i++) { 437 437 if (attrs[i].sample_type & PERF_SAMPLE_RAW) { 438 - perf_header__feat_trace_info(header); 438 + perf_header__set_feat(header, HEADER_TRACE_INFO); 439 439 break; 440 440 } 441 441 }
+2 -10
tools/perf/util/header.c
··· 148 148 DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS); 149 149 }; 150 150 151 - void perf_header__feat_trace_info(struct perf_header *header) 152 - { 153 - set_bit(HEADER_TRACE_INFO, header->adds_features); 154 - } 155 - 156 151 void perf_header__set_feat(struct perf_header *self, int feat) 157 152 { 158 153 set_bit(feat, self->adds_features); ··· 190 195 { 191 196 struct perf_file_section trace_sec; 192 197 u64 cur_offset = lseek(fd, 0, SEEK_CUR); 193 - unsigned long *feat_mask = self->adds_features; 194 198 195 - if (test_bit(HEADER_TRACE_INFO, feat_mask)) { 199 + if (perf_header__has_feat(self, HEADER_TRACE_INFO)) { 196 200 /* Write trace info */ 197 201 trace_sec.offset = lseek(fd, sizeof(trace_sec), SEEK_CUR); 198 202 read_tracing_data(fd, attrs, nr_counters); ··· 308 314 309 315 static void perf_header__adds_read(struct perf_header *self, int fd) 310 316 { 311 - const unsigned long *feat_mask = self->adds_features; 312 - 313 - if (test_bit(HEADER_TRACE_INFO, feat_mask)) { 317 + if (perf_header__has_feat(self, HEADER_TRACE_INFO)) { 314 318 struct perf_file_section trace_sec; 315 319 316 320 do_read(fd, &trace_sec, sizeof(trace_sec));
-1
tools/perf/util/header.h
··· 49 49 u64 perf_header__sample_type(struct perf_header *header); 50 50 struct perf_event_attr * 51 51 perf_header__find_attr(u64 id, struct perf_header *header); 52 - void perf_header__feat_trace_info(struct perf_header *header); 53 52 void perf_header__set_feat(struct perf_header *self, int feat); 54 53 bool perf_header__has_feat(const struct perf_header *self, int feat); 55 54