[tip:perf/core] perf trace: Move call to symbol__init() after creating session

From: tip-bot for Namhyung Kim
Date: Thu Aug 14 2014 - 04:48:52 EST

Commit-ID: cb2ffae241cfdd6d90acb7ec5f52ad8401885dd2
Gitweb: http://git.kernel.org/tip/cb2ffae241cfdd6d90acb7ec5f52ad8401885dd2
Author: Namhyung Kim <namhyung@xxxxxxxxxx>
AuthorDate: Tue, 12 Aug 2014 15:40:44 +0900
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Wed, 13 Aug 2014 16:41:38 -0300

perf trace: Move call to symbol__init() after creating session

This is a preparation of fixing dso__load_kernel_sym(). It needs a
session info before calling symbol__init().

Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Namhyung Kim <namhyung.kim@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Link: http://lkml.kernel.org/r/1407825645-24586-13-git-send-email-namhyung@xxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
tools/perf/builtin-trace.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 20fac50..8a83bd8 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -2241,13 +2241,13 @@ static int trace__replay(struct trace *trace)
/* add tid to output */
trace->multiple_threads = true;

- if (symbol__init() < 0)
- return -1;
session = perf_session__new(&file, false, &trace->tool);
if (session == NULL)
return -ENOMEM;

+ if (symbol__init() < 0)
+ goto out;
trace->host = &session->machines.host;

err = perf_session__set_tracepoints_handlers(session, handlers);
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/