diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-02-14 13:08:51 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-02-22 20:23:46 -0500 |
commit | 9fa8727aa4d98d35ca50ef9cd8a50c6468af921d (patch) | |
tree | f6f784e76866d73ab7881d31ef96308097a63332 /tools | |
parent | 313e53b08e99b1dacf9ea2b0fbe97890db1ea95f (diff) |
perf session: Remove perf_session from dump_event
All it wants is session->evlist.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-6w9663gka3jb1j1rfxxd5jcq@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/util/session.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 0133d01d51bd..e4f166981ff0 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c | |||
@@ -688,14 +688,14 @@ static void stack_user__printf(struct stack_dump *dump) | |||
688 | dump->size, dump->offset); | 688 | dump->size, dump->offset); |
689 | } | 689 | } |
690 | 690 | ||
691 | static void perf_session__print_tstamp(struct perf_session *session, | 691 | static void perf_evlist__print_tstamp(struct perf_evlist *evlist, |
692 | union perf_event *event, | 692 | union perf_event *event, |
693 | struct perf_sample *sample) | 693 | struct perf_sample *sample) |
694 | { | 694 | { |
695 | u64 sample_type = __perf_evlist__combined_sample_type(session->evlist); | 695 | u64 sample_type = __perf_evlist__combined_sample_type(evlist); |
696 | 696 | ||
697 | if (event->header.type != PERF_RECORD_SAMPLE && | 697 | if (event->header.type != PERF_RECORD_SAMPLE && |
698 | !perf_evlist__sample_id_all(session->evlist)) { | 698 | !perf_evlist__sample_id_all(evlist)) { |
699 | fputs("-1 -1 ", stdout); | 699 | fputs("-1 -1 ", stdout); |
700 | return; | 700 | return; |
701 | } | 701 | } |
@@ -737,7 +737,7 @@ static void sample_read__printf(struct perf_sample *sample, u64 read_format) | |||
737 | sample->read.one.id, sample->read.one.value); | 737 | sample->read.one.id, sample->read.one.value); |
738 | } | 738 | } |
739 | 739 | ||
740 | static void dump_event(struct perf_session *session, union perf_event *event, | 740 | static void dump_event(struct perf_evlist *evlist, union perf_event *event, |
741 | u64 file_offset, struct perf_sample *sample) | 741 | u64 file_offset, struct perf_sample *sample) |
742 | { | 742 | { |
743 | if (!dump_trace) | 743 | if (!dump_trace) |
@@ -749,7 +749,7 @@ static void dump_event(struct perf_session *session, union perf_event *event, | |||
749 | trace_event(event); | 749 | trace_event(event); |
750 | 750 | ||
751 | if (sample) | 751 | if (sample) |
752 | perf_session__print_tstamp(session, event, sample); | 752 | perf_evlist__print_tstamp(evlist, event, sample); |
753 | 753 | ||
754 | printf("%#" PRIx64 " [%#x]: PERF_RECORD_%s", file_offset, | 754 | printf("%#" PRIx64 " [%#x]: PERF_RECORD_%s", file_offset, |
755 | event->header.size, perf_event__name(event->header.type)); | 755 | event->header.size, perf_event__name(event->header.type)); |
@@ -901,7 +901,7 @@ int perf_session__deliver_event(struct perf_session *session, | |||
901 | struct perf_evsel *evsel; | 901 | struct perf_evsel *evsel; |
902 | struct machine *machine; | 902 | struct machine *machine; |
903 | 903 | ||
904 | dump_event(session, event, file_offset, sample); | 904 | dump_event(evlist, event, file_offset, sample); |
905 | 905 | ||
906 | evsel = perf_evlist__id2evsel(evlist, sample->id); | 906 | evsel = perf_evlist__id2evsel(evlist, sample->id); |
907 | 907 | ||
@@ -953,7 +953,7 @@ static s64 perf_session__process_user_event(struct perf_session *session, | |||
953 | int fd = perf_data_file__fd(session->file); | 953 | int fd = perf_data_file__fd(session->file); |
954 | int err; | 954 | int err; |
955 | 955 | ||
956 | dump_event(session, event, file_offset, NULL); | 956 | dump_event(session->evlist, event, file_offset, NULL); |
957 | 957 | ||
958 | /* These events are processed right away */ | 958 | /* These events are processed right away */ |
959 | switch (event->header.type) { | 959 | switch (event->header.type) { |