diff options
| author | Jiri Olsa <jolsa@kernel.org> | 2018-08-17 05:48:03 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-08-20 07:54:59 -0400 |
| commit | d68a29c2823ff6bd7a25cb748b577f2d88c1f47a (patch) | |
| tree | 63b9bfc5622b97184ab2a6996d574642880329a9 /tools | |
| parent | 2354ae9bdc320939cc74695b564ccf178780dd61 (diff) | |
perf tools: Get rid of dso__needs_decompress() call in __open_dso()
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-4-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/dso.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 51cf82cf1882..8ee1faa5726f 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c | |||
| @@ -468,6 +468,7 @@ static int __open_dso(struct dso *dso, struct machine *machine) | |||
| 468 | int fd = -EINVAL; | 468 | int fd = -EINVAL; |
| 469 | char *root_dir = (char *)""; | 469 | char *root_dir = (char *)""; |
| 470 | char *name = malloc(PATH_MAX); | 470 | char *name = malloc(PATH_MAX); |
| 471 | bool decomp = false; | ||
| 471 | 472 | ||
| 472 | if (!name) | 473 | if (!name) |
| 473 | return -ENOMEM; | 474 | return -ENOMEM; |
| @@ -491,12 +492,13 @@ static int __open_dso(struct dso *dso, struct machine *machine) | |||
| 491 | goto out; | 492 | goto out; |
| 492 | } | 493 | } |
| 493 | 494 | ||
| 495 | decomp = true; | ||
| 494 | strcpy(name, newpath); | 496 | strcpy(name, newpath); |
| 495 | } | 497 | } |
| 496 | 498 | ||
| 497 | fd = do_open(name); | 499 | fd = do_open(name); |
| 498 | 500 | ||
| 499 | if (dso__needs_decompress(dso)) | 501 | if (decomp) |
| 500 | unlink(name); | 502 | unlink(name); |
| 501 | 503 | ||
| 502 | out: | 504 | out: |
