diff options
Diffstat (limited to 'tools/perf/util/probe-event.c')
-rw-r--r-- | tools/perf/util/probe-event.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 5ddee66020a7..f0223166e761 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c | |||
@@ -234,7 +234,6 @@ static int try_to_find_probe_trace_events(struct perf_probe_event *pev, | |||
234 | 234 | ||
235 | /* Searching trace events corresponding to probe event */ | 235 | /* Searching trace events corresponding to probe event */ |
236 | ntevs = find_probe_trace_events(fd, pev, tevs, max_tevs); | 236 | ntevs = find_probe_trace_events(fd, pev, tevs, max_tevs); |
237 | close(fd); | ||
238 | 237 | ||
239 | if (ntevs > 0) { /* Succeeded to find trace events */ | 238 | if (ntevs > 0) { /* Succeeded to find trace events */ |
240 | pr_debug("find %d probe_trace_events.\n", ntevs); | 239 | pr_debug("find %d probe_trace_events.\n", ntevs); |
@@ -388,7 +387,6 @@ int show_line_range(struct line_range *lr, const char *module) | |||
388 | } | 387 | } |
389 | 388 | ||
390 | ret = find_line_range(fd, lr); | 389 | ret = find_line_range(fd, lr); |
391 | close(fd); | ||
392 | if (ret == 0) { | 390 | if (ret == 0) { |
393 | pr_warning("Specified source line is not found.\n"); | 391 | pr_warning("Specified source line is not found.\n"); |
394 | return -ENOENT; | 392 | return -ENOENT; |
@@ -512,19 +510,18 @@ int show_available_vars(struct perf_probe_event *pevs, int npevs, | |||
512 | if (ret < 0) | 510 | if (ret < 0) |
513 | return ret; | 511 | return ret; |
514 | 512 | ||
515 | fd = open_vmlinux(module); | ||
516 | if (fd < 0) { | ||
517 | pr_warning("Failed to open debug information file.\n"); | ||
518 | return fd; | ||
519 | } | ||
520 | |||
521 | setup_pager(); | 513 | setup_pager(); |
522 | 514 | ||
523 | for (i = 0; i < npevs && ret >= 0; i++) | 515 | for (i = 0; i < npevs && ret >= 0; i++) { |
516 | fd = open_vmlinux(module); | ||
517 | if (fd < 0) { | ||
518 | pr_warning("Failed to open debug information file.\n"); | ||
519 | ret = fd; | ||
520 | break; | ||
521 | } | ||
524 | ret = show_available_vars_at(fd, &pevs[i], max_vls, _filter, | 522 | ret = show_available_vars_at(fd, &pevs[i], max_vls, _filter, |
525 | externs); | 523 | externs); |
526 | 524 | } | |
527 | close(fd); | ||
528 | return ret; | 525 | return ret; |
529 | } | 526 | } |
530 | 527 | ||