[PATCH 09/35] perf annotate: Add offset/line/line_nr into struct annotate_args

From: Jiri Olsa
Date: Wed Oct 11 2017 - 11:02:30 EST


Adding offset/line/line_nr into struct annotate_args to reduce
the number of arguments that need to travel all the way to line
allocation.

Link: http://lkml.kernel.org/n/tip-9yy3u6jt5c0a2kh46kuz2sqq@xxxxxxxxxxxxxx
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
---
tools/perf/util/annotate.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 0f95a308db9b..84afd05079b9 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -872,23 +872,24 @@ struct annotate_args {
size_t privsize;
struct arch *arch;
struct map *map;
+ s64 offset;
+ char *line;
+ int line_nr;
};

-static struct disasm_line *disasm_line__new(struct annotate_args *args,
- s64 offset, char *line,
- int line_nr)
+static struct disasm_line *disasm_line__new(struct annotate_args *args)
{
struct disasm_line *dl = zalloc(sizeof(*dl) + args->privsize);

if (dl != NULL) {
- dl->al.offset = offset;
- dl->al.line = strdup(line);
- dl->al.line_nr = line_nr;
+ dl->al.offset = args->offset;
+ dl->al.line = strdup(args->line);
+ dl->al.line_nr = args->line_nr;

if (dl->al.line == NULL)
goto out_delete;

- if (offset != -1) {
+ if (args->offset != -1) {
if (disasm_line__parse(dl->al.line, &dl->ins.name, &dl->ops.raw) < 0)
goto out_free_line;

@@ -1259,7 +1260,11 @@ static int symbol__parse_objdump_line(struct symbol *sym, FILE *file,
parsed_line = tmp2 + 1;
}

- dl = disasm_line__new(args, offset, parsed_line, *line_nr);
+ args->offset = offset;
+ args->line = parsed_line;
+ args->line_nr = *line_nr;
+
+ dl = disasm_line__new(args);
free(line);
(*line_nr)++;

--
2.13.6