aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@redhat.com>2013-07-17 13:49:43 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-07-17 15:46:25 -0400
commit944d62ba4c8e1c9bb2962a70e3d495106fae8cd9 (patch)
treef8b9fe1b70d9a53fa9cb53bf17f47ec2d33a5718 /tools
parent75211dbfabf1de3a42703f4d3cd6f6e047289d40 (diff)
perf header: Remove attr_offset from perf_header
Removing attr_offset from perf_header as it's possible to use it as a local variable. Signed-off-by: Jiri Olsa <jolsa@redhat.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1374083403-14591-4-git-send-email-jolsa@redhat.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/header.c5
-rw-r--r--tools/perf/util/header.h1
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 035efe764286..dcba56aac1b7 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2272,6 +2272,7 @@ int perf_session__write_header(struct perf_session *session,
2272 struct perf_file_attr f_attr; 2272 struct perf_file_attr f_attr;
2273 struct perf_header *header = &session->header; 2273 struct perf_header *header = &session->header;
2274 struct perf_evsel *evsel; 2274 struct perf_evsel *evsel;
2275 u64 attr_offset;
2275 int err; 2276 int err;
2276 2277
2277 lseek(fd, sizeof(f_header), SEEK_SET); 2278 lseek(fd, sizeof(f_header), SEEK_SET);
@@ -2285,7 +2286,7 @@ int perf_session__write_header(struct perf_session *session,
2285 } 2286 }
2286 } 2287 }
2287 2288
2288 header->attr_offset = lseek(fd, 0, SEEK_CUR); 2289 attr_offset = lseek(fd, 0, SEEK_CUR);
2289 2290
2290 list_for_each_entry(evsel, &evlist->entries, node) { 2291 list_for_each_entry(evsel, &evlist->entries, node) {
2291 f_attr = (struct perf_file_attr){ 2292 f_attr = (struct perf_file_attr){
@@ -2315,7 +2316,7 @@ int perf_session__write_header(struct perf_session *session,
2315 .size = sizeof(f_header), 2316 .size = sizeof(f_header),
2316 .attr_size = sizeof(f_attr), 2317 .attr_size = sizeof(f_attr),
2317 .attrs = { 2318 .attrs = {
2318 .offset = header->attr_offset, 2319 .offset = attr_offset,
2319 .size = evlist->nr_entries * sizeof(f_attr), 2320 .size = evlist->nr_entries * sizeof(f_attr),
2320 }, 2321 },
2321 .data = { 2322 .data = {
diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h
index 0bacb2d6eafa..6fa80f947f71 100644
--- a/tools/perf/util/header.h
+++ b/tools/perf/util/header.h
@@ -86,7 +86,6 @@ struct perf_session_env {
86 86
87struct perf_header { 87struct perf_header {
88 bool needs_swap; 88 bool needs_swap;
89 s64 attr_offset;
90 u64 data_offset; 89 u64 data_offset;
91 u64 data_size; 90 u64 data_size;
92 DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS); 91 DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS);