2017-07-27 16:16:06

by Taeung Song

Subject: [PATCH v4 2/9] perf annotate: Initialize proper width for first column

When using --show-total-period or not,
set the width value for first column.

Suggested-by: Arnaldo Carvalho de Melo <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Jiri Olsa <[email protected]>
Signed-off-by: Taeung Song <[email protected]>
---
tools/perf/util/annotate.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 5963764..5125c2b 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1165,7 +1165,7 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st
} else if (max_lines && printed >= max_lines)
return 1;
else {
- int width = 8;
+ int width = symbol_conf.show_total_period ? 12 : 8;

if (queue)
return -1;
@@ -1806,7 +1806,7 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map,
int printed = 2, queue_len = 0;
int more = 0;
u64 len;
- int width = 8;
+ int width = symbol_conf.show_total_period ? 12 : 8;
int graph_dotted_len;

filename = strdup(dso->long_name);
--
2.7.4

2017-07-27 16:54:43

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH v4 2/9] perf annotate: Initialize proper width for first column

Em Fri, Jul 28, 2017 at 01:15:56AM +0900, Taeung Song escreveu:
> When using --show-total-period or not,
> set the width value for first column.
>
> Suggested-by: Arnaldo Carvalho de Melo <[email protected]>
> Cc: Namhyung Kim <[email protected]>
> Cc: Jiri Olsa <[email protected]>
> Signed-off-by: Taeung Song <[email protected]>
> ---
> tools/perf/util/annotate.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index 5963764..5125c2b 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -1165,7 +1165,7 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st
> } else if (max_lines && printed >= max_lines)
> return 1;
> else {
> - int width = 8;
> + int width = symbol_conf.show_total_period ? 12 : 8;
>
> if (queue)
> return -1;
> @@ -1806,7 +1806,7 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map,
> int printed = 2, queue_len = 0;
> int more = 0;
> u64 len;
> - int width = 8;
> + int width = symbol_conf.show_total_period ? 12 : 8;
> int graph_dotted_len;

Already at:

https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git/commit/?h=perf/core&id=ce9ee4a2de20062a97ad50ecc11ebda7e7618fd1

- Arnaldo