[tip:perf/core] perf annotate: Move line/offset into annotation_line struct

[tip-bot for Jiri Olsa]

Commit-ID:  d5490b9647e6e41b203186ed0d73b4103f139fda
Gitweb: https://git.kernel.org/tip/d5490b9647e6e41b203186ed0d73b4103f139fda
Author: Jiri Olsa 
AuthorDate: Wed, 11 Oct 2017 17:01:26 +0200
Committer:  Arnaldo Carvalho de Melo 
CommitDate: Mon, 13 Nov 2017 09:39:57 -0300

perf annotate: Move line/offset into annotation_line struct

Move the line/line_nr/offset menbers to the annotation_line struct to be
used as generic members for any annotation source.

Signed-off-by: Jiri Olsa 
Cc: Andi Kleen 
Cc: David Ahern 
Cc: Namhyung Kim 
Cc: Peter Zijlstra 
Link: http://lkml.kernel.org/r/20171011150158.11895-4-jo...@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/perf/ui/browsers/annotate.c | 45 ---
 tools/perf/ui/gtk/annotate.c  | 14 ++--
 tools/perf/util/annotate.c| 41 ++-
 tools/perf/util/annotate.h|  6 +++---
 4 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/tools/perf/ui/browsers/annotate.c 
b/tools/perf/ui/browsers/annotate.c
index a8c2f74..73d921c 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -84,8 +84,9 @@ static bool disasm_line__filter(struct ui_browser *browser 
__maybe_unused,
void *entry)
 {
if (annotate_browser__opts.hide_src_code) {
-   struct disasm_line *dl = list_entry(entry, struct disasm_line, 
al.node);
-   return dl->offset == -1;
+   struct annotation_line *al = list_entry(entry, struct 
annotation_line, node);
+
+   return al->offset == -1;
}
 
return false;
@@ -141,7 +142,7 @@ static void annotate_browser__write(struct ui_browser 
*browser, void *entry, int
percent_max = bdl->samples[i].percent;
}
 
-   if ((row == 0) && (dl->offset == -1 || percent_max == 0.0)) {
+   if ((row == 0) && (dl->al.offset == -1 || percent_max == 0.0)) {
if (ab->have_cycles) {
if (dl->ipc == 0.0 && dl->cycles == 0)
show_title = true;
@@ -149,7 +150,7 @@ static void annotate_browser__write(struct ui_browser 
*browser, void *entry, int
show_title = true;
}
 
-   if (dl->offset != -1 && percent_max != 0.0) {
+   if (dl->al.offset != -1 && percent_max != 0.0) {
for (i = 0; i < ab->nr_events; i++) {
ui_browser__set_percent_color(browser,
bdl->samples[i].percent,
@@ -199,19 +200,19 @@ static void annotate_browser__write(struct ui_browser 
*browser, void *entry, int
if (!browser->navkeypressed)
width += 1;
 
-   if (!*dl->line)
+   if (!*dl->al.line)
ui_browser__write_nstring(browser, " ", width - pcnt_width - 
cycles_width);
-   else if (dl->offset == -1) {
-   if (dl->line_nr && annotate_browser__opts.show_linenr)
+   else if (dl->al.offset == -1) {
+   if (dl->al.line_nr && annotate_browser__opts.show_linenr)
printed = scnprintf(bf, sizeof(bf), "%-*d ",
-   ab->addr_width + 1, dl->line_nr);
+   ab->addr_width + 1, dl->al.line_nr);
else
printed = scnprintf(bf, sizeof(bf), "%*s  ",
ab->addr_width, " ");
ui_browser__write_nstring(browser, bf, printed);
-   ui_browser__write_nstring(browser, dl->line, width - printed - 
pcnt_width - cycles_width + 1);
+   ui_browser__write_nstring(browser, dl->al.line, width - printed 
- pcnt_width - cycles_width + 1);
} else {
-   u64 addr = dl->offset;
+   u64 addr = dl->al.offset;
int color = -1;
 
if (!annotate_browser__opts.use_offset)
@@ -247,7 +248,7 @@ static void annotate_browser__write(struct ui_browser 
*browser, void *entry, int
ui_browser__set_color(browser, color);
if (dl->ins.ops && dl->ins.ops->scnprintf) {
if (ins__is_jump(>ins)) {
-   bool fwd = dl->ops.target.offset > dl->offset;
+   bool fwd = dl->ops.target.offset > 
dl->al.offset;
 
ui_browser__write_graph(browser, fwd ? 
SLSMG_DARROW_CHAR :

SLSMG_UARROW_CHAR);
@@ -452,7 +453,7 @@ static void annotate_browser__calc_percent(struct 
annotate_browser *browser,
double max_percent = 0.0;
int i;
 
-   if (pos->offset == -1) {
+   if 

[tip:perf/core] perf annotate: Move line/offset into annotation_line struct

[tip-bot for Jiri Olsa]

Commit-ID:  d5490b9647e6e41b203186ed0d73b4103f139fda
Gitweb: https://git.kernel.org/tip/d5490b9647e6e41b203186ed0d73b4103f139fda
Author: Jiri Olsa 
AuthorDate: Wed, 11 Oct 2017 17:01:26 +0200
Committer:  Arnaldo Carvalho de Melo 
CommitDate: Mon, 13 Nov 2017 09:39:57 -0300

perf annotate: Move line/offset into annotation_line struct

Move the line/line_nr/offset menbers to the annotation_line struct to be
used as generic members for any annotation source.

Signed-off-by: Jiri Olsa 
Cc: Andi Kleen 
Cc: David Ahern 
Cc: Namhyung Kim 
Cc: Peter Zijlstra 
Link: http://lkml.kernel.org/r/20171011150158.11895-4-jo...@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/perf/ui/browsers/annotate.c | 45 ---
 tools/perf/ui/gtk/annotate.c  | 14 ++--
 tools/perf/util/annotate.c| 41 ++-
 tools/perf/util/annotate.h|  6 +++---
 4 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/tools/perf/ui/browsers/annotate.c 
b/tools/perf/ui/browsers/annotate.c
index a8c2f74..73d921c 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -84,8 +84,9 @@ static bool disasm_line__filter(struct ui_browser *browser 
__maybe_unused,
void *entry)
 {
if (annotate_browser__opts.hide_src_code) {
-   struct disasm_line *dl = list_entry(entry, struct disasm_line, 
al.node);
-   return dl->offset == -1;
+   struct annotation_line *al = list_entry(entry, struct 
annotation_line, node);
+
+   return al->offset == -1;
}
 
return false;
@@ -141,7 +142,7 @@ static void annotate_browser__write(struct ui_browser 
*browser, void *entry, int
percent_max = bdl->samples[i].percent;
}
 
-   if ((row == 0) && (dl->offset == -1 || percent_max == 0.0)) {
+   if ((row == 0) && (dl->al.offset == -1 || percent_max == 0.0)) {
if (ab->have_cycles) {
if (dl->ipc == 0.0 && dl->cycles == 0)
show_title = true;
@@ -149,7 +150,7 @@ static void annotate_browser__write(struct ui_browser 
*browser, void *entry, int
show_title = true;
}
 
-   if (dl->offset != -1 && percent_max != 0.0) {
+   if (dl->al.offset != -1 && percent_max != 0.0) {
for (i = 0; i < ab->nr_events; i++) {
ui_browser__set_percent_color(browser,
bdl->samples[i].percent,
@@ -199,19 +200,19 @@ static void annotate_browser__write(struct ui_browser 
*browser, void *entry, int
if (!browser->navkeypressed)
width += 1;
 
-   if (!*dl->line)
+   if (!*dl->al.line)
ui_browser__write_nstring(browser, " ", width - pcnt_width - 
cycles_width);
-   else if (dl->offset == -1) {
-   if (dl->line_nr && annotate_browser__opts.show_linenr)
+   else if (dl->al.offset == -1) {
+   if (dl->al.line_nr && annotate_browser__opts.show_linenr)
printed = scnprintf(bf, sizeof(bf), "%-*d ",
-   ab->addr_width + 1, dl->line_nr);
+   ab->addr_width + 1, dl->al.line_nr);
else
printed = scnprintf(bf, sizeof(bf), "%*s  ",
ab->addr_width, " ");
ui_browser__write_nstring(browser, bf, printed);
-   ui_browser__write_nstring(browser, dl->line, width - printed - 
pcnt_width - cycles_width + 1);
+   ui_browser__write_nstring(browser, dl->al.line, width - printed 
- pcnt_width - cycles_width + 1);
} else {
-   u64 addr = dl->offset;
+   u64 addr = dl->al.offset;
int color = -1;
 
if (!annotate_browser__opts.use_offset)
@@ -247,7 +248,7 @@ static void annotate_browser__write(struct ui_browser 
*browser, void *entry, int
ui_browser__set_color(browser, color);
if (dl->ins.ops && dl->ins.ops->scnprintf) {
if (ins__is_jump(>ins)) {
-   bool fwd = dl->ops.target.offset > dl->offset;
+   bool fwd = dl->ops.target.offset > 
dl->al.offset;
 
ui_browser__write_graph(browser, fwd ? 
SLSMG_DARROW_CHAR :

SLSMG_UARROW_CHAR);
@@ -452,7 +453,7 @@ static void annotate_browser__calc_percent(struct 
annotate_browser *browser,
double max_percent = 0.0;
int i;
 
-   if (pos->offset == -1) {
+   if (pos->al.offset == -1) {
RB_CLEAR_NODE(>rb_node);
continue;
}
@@ -464,8 +465,8 @@ static