From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753949AbbBZLfT (ORCPT ); Thu, 26 Feb 2015 06:35:19 -0500 Received: from terminus.zytor.com ([198.137.202.10]:52278 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932083AbbBZLfQ (ORCPT ); Thu, 26 Feb 2015 06:35:16 -0500 Date: Thu, 26 Feb 2015 03:34:35 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: adrian.hunter@intel.com, bp@suse.de, dzickus@redhat.com, hpa@zytor.com, acme@redhat.com, peterz@infradead.org, fweisbec@gmail.com, jolsa@redhat.com, tglx@linutronix.de, eranian@google.com, mingo@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, dsahern@gmail.com, efault@gmx.de Reply-To: dzickus@redhat.com, adrian.hunter@intel.com, bp@suse.de, hpa@zytor.com, acme@redhat.com, peterz@infradead.org, fweisbec@gmail.com, jolsa@redhat.com, tglx@linutronix.de, mingo@kernel.org, eranian@google.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, efault@gmx.de, dsahern@gmail.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf ordered_events: Stop using tool-> ordered_events Git-Commit-ID: 280836812f5f821d26393268010f211160874810 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: 280836812f5f821d26393268010f211160874810 Gitweb: http://git.kernel.org/tip/280836812f5f821d26393268010f211160874810 Author: Arnaldo Carvalho de Melo AuthorDate: Sun, 22 Feb 2015 13:52:47 -0800 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 23 Feb 2015 11:39:38 -0300 perf ordered_events: Stop using tool->ordered_events To figure out if ordered_events are being used when doing a flush operation, it is enough to check if there were in fact some events queued, i.e. look at oe->nr_events. 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-1c5r404vy766kt5nflv88uag@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/ordered-events.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/ordered-events.c b/tools/perf/util/ordered-events.c index fd4be94..077ddd2 100644 --- a/tools/perf/util/ordered-events.c +++ b/tools/perf/util/ordered-events.c @@ -166,7 +166,7 @@ static int __ordered_events__flush(struct perf_session *s, struct ui_progress prog; int ret; - if (!tool->ordered_events || !limit) + if (!limit) return 0; if (show_progress) @@ -216,6 +216,9 @@ int ordered_events__flush(struct perf_session *s, struct perf_tool *tool, }; int err; + if (oe->nr_events == 0) + return 0; + switch (how) { case OE_FLUSH__FINAL: oe->next_flush = ULLONG_MAX;