]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
perf tools: Get rid of dso__needs_decompress() call in read_object_code()
authorJiri Olsa <jolsa@kernel.org>
Fri, 17 Aug 2018 09:48:01 +0000 (11:48 +0200)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 20 Aug 2018 11:54:59 +0000 (08:54 -0300)
There's no need to call dso__needs_decompress() twice in the function.

Signed-off-by: Jiri 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-2-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/tests/code-reading.c

index 4892bd2dc33e6b9a8a0d94ccad396b57e70f28c9..6b049f3f5cf4e794765b8ac94d8a73814ba7aba9 100644 (file)
@@ -232,6 +232,7 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode,
        u64 objdump_addr;
        const char *objdump_name;
        char decomp_name[KMOD_DECOMP_LEN];
+       bool decomp = false;
        int ret;
 
        pr_debug("Reading object code for memory address: %#"PRIx64"\n", addr);
@@ -305,6 +306,7 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode,
                        return -1;
                }
 
+               decomp = true;
                objdump_name = decomp_name;
        }
 
@@ -312,7 +314,7 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode,
        objdump_addr = map__rip_2objdump(al.map, al.addr);
        ret = read_via_objdump(objdump_name, objdump_addr, buf2, len);
 
-       if (dso__needs_decompress(al.map->dso))
+       if (decomp)
                unlink(objdump_name);
 
        if (ret > 0) {