diff options
author | Adrian Hunter <adrian.hunter@intel.com> | 2013-08-27 04:23:06 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-08-29 14:29:28 -0400 |
commit | ef89325f773bc9f2f4e6019bd7f3d968ba85df9a (patch) | |
tree | a862b5eb16fa66c32558244796cb32264ca5af1f /tools/perf/util/session.c | |
parent | 07940293ba7a43070cdebda952b0e6025d80a383 (diff) |
perf tools: Remove references to struct ip_event
The ip_event struct assumes fixed positions for ip, pid and tid. That
is no longer true with the addition of PERF_SAMPLE_IDENTIFIER. The
information is anyway in struct sample, so use that instead.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1377591794-30553-5-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/session.c')
-rw-r--r-- | tools/perf/util/session.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 07590c3c68b8..c3ac483be48e 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c | |||
@@ -840,7 +840,8 @@ static void dump_sample(struct perf_evsel *evsel, union perf_event *event, | |||
840 | 840 | ||
841 | static struct machine * | 841 | static struct machine * |
842 | perf_session__find_machine_for_cpumode(struct perf_session *session, | 842 | perf_session__find_machine_for_cpumode(struct perf_session *session, |
843 | union perf_event *event) | 843 | union perf_event *event, |
844 | struct perf_sample *sample) | ||
844 | { | 845 | { |
845 | const u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK; | 846 | const u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK; |
846 | 847 | ||
@@ -852,7 +853,7 @@ static struct machine * | |||
852 | if (event->header.type == PERF_RECORD_MMAP) | 853 | if (event->header.type == PERF_RECORD_MMAP) |
853 | pid = event->mmap.pid; | 854 | pid = event->mmap.pid; |
854 | else | 855 | else |
855 | pid = event->ip.pid; | 856 | pid = sample->pid; |
856 | 857 | ||
857 | return perf_session__findnew_machine(session, pid); | 858 | return perf_session__findnew_machine(session, pid); |
858 | } | 859 | } |
@@ -958,7 +959,8 @@ static int perf_session_deliver_event(struct perf_session *session, | |||
958 | hists__inc_nr_events(&evsel->hists, event->header.type); | 959 | hists__inc_nr_events(&evsel->hists, event->header.type); |
959 | } | 960 | } |
960 | 961 | ||
961 | machine = perf_session__find_machine_for_cpumode(session, event); | 962 | machine = perf_session__find_machine_for_cpumode(session, event, |
963 | sample); | ||
962 | 964 | ||
963 | switch (event->header.type) { | 965 | switch (event->header.type) { |
964 | case PERF_RECORD_SAMPLE: | 966 | case PERF_RECORD_SAMPLE: |