From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754647AbcHXJUK (ORCPT ); Wed, 24 Aug 2016 05:20:10 -0400 Received: from terminus.zytor.com ([198.137.202.10]:43838 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752916AbcHXJUE (ORCPT ); Wed, 24 Aug 2016 05:20:04 -0400 Date: Wed, 24 Aug 2016 02:19:10 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: hpa@zytor.com, jolsa@kernel.org, namhyung@kernel.org, tglx@linutronix.de, dsahern@gmail.com, a.p.zijlstra@chello.nl, mingo@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com Reply-To: linux-kernel@vger.kernel.org, acme@redhat.com, mingo@kernel.org, a.p.zijlstra@chello.nl, tglx@linutronix.de, dsahern@gmail.com, hpa@zytor.com, namhyung@kernel.org, jolsa@kernel.org In-Reply-To: <1470583710-1649-2-git-send-email-jolsa@kernel.org> References: <1470583710-1649-2-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists: Introduce nr_header_lines into struct perf_hpp_list Git-Commit-ID: f8e6710de859e1ac3a5df294bddeca19f60cec9a 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: f8e6710de859e1ac3a5df294bddeca19f60cec9a Gitweb: http://git.kernel.org/tip/f8e6710de859e1ac3a5df294bddeca19f60cec9a Author: Jiri Olsa AuthorDate: Sun, 7 Aug 2016 17:28:26 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 23 Aug 2016 15:37:33 -0300 perf hists: Introduce nr_header_lines into struct perf_hpp_list Currently we support just single line headers, this is first step to allow more. Store the number of header lines in perf_hpp_list, which encompasses all the display/sort entries and is thus suitable to hold this value. Signed-off-by: Jiri Olsa Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1470583710-1649-2-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/hists.c | 15 ++++++++++++--- tools/perf/ui/hist.c | 1 + tools/perf/util/hist.h | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 13d4143..95f7cf1 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -69,8 +69,11 @@ static u32 hist_browser__nr_entries(struct hist_browser *hb) static void hist_browser__update_rows(struct hist_browser *hb) { struct ui_browser *browser = &hb->b; - u16 header_offset = hb->show_headers ? 1 : 0, index_row; + struct hists *hists = hb->hists; + struct perf_hpp_list *hpp_list = hists->hpp_list; + u16 header_offset, index_row; + header_offset = hb->show_headers ? hpp_list->nr_header_lines : 0; browser->rows = browser->height - header_offset; /* * Verify if we were at the last line and that line isn't @@ -99,8 +102,11 @@ static void hist_browser__refresh_dimensions(struct ui_browser *browser) static void hist_browser__gotorc(struct hist_browser *browser, int row, int column) { - u16 header_offset = browser->show_headers ? 1 : 0; + struct hists *hists = browser->hists; + struct perf_hpp_list *hpp_list = hists->hpp_list; + u16 header_offset; + header_offset = browser->show_headers ? hpp_list->nr_header_lines : 0; ui_browser__gotorc(&browser->b, row + header_offset, column); } @@ -1656,10 +1662,13 @@ static unsigned int hist_browser__refresh(struct ui_browser *browser) u16 header_offset = 0; struct rb_node *nd; struct hist_browser *hb = container_of(browser, struct hist_browser, b); + struct hists *hists = hb->hists; if (hb->show_headers) { + struct perf_hpp_list *hpp_list = hists->hpp_list; + hist_browser__show_headers(hb); - header_offset = 1; + header_offset = hpp_list->nr_header_lines; } ui_browser__hists_init_top(browser); diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c index 4274969..be7a17f 100644 --- a/tools/perf/ui/hist.c +++ b/tools/perf/ui/hist.c @@ -441,6 +441,7 @@ struct perf_hpp_fmt perf_hpp__format[] = { struct perf_hpp_list perf_hpp_list = { .fields = LIST_HEAD_INIT(perf_hpp_list.fields), .sorts = LIST_HEAD_INIT(perf_hpp_list.sorts), + .nr_header_lines = 1, }; #undef HPP__COLOR_PRINT_FNS diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index 0a1edf1..8cc5d33 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -259,6 +259,7 @@ struct perf_hpp_list { struct list_head fields; struct list_head sorts; + int nr_header_lines; int need_collapse; int parent; int sym;