From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932320AbbBZLfG (ORCPT ); Thu, 26 Feb 2015 06:35:06 -0500 Received: from terminus.zytor.com ([198.137.202.10]:52260 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932083AbbBZLfC (ORCPT ); Thu, 26 Feb 2015 06:35:02 -0500 Date: Thu, 26 Feb 2015 03:34:19 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: adrian.hunter@intel.com, dzickus@redhat.com, eranian@google.com, acme@redhat.com, linux-kernel@vger.kernel.org, efault@gmx.de, hpa@zytor.com, bp@suse.de, jolsa@redhat.com, fweisbec@gmail.com, namhyung@kernel.org, dsahern@gmail.com, mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org Reply-To: fweisbec@gmail.com, jolsa@redhat.com, bp@suse.de, hpa@zytor.com, efault@gmx.de, tglx@linutronix.de, peterz@infradead.org, dsahern@gmail.com, mingo@kernel.org, namhyung@kernel.org, eranian@google.com, dzickus@redhat.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, acme@redhat.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf session: Remove perf_session from dump_event Git-Commit-ID: 9fa8727aa4d98d35ca50ef9cd8a50c6468af921d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 9fa8727aa4d98d35ca50ef9cd8a50c6468af921d Gitweb: http://git.kernel.org/tip/9fa8727aa4d98d35ca50ef9cd8a50c6468af921d Author: Arnaldo Carvalho de Melo AuthorDate: Sat, 14 Feb 2015 15:08:51 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Sun, 22 Feb 2015 22:23:46 -0300 perf session: Remove perf_session from dump_event All it wants is session->evlist. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Mike Galbraith Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-6w9663gka3jb1j1rfxxd5jcq@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/session.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 0133d01..e4f1669 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) dump->size, dump->offset); } -static void perf_session__print_tstamp(struct perf_session *session, +static void perf_evlist__print_tstamp(struct perf_evlist *evlist, union perf_event *event, struct perf_sample *sample) { - u64 sample_type = __perf_evlist__combined_sample_type(session->evlist); + u64 sample_type = __perf_evlist__combined_sample_type(evlist); if (event->header.type != PERF_RECORD_SAMPLE && - !perf_evlist__sample_id_all(session->evlist)) { + !perf_evlist__sample_id_all(evlist)) { fputs("-1 -1 ", stdout); return; } @@ -737,7 +737,7 @@ static void sample_read__printf(struct perf_sample *sample, u64 read_format) sample->read.one.id, sample->read.one.value); } -static void dump_event(struct perf_session *session, union perf_event *event, +static void dump_event(struct perf_evlist *evlist, union perf_event *event, u64 file_offset, struct perf_sample *sample) { if (!dump_trace) @@ -749,7 +749,7 @@ static void dump_event(struct perf_session *session, union perf_event *event, trace_event(event); if (sample) - perf_session__print_tstamp(session, event, sample); + perf_evlist__print_tstamp(evlist, event, sample); printf("%#" PRIx64 " [%#x]: PERF_RECORD_%s", file_offset, event->header.size, perf_event__name(event->header.type)); @@ -901,7 +901,7 @@ int perf_session__deliver_event(struct perf_session *session, struct perf_evsel *evsel; struct machine *machine; - dump_event(session, event, file_offset, sample); + dump_event(evlist, event, file_offset, sample); evsel = perf_evlist__id2evsel(evlist, sample->id); @@ -953,7 +953,7 @@ static s64 perf_session__process_user_event(struct perf_session *session, int fd = perf_data_file__fd(session->file); int err; - dump_event(session, event, file_offset, NULL); + dump_event(session->evlist, event, file_offset, NULL); /* These events are processed right away */ switch (event->header.type) {