public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	Corey Ashford <cjashfor@linux.vnet.ibm.com>,
	David Ahern <dsahern@gmail.com>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Namhyung Kim <namhyung@kernel.org>,
	Paul Mackerras <paulus@samba.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 06/16] perf hists browser: Display columns header text on 'H' press
Date: Tue,  8 Jul 2014 16:02:54 -0300	[thread overview]
Message-ID: <1404846184-20075-7-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1404846184-20075-1-git-send-email-acme@kernel.org>

From: Jiri Olsa <jolsa@kernel.org>

Displaying columns header text whenever 'H' is pressed,
and hiding it on on another press.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-w9pcqpum5erza2a05ysvollz@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/ui/browsers/hists.c | 47 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 2be71bf17b71..5fa2e181ef0c 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -822,11 +822,54 @@ static int hist_browser__show_entry(struct hist_browser *browser,
 	return printed;
 }
 
+static int advance_hpp_check(struct perf_hpp *hpp, int inc)
+{
+	advance_hpp(hpp, inc);
+	return hpp->size <= 0;
+}
+
+static int hists__scnprintf_headers(char *buf, size_t size, struct hists *hists)
+{
+	struct perf_hpp dummy_hpp = {
+		.buf    = buf,
+		.size   = size,
+	};
+	struct perf_hpp_fmt *fmt;
+	size_t ret = 0;
+
+	if (symbol_conf.use_callchain) {
+		ret = scnprintf(buf, size, "  ");
+		if (advance_hpp_check(&dummy_hpp, ret))
+			return ret;
+	}
+
+	perf_hpp__for_each_format(fmt) {
+		if (perf_hpp__should_skip(fmt))
+			continue;
+
+		/* We need to add the length of the columns header. */
+		perf_hpp__reset_width(fmt, hists);
+
+		ret = fmt->header(fmt, &dummy_hpp, hists_to_evsel(hists));
+		if (advance_hpp_check(&dummy_hpp, ret))
+			break;
+
+		ret = scnprintf(dummy_hpp.buf, dummy_hpp.size, "  ");
+		if (advance_hpp_check(&dummy_hpp, ret))
+			break;
+	}
+
+	return ret;
+}
+
 static void hist_browser__show_headers(struct hist_browser *browser)
 {
+	char headers[1024];
+
+	hists__scnprintf_headers(headers, sizeof(headers), browser->hists);
 	ui_browser__gotorc(&browser->b, 0, 0);
 	ui_browser__set_color(&browser->b, HE_COLORSET_ROOT);
-	slsmg_write_nstring(" ", browser->b.width + 1);
+	slsmg_write_nstring(headers, browser->b.width + 1);
 }
 
 static void ui_browser__hists_init_top(struct ui_browser *browser)
@@ -1241,7 +1284,7 @@ static struct hist_browser *hist_browser__new(struct hists *hists)
 		browser->b.refresh_dimensions = hist_browser__refresh_dimensions;
 		browser->b.seek = ui_browser__hists_seek;
 		browser->b.use_navkeypressed = true;
-		browser->show_headers = false;
+		browser->show_headers = true;
 	}
 
 	return browser;
-- 
1.9.3


  parent reply	other threads:[~2014-07-08 19:03 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-08 19:02 [GIT PULL 00/16] perf/cor improvements and fixes Arnaldo Carvalho de Melo
2014-07-08 19:02 ` [PATCH 01/16] perf ui browser: Add ->rows to disambiguate from ->height Arnaldo Carvalho de Melo
2014-07-08 19:02 ` [PATCH 02/16] perf ui browser: Allow overriding refresh_dimensions method Arnaldo Carvalho de Melo
2014-07-08 19:02 ` [PATCH 03/16] perf hists browser: Introduce gotorc method Arnaldo Carvalho de Melo
2014-07-08 19:02 ` [PATCH 04/16] perf hists browser: Override ui_browser refresh_dimensions method Arnaldo Carvalho de Melo
2014-07-09 22:48   ` Jiri Olsa
2014-07-10 13:50     ` Arnaldo Carvalho de Melo
2014-07-08 19:02 ` [PATCH 05/16] perf hists browser: Add support for showing columns header Arnaldo Carvalho de Melo
2014-07-08 19:02 ` Arnaldo Carvalho de Melo [this message]
2014-07-08 19:02 ` [PATCH 07/16] perf hists browser: Add ui.show-headers config file option Arnaldo Carvalho de Melo
2014-07-08 19:02 ` [PATCH 08/16] perf hists browser: Left justify column headers Arnaldo Carvalho de Melo
2014-07-08 19:02 ` [PATCH 09/16] perf kvm: Introduce HAVE_KVM_STAT_SUPPORT flag Arnaldo Carvalho de Melo
2014-07-08 19:02 ` [PATCH 10/16] perf kvm: Simplify exit reasons tables definitions Arnaldo Carvalho de Melo
2014-07-08 19:02 ` [PATCH 11/16] perf kvm: Refactoring of cpu_isa_config() Arnaldo Carvalho de Melo
2014-07-08 19:03 ` [PATCH 12/16] perf tools: Allow to use cpuinfo on s390 Arnaldo Carvalho de Melo
2014-07-08 19:03 ` [PATCH 13/16] perf tools: Convert open coded equivalents to asprintf() Arnaldo Carvalho de Melo
2014-07-08 19:03 ` [PATCH 14/16] perf tools: Suggest using -f to override perf.data file ownership message Arnaldo Carvalho de Melo
2014-07-08 19:03 ` [PATCH 15/16] perf trace: Add pagefault statistics Arnaldo Carvalho de Melo
2014-07-08 19:03 ` [PATCH 16/16] perf trace: Fix build on 32-bit systems Arnaldo Carvalho de Melo
2014-07-16 11:47 ` [GIT PULL 00/16] perf/cor improvements and fixes Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1404846184-20075-7-git-send-email-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=cjashfor@linux.vnet.ibm.com \
    --cc=dsahern@gmail.com \
    --cc=fweisbec@gmail.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox