Skip to content

Commit

Permalink
perf probe: Fix to remove redundant close
Browse files Browse the repository at this point in the history
Since dwfl_end() closes given fd with dwfl, caller doesn't need to close its fd
when finishing process.

Cc: 2nddept-manager@sdl.hitachi.co.jp
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Lin Ming <ming.m.lin@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20110330092547.2132.93728.stgit@ltc236.sdl.hitachi.co.jp>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Masami Hiramatsu authored and Arnaldo Carvalho de Melo committed Apr 5, 2011
1 parent 7d21635 commit f0c4801
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 0 additions & 3 deletions tools/perf/util/probe-event.c
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ static int try_to_find_probe_trace_events(struct perf_probe_event *pev,

/* Searching trace events corresponding to probe event */
ntevs = find_probe_trace_events(fd, pev, tevs, max_tevs);
close(fd);

if (ntevs > 0) { /* Succeeded to find trace events */
pr_debug("find %d probe_trace_events.\n", ntevs);
Expand Down Expand Up @@ -388,7 +387,6 @@ int show_line_range(struct line_range *lr, const char *module)
}

ret = find_line_range(fd, lr);
close(fd);
if (ret == 0) {
pr_warning("Specified source line is not found.\n");
return -ENOENT;
Expand Down Expand Up @@ -524,7 +522,6 @@ int show_available_vars(struct perf_probe_event *pevs, int npevs,
ret = show_available_vars_at(fd, &pevs[i], max_vls, _filter,
externs);

close(fd);
return ret;
}

Expand Down
2 changes: 2 additions & 0 deletions tools/perf/util/probe-finder.c
Original file line number Diff line number Diff line change
Expand Up @@ -1455,6 +1455,7 @@ static int find_probes(int fd, struct probe_finder *pf)
if (!dbg) {
pr_warning("No debug information found in the vmlinux - "
"please rebuild with CONFIG_DEBUG_INFO=y.\n");
close(fd); /* Without dwfl_end(), fd isn't closed. */
return -EBADF;
}

Expand Down Expand Up @@ -1900,6 +1901,7 @@ int find_line_range(int fd, struct line_range *lr)
if (!dbg) {
pr_warning("No debug information found in the vmlinux - "
"please rebuild with CONFIG_DEBUG_INFO=y.\n");
close(fd); /* Without dwfl_end(), fd isn't closed. */
return -EBADF;
}

Expand Down

0 comments on commit f0c4801

Please sign in to comment.