[tip:perf/core] perf header: Add is_perf_magic() func

2012-10-30 Thread tip-bot for Feng Tang 
Commit-ID:  e84ba4e26833991d1c1c15a592b1474ee2b6dfdb
Gitweb: http://git.kernel.org/tip/e84ba4e26833991d1c1c15a592b1474ee2b6dfdb
Author: Feng Tang 
AuthorDate: Tue, 30 Oct 2012 11:56:07 +0800
Committer:  Arnaldo Carvalho de Melo 
CommitDate: Mon, 29 Oct 2012 11:56:59 -0200

perf header: Add is_perf_magic() func

With this function, other modules can basically check whether a file is
a legal perf data file by checking its first 8 bytes against all
possible perf magic numbers.

Change the function name from check_perf_magic to more meaningful
is_perf_magic as suggested by acme.

Signed-off-by: Feng Tang 
Cc: Andi Kleen 
Cc: Ingo Molnar 
Cc: Namhyung Kim 
Cc: Peter Zijlstra 
Link: 
http://lkml.kernel.org/r/1351569369-26732-7-git-send-email-feng.t...@intel.com
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/perf/util/header.c |   10 ++
 tools/perf/util/header.h |1 +
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 514ed1b..195a47a 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2341,6 +2341,16 @@ static int try_all_pipe_abis(uint64_t hdr_sz, struct 
perf_header *ph)
return -1;
 }
 
+bool is_perf_magic(u64 magic)
+{
+   if (!memcmp(, __perf_magic1, sizeof(magic))
+   || magic == __perf_magic2
+   || magic == __perf_magic2_sw)
+   return true;
+
+   return false;
+}
+
 static int check_magic_endian(u64 magic, uint64_t hdr_sz,
  bool is_pipe, struct perf_header *ph)
 {
diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h
index 879d215..5f1cd68 100644
--- a/tools/perf/util/header.h
+++ b/tools/perf/util/header.h
@@ -154,6 +154,7 @@ int perf_event__synthesize_build_id(struct perf_tool *tool,
 int perf_event__process_build_id(struct perf_tool *tool,
 union perf_event *event,
 struct perf_session *session);
+bool is_perf_magic(u64 magic);
 
 /*
  * arch specific callback
--
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/

[tip:perf/core] perf header: Add is_perf_magic() func

2012-10-30 Thread tip-bot for Feng Tang 
Commit-ID:  e84ba4e26833991d1c1c15a592b1474ee2b6dfdb
Gitweb: http://git.kernel.org/tip/e84ba4e26833991d1c1c15a592b1474ee2b6dfdb
Author: Feng Tang feng.t...@intel.com
AuthorDate: Tue, 30 Oct 2012 11:56:07 +0800
Committer:  Arnaldo Carvalho de Melo a...@redhat.com
CommitDate: Mon, 29 Oct 2012 11:56:59 -0200

perf header: Add is_perf_magic() func

With this function, other modules can basically check whether a file is
a legal perf data file by checking its first 8 bytes against all
possible perf magic numbers.

Change the function name from check_perf_magic to more meaningful
is_perf_magic as suggested by acme.

Signed-off-by: Feng Tang feng.t...@intel.com
Cc: Andi Kleen a...@firstfloor.org
Cc: Ingo Molnar mi...@elte.hu
Cc: Namhyung Kim namhy...@kernel.org
Cc: Peter Zijlstra pet...@infradead.org
Link: 
http://lkml.kernel.org/r/1351569369-26732-7-git-send-email-feng.t...@intel.com
Signed-off-by: Arnaldo Carvalho de Melo a...@redhat.com
---
 tools/perf/util/header.c |   10 ++
 tools/perf/util/header.h |1 +
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 514ed1b..195a47a 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2341,6 +2341,16 @@ static int try_all_pipe_abis(uint64_t hdr_sz, struct 
perf_header *ph)
return -1;
 }
 
+bool is_perf_magic(u64 magic)
+{
+   if (!memcmp(magic, __perf_magic1, sizeof(magic))
+   || magic == __perf_magic2
+   || magic == __perf_magic2_sw)
+   return true;
+
+   return false;
+}
+
 static int check_magic_endian(u64 magic, uint64_t hdr_sz,
  bool is_pipe, struct perf_header *ph)
 {
diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h
index 879d215..5f1cd68 100644
--- a/tools/perf/util/header.h
+++ b/tools/perf/util/header.h
@@ -154,6 +154,7 @@ int perf_event__synthesize_build_id(struct perf_tool *tool,
 int perf_event__process_build_id(struct perf_tool *tool,
 union perf_event *event,
 struct perf_session *session);
+bool is_perf_magic(u64 magic);
 
 /*
  * arch specific callback
--
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/