linux-kernel.vger.kernel.org archive mirror
 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, Namhyung Kim <namhyung@kernel.org>,
	Andi Kleen <andi@firstfloor.org>, Jiri Olsa <jolsa@kernel.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 11/22] perf ui/stdio: Rename print_hierarchy_header()
Date: Tue, 20 Sep 2016 17:03:31 -0300	[thread overview]
Message-ID: <1474401822-18902-12-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1474401822-18902-1-git-send-email-acme@kernel.org>

From: Namhyung Kim <namhyung@kernel.org>

Now the hists__fprintf_hierarchy_headers() is a simple wrapper passing
field separator.  Let's do it directly.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20160913074552.13284-6-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/ui/stdio/hist.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
index 18b4fd9342cd..a57131e61fe3 100644
--- a/tools/perf/ui/stdio/hist.c
+++ b/tools/perf/ui/stdio/hist.c
@@ -528,8 +528,8 @@ static int print_hierarchy_indent(const char *sep, int indent,
 	return fprintf(fp, "%-.*s", (indent - 2) * HIERARCHY_INDENT, line);
 }
 
-static int print_hierarchy_header(struct hists *hists, struct perf_hpp *hpp,
-				  const char *sep, FILE *fp)
+static int hists__fprintf_hierarchy_headers(struct hists *hists,
+					    struct perf_hpp *hpp, FILE *fp)
 {
 	bool first_node, first_col;
 	int indent;
@@ -538,6 +538,7 @@ static int print_hierarchy_header(struct hists *hists, struct perf_hpp *hpp,
 	unsigned header_width = 0;
 	struct perf_hpp_fmt *fmt;
 	struct perf_hpp_list_node *fmt_node;
+	const char *sep = symbol_conf.field_sep;
 
 	indent = hists->nr_hpp_node;
 
@@ -623,14 +624,6 @@ static int print_hierarchy_header(struct hists *hists, struct perf_hpp *hpp,
 	return 2;
 }
 
-static int
-hists__fprintf_hierarchy_headers(struct hists *hists,
-				 struct perf_hpp *hpp,
-				 FILE *fp)
-{
-	return print_hierarchy_header(hists, hpp, symbol_conf.field_sep, fp);
-}
-
 static void fprintf_line(struct hists *hists, struct perf_hpp *hpp,
 			 int line, FILE *fp)
 {
-- 
2.7.4

  parent reply	other threads:[~2016-09-20 20:08 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-20 20:03 [GIT PULL 00/22] perf/core improvements and fixes Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 01/22] perf probe: Fix dwarf regs table for x86_64 Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 02/22] perf hists browser: Fix event group display Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 03/22] tools include: Add uapi mman.h for each architecture Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 04/22] perf trace beauty mmap: Fix defines for non !x86_64 Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 05/22] perf tools: Do hugetlb handling in more systems Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 06/22] perf build: Compare mman.h related headers against kernel originals Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 07/22] perf hists: Introduce hists__match_hierarchy() Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 08/22] perf hists: Introduce hists__link_hierarchy() Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 09/22] perf hist: Initialize hierarchy tree explicitly Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 10/22] perf ui/stdio: Always reset output width for hierarchy Arnaldo Carvalho de Melo
2016-09-20 20:03 ` Arnaldo Carvalho de Melo [this message]
2016-09-20 20:03 ` [PATCH 12/22] perf report: Enable group view with hierarchy Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 13/22] perf tools: Add infrastructure for PMU specific configuration Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 14/22] perf trace beauty mmap: Add missing MADV_FREE Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 15/22] tools include: Add mman macros needed by perf for all arch Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 16/22] perf hists: Fix width computation for srcline sort entry Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 17/22] perf annotate: Do not ignore call instruction with indirect target Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 18/22] perf annotate: Pass the symbol's map/dso to the instruction parsers Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 19/22] perf annotate: Resolve 'call' operands to function names Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 20/22] perf ui/tui: Reset output width for hierarchy Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 21/22] perf hists: Factor out hists__reset_column_width() Arnaldo Carvalho de Melo
2016-09-20 20:03 ` [PATCH 22/22] perf symbols: Do not open device files Arnaldo Carvalho de Melo
2016-09-20 21:34 ` [GIT PULL 00/22] perf/core 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=1474401822-18902-12-git-send-email-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=andi@firstfloor.org \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.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;
as well as URLs for NNTP newsgroup(s).