Skip to content

Commit

Permalink
perf trace: Fix forgotten close of file/dir
Browse files Browse the repository at this point in the history
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Clark Williams <williams@redhat.com>
Cc: John Kacur <jkacur@redhat.com>
LKML-Reference: <4B387122.7090801@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Xiao Guangrong authored and Ingo Molnar committed Dec 28, 2009
1 parent 61be3e5 commit 9967411
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions tools/perf/util/trace-event-info.c
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,8 @@ static void read_header_files(void)
write_or_die("header_page", 12);
write_or_die(&size, 8);
check_size = copy_file_fd(fd);
close(fd);

if (size != check_size)
die("wrong size for '%s' size=%lld read=%lld",
path, size, check_size);
Expand All @@ -271,6 +273,7 @@ static void read_header_files(void)
if (size != check_size)
die("wrong size for '%s'", path);
put_tracing_file(path);
close(fd);
}

static bool name_in_tp_list(char *sys, struct tracepoint_path *tps)
Expand Down Expand Up @@ -337,6 +340,7 @@ static void copy_event_system(const char *sys, struct tracepoint_path *tps)

free(format);
}
closedir(dir);
}

static void read_ftrace_files(struct tracepoint_path *tps)
Expand Down Expand Up @@ -407,6 +411,7 @@ static void read_event_files(struct tracepoint_path *tps)
free(sys);
}

closedir(dir);
put_tracing_file(path);
}

Expand Down

0 comments on commit 9967411

Please sign in to comment.