From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751903AbeCYWLy (ORCPT ); Sun, 25 Mar 2018 18:11:54 -0400 Received: from terminus.zytor.com ([198.137.202.136]:43685 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750788AbeCYWLx (ORCPT ); Sun, 25 Mar 2018 18:11:53 -0400 Date: Sun, 25 Mar 2018 15:11:43 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: yao.jin@linux.intel.com, wangnan0@huawei.com, hpa@zytor.com, linux-kernel@vger.kernel.org, acme@redhat.com, tglx@linutronix.de, namhyung@kernel.org, jolsa@kernel.org, mingo@kernel.org, dsahern@gmail.com, adrian.hunter@intel.com, ak@linux.intel.com Reply-To: mingo@kernel.org, jolsa@kernel.org, ak@linux.intel.com, adrian.hunter@intel.com, dsahern@gmail.com, wangnan0@huawei.com, yao.jin@linux.intel.com, namhyung@kernel.org, acme@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf annotate: Move pcnt_with() to the annotation library Git-Commit-ID: 6af612d2b10593cdd8bba4427741a981bdd57c86 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: 6af612d2b10593cdd8bba4427741a981bdd57c86 Gitweb: https://git.kernel.org/tip/6af612d2b10593cdd8bba4427741a981bdd57c86 Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 15 Mar 2018 12:41:39 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 20 Mar 2018 13:19:28 -0300 perf annotate: Move pcnt_with() to the annotation library Out of the TUI code, since now all it touches is what is in 'struct annotation'. Cc: Adrian Hunter Cc: Andi Kleen Cc: David Ahern Cc: Jin Yao Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: https://lkml.kernel.org/n/tip-kh5bbbgd7l4agv9oc5hnw0ui@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/annotate.c | 14 +++----------- tools/perf/util/annotate.h | 5 +++++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index b20e0ae72466..3b030ee4505f 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c @@ -96,13 +96,6 @@ static int annotate_browser__set_jumps_percent_color(struct annotate_browser *br return ui_browser__set_color(&browser->b, color); } -static int annotate_browser__pcnt_width(struct annotate_browser *ab) -{ - struct map_symbol *ms = ab->b.priv; - struct annotation *notes = symbol__annotation(ms->sym); - return (notes->options->show_total_period ? 12 : 7) * notes->nr_events; -} - static void disasm_line__write(struct disasm_line *dl, struct ui_browser *browser, char *bf, size_t size) { @@ -145,7 +138,7 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int (!current_entry || (browser->use_navkeypressed && !browser->navkeypressed))); int width = browser->width, printed; - int i, pcnt_width = annotate_browser__pcnt_width(ab), + int i, pcnt_width = annotation__pcnt_width(notes), cycles_width = annotation__cycles_width(notes); double percent_max = 0.0; char bf[256]; @@ -310,7 +303,7 @@ static void annotate_browser__draw_current_jump(struct ui_browser *browser) struct map_symbol *ms = ab->b.priv; struct symbol *sym = ms->sym; struct annotation *notes = symbol__annotation(sym); - u8 pcnt_width = annotate_browser__pcnt_width(ab); + u8 pcnt_width = annotation__pcnt_width(notes); int width; /* PLT symbols contain external offsets */ @@ -375,11 +368,10 @@ static void annotate_browser__draw_current_jump(struct ui_browser *browser) static unsigned int annotate_browser__refresh(struct ui_browser *browser) { - struct annotate_browser *ab = container_of(browser, struct annotate_browser, b); struct map_symbol *ms = browser->priv; struct annotation *notes = symbol__annotation(ms->sym); int ret = ui_browser__list_head_refresh(browser); - int pcnt_width = annotate_browser__pcnt_width(ab); + int pcnt_width = annotation__pcnt_width(notes); if (notes->options->jump_arrows) annotate_browser__draw_current_jump(browser); diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index 5936605b5dac..17cd5d274fe5 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h @@ -176,6 +176,11 @@ static inline int annotation__cycles_width(struct annotation *notes) return notes->have_cycles ? ANNOTATION__IPC_WIDTH + ANNOTATION__CYCLES_WIDTH : 0; } +static inline int annotation__pcnt_width(struct annotation *notes) +{ + return (notes->options->show_total_period ? 12 : 7) * notes->nr_events; +} + void annotation__compute_ipc(struct annotation *notes, size_t size); static inline struct sym_hist *annotation__histogram(struct annotation *notes, int idx)