Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2354ae9b authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180817094813.15086-3-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent bcd4287e

tools/perf/util/annotate.c

+3 −1
Original line number Diff line number Diff line
@@ -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 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args) 
out_remove_tmp:

	close(stdout_fd[0]);



	if (dso__needs_decompress(dso))

	if (decomp)

		unlink(symfs_filename);



	if (delete_extract)