public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

perf header: Recognize version number for perf data file

Browse source 
Keep the recognized data file version within 'struct perf_header'.

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-8-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2013-07-17 19:49:47 +02:00 • committed by Arnaldo Carvalho de Melo
parent 8d541e974f
commit 2a08c3ec4f
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/perf/util/header.c
View file

@ -2480,6 +2480,7 @@ static int check_magic_endian(u64 magic, uint64_t hdr_sz,
/* check for legacy format */ /* check for legacy format */
ret = memcmp(&magic, __perf_magic1, sizeof(magic)); ret = memcmp(&magic, __perf_magic1, sizeof(magic));
if (ret == 0) { if (ret == 0) {
ph->version = PERF_HEADER_VERSION_1;
pr_debug("legacy perf.data format\n"); pr_debug("legacy perf.data format\n");
if (is_pipe) if (is_pipe)
return try_all_pipe_abis(hdr_sz, ph); return try_all_pipe_abis(hdr_sz, ph);
@ -2501,6 +2502,7 @@ static int check_magic_endian(u64 magic, uint64_t hdr_sz,
return -1; return -1;
ph->needs_swap = true; ph->needs_swap = true;
ph->version = PERF_HEADER_VERSION_2;
return 0; return 0;
} }

16
tools/perf/util/header.h
View file

@ -34,6 +34,11 @@ enum {
HEADER_FEAT_BITS = 256, HEADER_FEAT_BITS = 256,
}; };
enum perf_header_version {
PERF_HEADER_VERSION_1,
PERF_HEADER_VERSION_2,
};
struct perf_file_section { struct perf_file_section {
u64 offset; u64 offset;
u64 size; u64 size;
@ -85,12 +90,13 @@ struct perf_session_env {
}; };
struct perf_header { struct perf_header {
bool needs_swap; enum perf_header_version version;
u64 data_offset; bool needs_swap;
u64 data_size; u64 data_offset;
u64 feat_offset; u64 data_size;
u64 feat_offset;
DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS); DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS);
struct perf_session_env env; struct perf_session_env env;
}; };
struct perf_evlist; struct perf_evlist;