perf probe: Fix to remove redundant close
Masami Hiramatsu [Wed, 30 Mar 2011 09:25:47 +0000 (18:25 +0900)]
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>

tools/perf/util/probe-event.c
tools/perf/util/probe-finder.c

index 5ddee66..a372d74 100644 (file)
@@ -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);
@@ -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;
@@ -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;
 }
 
index 3bcd140..5473f11 100644 (file)
@@ -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;
        }
 
@@ -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;
        }