[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-4748834f96903f843719b02190f98e36b2c55192@git.kernel.org>
Date: Sat, 18 Nov 2017 00:13:48 -0800
From: tip-bot for Jiri Olsa <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: peterz@...radead.org, tglx@...utronix.de, hpa@...or.com,
dsahern@...il.com, namhyung@...nel.org,
linux-kernel@...r.kernel.org, acme@...hat.com, jolsa@...nel.org,
mingo@...nel.org, andi@...stfloor.org
Subject: [tip:perf/core] perf annotate: Add offset/line/line_nr into struct
annotate_args
Commit-ID: 4748834f96903f843719b02190f98e36b2c55192
Gitweb: https://git.kernel.org/tip/4748834f96903f843719b02190f98e36b2c55192
Author: Jiri Olsa <jolsa@...nel.org>
AuthorDate: Wed, 11 Oct 2017 17:01:32 +0200
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Mon, 13 Nov 2017 09:39:58 -0300
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@...nel.org>
Cc: Andi Kleen <andi@...stfloor.org>
Cc: David Ahern <dsahern@...il.com>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Link: http://lkml.kernel.org/r/20171011150158.11895-10-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
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 30da440..681c9c4 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)++;
Powered by blists - more mailing lists