From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1DF32C43387 for ; Fri, 14 Dec 2018 21:01:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 58AB82086D for ; Fri, 14 Dec 2018 21:01:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731225AbeLNVBk (ORCPT ); Fri, 14 Dec 2018 16:01:40 -0500 Received: from terminus.zytor.com ([198.137.202.136]:47099 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731063AbeLNVBi (ORCPT ); Fri, 14 Dec 2018 16:01:38 -0500 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id wBEL18eP1460337 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 14 Dec 2018 13:01:08 -0800 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id wBEL18Aj1460334; Fri, 14 Dec 2018 13:01:08 -0800 Date: Fri, 14 Dec 2018 13:01:08 -0800 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Jiri Olsa Message-ID: Cc: ldv@altlinux.org, peterz@infradead.org, rostedt@goodmis.org, fweisbec@gmail.com, acme@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, namhyung@kernel.org, jolsa@kernel.org, hpa@zytor.com, mingo@kernel.org, lclaudio@uudg.org, alexander.shishkin@linux.intel.com, esyr@redhat.com Reply-To: alexander.shishkin@linux.intel.com, esyr@redhat.com, acme@redhat.com, linux-kernel@vger.kernel.org, fweisbec@gmail.com, rostedt@goodmis.org, peterz@infradead.org, ldv@altlinux.org, lclaudio@uudg.org, hpa@zytor.com, mingo@kernel.org, jolsa@kernel.org, namhyung@kernel.org, tglx@linutronix.de In-Reply-To: <20181205160509.1168-8-jolsa@kernel.org> References: <20181205160509.1168-8-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace: Move event delivery to a new deliver_event() function Git-Commit-ID: b2595c9b1e5ad11db05c6767e6d00cd03d76c96e 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b2595c9b1e5ad11db05c6767e6d00cd03d76c96e Gitweb: https://git.kernel.org/tip/b2595c9b1e5ad11db05c6767e6d00cd03d76c96e Author: Jiri Olsa AuthorDate: Wed, 5 Dec 2018 17:05:08 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 6 Dec 2018 16:43:28 -0300 perf trace: Move event delivery to a new deliver_event() function Mov event delivery code to a new trace__deliver_event() function, so it's easier to add ordered delivery coming in the following patches. Signed-off-by: Jiri Olsa Cc: Alexander Shishkin Cc: Dmitry Levin Cc: Eugene Syromiatnikov Cc: Frederic Weisbecker Cc: Luis Cláudio Gonçalves Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Steven Rostedt (VMware) Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20181205160509.1168-8-jolsa@kernel.org [ Add trace__ prefix to the deliver_event method ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 98aff12af9e6..3b6b1fecf2bb 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2637,6 +2637,21 @@ static int trace__set_filter_pids(struct trace *trace) return err; } +static int trace__deliver_event(struct trace *trace, union perf_event *event) +{ + struct perf_evlist *evlist = trace->evlist; + struct perf_sample sample; + int err; + + err = perf_evlist__parse_sample(evlist, event, &sample); + if (err) + fprintf(trace->output, "Can't parse sample, err = %d, skipping...\n", err); + else + trace__handle_event(trace, event, &sample); + + return 0; +} + static int trace__run(struct trace *trace, int argc, const char **argv) { struct perf_evlist *evlist = trace->evlist; @@ -2802,18 +2817,10 @@ again: continue; while ((event = perf_mmap__read_event(md)) != NULL) { - struct perf_sample sample; - ++trace->nr_events; - err = perf_evlist__parse_sample(evlist, event, &sample); - if (err) { - fprintf(trace->output, "Can't parse sample, err = %d, skipping...\n", err); - goto next_event; - } + trace__deliver_event(trace, event); - trace__handle_event(trace, event, &sample); -next_event: perf_mmap__consume(md); if (interrupted)