summaryrefslogtreecommitdiffstats
path: root/tools/perf/util/annotate.c
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2017-10-11 17:01:32 +0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2017-11-13 13:39:58 +0100
commit4748834f96903f843719b02190f98e36b2c55192 (patch)
tree0e54d86bccc8d889d5014f930fb3fadd5274b531 /tools/perf/util/annotate.c
parentperf annotate: Add map into struct annotate_args (diff)
downloadlinux-4748834f96903f843719b02190f98e36b2c55192.tar.xz
linux-4748834f96903f843719b02190f98e36b2c55192.zip
perf annotate: Add offset/line/line_nr into struct annotate_args
Add offset/line/line_nr into struct annotate_args to reduce the number of arguments that need to travel all the way to line allocation. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: Andi Kleen <andi@firstfloor.org> Cc: David Ahern <dsahern@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/20171011150158.11895-10-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/annotate.c')
-rw-r--r--tools/perf/util/annotate.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 30da4402a3e4..681c9c4ce9f9 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -882,23 +882,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;
@@ -1269,7 +1270,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)++;