Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751894AbdIMHra (ORCPT ); Wed, 13 Sep 2017 03:47:30 -0400 Received: from terminus.zytor.com ([65.50.211.136]:59971 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750776AbdIMHr0 (ORCPT ); Wed, 13 Sep 2017 03:47:26 -0400 Date: Wed, 13 Sep 2017 00:45:16 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, a.p.zijlstra@chello.nl, acme@redhat.com, hpa@zytor.com, mingo@kernel.org, dsahern@gmail.com, jolsa@kernel.org, namhyung@kernel.org Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, acme@redhat.com, a.p.zijlstra@chello.nl, mingo@kernel.org, hpa@zytor.com, dsahern@gmail.com, jolsa@kernel.org, namhyung@kernel.org In-Reply-To: <20170908120510.22515-3-jolsa@kernel.org> References: <20170908120510.22515-3-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf ui progress: Fix progress update Git-Commit-ID: a82bfd041d0ec41861a7adda4c078993f2f9c452 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 Content-Length: 1697 Lines: 52 Commit-ID: a82bfd041d0ec41861a7adda4c078993f2f9c452 Gitweb: http://git.kernel.org/tip/a82bfd041d0ec41861a7adda4c078993f2f9c452 Author: Jiri Olsa AuthorDate: Fri, 8 Sep 2017 14:05:08 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 12 Sep 2017 12:34:54 -0300 perf ui progress: Fix progress update We currently update the 'next' variable only with a single step value. But it's possible the 'adv' update is bigger than single 'step' value. This would leave 'next' value under counted and force unnecessary ui_progress__ops->update calls. Calculate the amount of steps we need for 'adv' update and increase the 'next' with that amounts of steps. Signed-off-by: Jiri Olsa Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20170908120510.22515-3-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/progress.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/perf/ui/progress.c b/tools/perf/ui/progress.c index a9c1580..ae91c81 100644 --- a/tools/perf/ui/progress.c +++ b/tools/perf/ui/progress.c @@ -1,3 +1,4 @@ +#include #include "../cache.h" #include "progress.h" @@ -14,10 +15,14 @@ struct ui_progress_ops *ui_progress__ops = &null_progress__ops; void ui_progress__update(struct ui_progress *p, u64 adv) { + u64 last = p->curr; + p->curr += adv; if (p->curr >= p->next) { - p->next += p->step; + u64 nr = DIV_ROUND_UP(p->curr - last, p->step); + + p->next += nr * p->step; ui_progress__ops->update(p); } }