Introducing perf data file version CHECK macro, so the check
is easily extensible for new versions.
Signed-off-by: Jiri Olsa <jo...@redhat.com>
Cc: Corey Ashford <cjash...@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweis...@gmail.com>
Cc: Ingo Molnar <mi...@elte.hu>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Peter Zijlstra <a.p.zijls...@chello.nl>
Cc: Arnaldo Carvalho de Melo <a...@redhat.com>
Cc: Andi Kleen <a...@linux.intel.com>
Cc: David Ahern <dsah...@gmail.com>
---
tools/perf/util/header.c | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index a33197a..bcded62 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2496,18 +2496,23 @@ static int check_magic_endian(u64 magic, uint64_t
hdr_sz,
* - encode endianness of file
*/
- /* check magic number with one endianness */
- if (magic == __perf_magic2)
- return 0;
-
- /* check magic number with opposite endianness */
- if (magic != __perf_magic2_sw)
- return -1;
+#define CHECK(__m, __v) \
+do { \
+ /* check magic number with one endianness */ \
+ if (magic == __m) \
+ goto v ## __v; \
+ /* check magic number with opposite endianness */ \
+ if (magic != __m ## _sw) \
+ break; \
+ ph->needs_swap = true; \
+ v ## __v: \
+ ph->version = __v; \
+ return 0; \
+} while (0)
+
+ CHECK(__perf_magic2, PERF_HEADER_VERSION_2);
- ph->needs_swap = true;
- ph->version = PERF_HEADER_VERSION_2;
-
- return 0;
+ return -1;
}
int perf_file_header__read(struct perf_file_header *header,
--
1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
