struct annotation_line can contain either assembly instruction or
a source code line. To distinguish between them we currently use
offset. If offset is -1, it's a source otherwise it's assembly.
This is bit cryptic when you first read the code. Introduce new
field 'type' that denotes type of the data the annotation_line
object contains.
Signed-off-by: Ravi Bangoria <ravi.bango...@linux.ibm.com>
---
tools/perf/ui/browsers/annotate.c | 4 ++--
tools/perf/ui/gtk/annotate.c | 6 +++---
tools/perf/util/annotate.c | 27 ++++++++++++++++-----------
tools/perf/util/annotate.h | 8 +++++++-
4 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/tools/perf/ui/browsers/annotate.c
b/tools/perf/ui/browsers/annotate.c
index 9023267e5643..2e4db8216b3b 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -317,7 +317,7 @@ static void annotate_browser__calc_percent(struct
annotate_browser *browser,
double max_percent = 0.0;
int i;
- if (pos->al.offset == -1) {
+ if (pos->al.type != AL_TYPE_ASM) {
RB_CLEAR_NODE(&pos->al.rb_node);
continue;
}
@@ -816,7 +816,7 @@ static int annotate_browser__run(struct annotate_browser
*browser,
if (browser->selection == NULL)
ui_helpline__puts("Huh? No selection. Report to
linux-ker...@vger.kernel.org");
- else if (browser->selection->offset == -1)
+ else if (browser->selection->type != AL_TYPE_ASM)
ui_helpline__puts("Actions are only available
for assembly lines.");
else if (!dl->ins.ops)
goto show_sup_ins;
diff --git a/tools/perf/ui/gtk/annotate.c b/tools/perf/ui/gtk/annotate.c
index 35f9641bf670..71c792a0b17d 100644
--- a/tools/perf/ui/gtk/annotate.c
+++ b/tools/perf/ui/gtk/annotate.c
@@ -35,7 +35,7 @@ static int perf_gtk__get_percent(char *buf, size_t size,
struct symbol *sym,
strcpy(buf, "");
- if (dl->al.offset == (s64) -1)
+ if (dl->al.type != AL_TYPE_ASM)
return 0;
symhist = annotation__histogram(symbol__annotation(sym), evidx);
@@ -61,7 +61,7 @@ static int perf_gtk__get_offset(char *buf, size_t size,
struct map_symbol *ms,
strcpy(buf, "");
- if (dl->al.offset == (s64) -1)
+ if (dl->al.type != AL_TYPE_ASM)
return 0;
return scnprintf(buf, size, "%"PRIx64, start + dl->al.offset);
@@ -78,7 +78,7 @@ static int perf_gtk__get_line(char *buf, size_t size, struct
disasm_line *dl)
if (!line)
return 0;
- if (dl->al.offset != (s64) -1)
+ if (dl->al.type == AL_TYPE_ASM)
markup = NULL;
if (markup)
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 4e2706274d85..8aef60a6ffea 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1148,6 +1148,7 @@ struct annotate_args {
struct evsel *evsel;
struct annotation_options *options;
s64 offset;
+ u8 type;
char *line;
int line_nr;
};
@@ -1156,6 +1157,7 @@ static void annotation_line__init(struct annotation_line
*al,
struct annotate_args *args,
int nr)
{
+ al->type = args->type;
al->offset = args->offset;
al->line = strdup(args->line);
al->line_nr = args->line_nr;
@@ -1202,7 +1204,7 @@ static struct disasm_line *disasm_line__new(struct
annotate_args *args)
if (dl->al.line == NULL)
goto out_delete;
- if (args->offset != -1) {
+ if (dl->al.type == AL_TYPE_ASM) {
if (disasm_line__parse(dl->al.line, &dl->ins.name,
&dl->ops.raw) < 0)
goto out_free_line;
@@ -1246,7 +1248,7 @@ struct annotation_line *
annotation_line__next(struct annotation_line *pos, struct list_head *head)
{
list_for_each_entry_continue(pos, head, node)
- if (pos->offset >= 0)
+ if (pos->type == AL_TYPE_ASM)
return pos;
return NULL;
@@ -1357,7 +1359,7 @@ annotation_line__print(struct annotation_line *al, struct
symbol *sym, u64 start
static const char *prev_line;
static const char *prev_color;
- if (al->offset != -1) {
+ if (al->type == AL_TYPE_ASM) {
double max_percent = 0.0;
int i, nr_percent = 1;
const char *color;
@@ -1500,6 +1502,7 @@ static int symbol__parse_objdump_line(struct symbol *sym,
}
args->offset = offset;
+ args->type = (offset != -1) ? AL_TYPE_ASM : AL_TYPE_SRC;
args->line = parsed_line;
args->line_nr = *line_nr;
args->ms.sym = sym;
@@ -1783,6 +1786,7 @@ static int symbol__disassemble_bpf(struct symbol *sym,
fflush(s);
if (!opts->hide_src_code && srcline) {
+ args->type = AL_TYPE_SRC;
args->offset = -1;
args->line = strdup(srcline);
args->line_nr = 0;
@@ -1794,6 +1798,7 @@ static int symbol__disassemble_bpf(struct symbol *sym,
}
}
+ args->type = AL_TYPE_ASM;
args->offset = pc;
args->line = buf + prev_buf_size;
args->line_nr = 0;
@@ -2099,7 +2104,7 @@ static void annotation__calc_percent(struct annotation
*notes,
s64 end;
int i = 0;
- if (al->offset == -1)
+ if (al->type != AL_TYPE_ASM)
continue;
next = annotation_line__next(al, ¬es->src->source);
@@ -2309,7 +2314,7 @@ static int annotated_source__addr_fmt_width(struct
list_head *lines, u64 start)
struct annotation_line *line;
list_for_each_entry_reverse(line, lines, node) {
- if (line->offset != -1)
+ if (line->type == AL_TYPE_ASM)
return scnprintf(bf, sizeof(bf), "%" PRIx64, start +
line->offset);
}
@@ -2549,7 +2554,7 @@ static size_t disasm_line__fprintf(struct disasm_line
*dl, FILE *fp)
{
size_t printed;
- if (dl->al.offset == -1)
+ if (dl->al.type == AL_TYPE_SRC)
return fprintf(fp, "%s\n", dl->al.line);
printed = fprintf(fp, "%#" PRIx64 " %s", dl->al.offset, dl->ins.name);
@@ -2628,7 +2633,7 @@ static void annotation__set_offsets(struct annotation
*notes, s64 size)
if (notes->max_line_len < line_len)
notes->max_line_len = line_len;
al->idx = notes->nr_entries++;
- if (al->offset != -1) {
+ if (al->type == AL_TYPE_ASM) {
al->idx_asm = notes->nr_asm_entries++;
/*
* FIXME: short term bandaid to cope with assembly
@@ -2659,7 +2664,7 @@ static int annotation__max_ins_name(struct annotation
*notes)
struct annotation_line *al;
list_for_each_entry(al, ¬es->src->source, node) {
- if (al->offset == -1)
+ if (al->type != AL_TYPE_ASM)
continue;
len = strlen(disasm_line(al)->ins.name);
@@ -2875,7 +2880,7 @@ static void __annotation_line__write(struct
annotation_line *al, struct annotati
char bf[256];
int printed;
- if (first_line && (al->offset == -1 || percent_max == 0.0)) {
+ if (first_line && (al->type != AL_TYPE_ASM || percent_max == 0.0)) {
if (notes->have_cycles) {
if (al->ipc == 0.0 && al->cycles == 0)
show_title = true;
@@ -2883,7 +2888,7 @@ static void __annotation_line__write(struct
annotation_line *al, struct annotati
show_title = true;
}
- if (al->offset != -1 && percent_max != 0.0) {
+ if (al->type == AL_TYPE_ASM && percent_max != 0.0) {
int i;
for (i = 0; i < notes->nr_events; i++) {
@@ -2964,7 +2969,7 @@ static void __annotation_line__write(struct
annotation_line *al, struct annotati
if (!*al->line)
obj__printf(obj, "%-*s", width - pcnt_width - cycles_width, "
");
- else if (al->offset == -1) {
+ else if (al->type == AL_TYPE_SRC) {
if (al->line_nr && notes->options->show_linenr)
printed = scnprintf(bf, sizeof(bf), "%-*d ",
notes->widths.addr + 1, al->line_nr);
else
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index d9b5bb105056..89839713d242 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -128,9 +128,15 @@ struct annotation_data {
struct sym_hist_entry he;
};
+enum annotation_line_type {
+ AL_TYPE_ASM = 0,
+ AL_TYPE_SRC,
+};
+
struct annotation_line {
struct list_head node;
struct rb_node rb_node;
+ u8 type;
s64 offset;
char *line;
int line_nr;
@@ -310,7 +316,7 @@ static inline int annotation__pcnt_width(struct annotation
*notes)
static inline bool annotation_line__filter(struct annotation_line *al, struct
annotation *notes)
{
- return notes->options->hide_src_code && al->offset == -1;
+ return notes->options->hide_src_code && al->type == AL_TYPE_SRC;
}
void annotation__update_column_widths(struct annotation *notes);
--
2.21.1
