[tip:perf/urgent] perf tools: Get rid of dso__needs_decompress() call in symbol__disassemble()

From: tip-bot for Jiri Olsa
Date: Thu Aug 23 2018 - 04:40:05 EST


Commit-ID: 2354ae9bdc320939cc74695b564ccf178780dd61
Gitweb: https://git.kernel.org/tip/2354ae9bdc320939cc74695b564ccf178780dd61
Author: Jiri Olsa <jolsa@xxxxxxxxxx>
AuthorDate: Fri, 17 Aug 2018 11:48:02 +0200
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Mon, 20 Aug 2018 08:54:59 -0300

perf tools: Get rid of dso__needs_decompress() call in symbol__disassemble()

There's no need to call dso__needs_decompress() twice in the function.

Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Michael Petlan <mpetlan@xxxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/20180817094813.15086-3-jolsa@xxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/util/annotate.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index e4268b948e0e..20061cf42288 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1629,6 +1629,7 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args)
char symfs_filename[PATH_MAX];
struct kcore_extract kce;
bool delete_extract = false;
+ bool decomp = false;
int stdout_fd[2];
int lineno = 0;
int nline;
@@ -1662,6 +1663,7 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args)
tmp, sizeof(tmp)) < 0)
goto out;

+ decomp = true;
strcpy(symfs_filename, tmp);
}

@@ -1748,7 +1750,7 @@ out_free_command:
out_remove_tmp:
close(stdout_fd[0]);

- if (dso__needs_decompress(dso))
+ if (decomp)
unlink(symfs_filename);

if (delete_extract)