[tip:perf/core] perf tools: Fix error path to do closedir() when synthesizing threads

From: tip-bot for Arnaldo Carvalho de Melo
Date: Sat Apr 11 2015 - 02:38:00 EST


Commit-ID: d998b732599b304c3865e8e5c7ba6250faba6589
Gitweb: http://git.kernel.org/tip/d998b732599b304c3865e8e5c7ba6250faba6589
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
AuthorDate: Wed, 8 Apr 2015 11:57:03 -0300
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Fri, 10 Apr 2015 10:13:58 -0300

perf tools: Fix error path to do closedir() when synthesizing threads

When traversing /proc to synthesize the PERF_RECORD_FORK et al events we
were bailing out on errors without calling closedir(), fix it.

Reported-by: David Ahern <dsahern@xxxxxxxxx>
Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxx>
Cc: Don Zickus <dzickus@xxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Link: http://lkml.kernel.org/n/tip-vxtp593rfztgbi8noy0m967p@xxxxxxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/util/event.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 9d09851..ff866c4 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -387,6 +387,7 @@ static int __event__synthesize_thread(union perf_event *comm_event,
DIR *tasks;
struct dirent dirent, *next;
pid_t tgid, ppid;
+ int rc = 0;

/* special case: only send one comm event using passed in pid */
if (!full) {
@@ -414,38 +415,38 @@ static int __event__synthesize_thread(union perf_event *comm_event,

while (!readdir_r(tasks, &dirent, &next) && next) {
char *end;
- int rc = 0;
pid_t _pid;

_pid = strtol(dirent.d_name, &end, 10);
if (*end)
continue;

+ rc = -1;
if (perf_event__prepare_comm(comm_event, _pid, machine,
&tgid, &ppid) != 0)
- return -1;
+ break;

if (perf_event__synthesize_fork(tool, fork_event, _pid, tgid,
ppid, process, machine) < 0)
- return -1;
+ break;
/*
* Send the prepared comm event
*/
if (process(tool, comm_event, &synth_sample, machine) != 0)
- return -1;
+ break;

+ rc = 0;
if (_pid == pid) {
/* process the parent's maps too */
rc = perf_event__synthesize_mmap_events(tool, mmap_event, pid, tgid,
process, machine, mmap_data);
+ if (rc)
+ break;
}
-
- if (rc)
- return rc;
}

closedir(tasks);
- return 0;
+ return rc;
}

int perf_event__synthesize_thread_map(struct perf_tool *tool,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/