From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932218AbbBZLeG (ORCPT ); Thu, 26 Feb 2015 06:34:06 -0500 Received: from terminus.zytor.com ([198.137.202.10]:52191 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753184AbbBZLeC (ORCPT ); Thu, 26 Feb 2015 06:34:02 -0500 Date: Thu, 26 Feb 2015 03:33:11 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: mingo@kernel.org, adrian.hunter@intel.com, jolsa@redhat.com, bp@suse.de, fweisbec@gmail.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, acme@redhat.com, dzickus@redhat.com, eranian@google.com, tglx@linutronix.de, peterz@infradead.org, efault@gmx.de, namhyung@kernel.org, hpa@zytor.com Reply-To: jolsa@redhat.com, bp@suse.de, mingo@kernel.org, adrian.hunter@intel.com, dzickus@redhat.com, tglx@linutronix.de, peterz@infradead.org, eranian@google.com, efault@gmx.de, namhyung@kernel.org, hpa@zytor.com, fweisbec@gmail.com, dsahern@gmail.com, acme@redhat.com, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf session: Remove wrappers to machines__find Git-Commit-ID: 54245fdc357613633954bfd38cffb71cb9def067 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: 54245fdc357613633954bfd38cffb71cb9def067 Gitweb: http://git.kernel.org/tip/54245fdc357613633954bfd38cffb71cb9def067 Author: Arnaldo Carvalho de Melo AuthorDate: Sat, 14 Feb 2015 14:26:15 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Sun, 22 Feb 2015 22:22:41 -0300 perf session: Remove wrappers to machines__find Start to untangle session from delivering samples, as there are tools that want to use ordered_events and don't use perf_session at all. 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-rn4pk3pjxd78sgzrkn19tktp@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/session.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 504b7e6..fac08e1 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -797,8 +797,7 @@ static void dump_sample(struct perf_evsel *evsel, union perf_event *event, sample_read__printf(sample, evsel->attr.read_format); } -static struct machine * - perf_session__find_machine_for_cpumode(struct perf_session *session, +static struct machine *machines__find_for_cpumode(struct machines *machines, union perf_event *event, struct perf_sample *sample) { @@ -816,14 +815,13 @@ static struct machine * else pid = sample->pid; - machine = perf_session__find_machine(session, pid); + machine = machines__find(machines, pid); if (!machine) - machine = perf_session__findnew_machine(session, - DEFAULT_GUEST_KERNEL_ID); + machine = machines__find(machines, DEFAULT_GUEST_KERNEL_ID); return machine; } - return &session->machines.host; + return &machines->host; } static int deliver_sample_value(struct perf_session *session, @@ -907,8 +905,7 @@ int perf_session__deliver_event(struct perf_session *session, evsel = perf_evlist__id2evsel(session->evlist, sample->id); - machine = perf_session__find_machine_for_cpumode(session, event, - sample); + machine = machines__find_for_cpumode(&session->machines, event, sample); switch (event->header.type) { case PERF_RECORD_SAMPLE: