瀏覽代碼

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@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1407825645-24586-13-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Namhyung Kim 11 年之前
父節點
當前提交
cb2ffae241
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      tools/perf/builtin-trace.c

+ 3 - 3
tools/perf/builtin-trace.c

@@ -2241,13 +2241,13 @@ static int trace__replay(struct trace *trace)
 	/* add tid to output */
 	/* add tid to output */
 	trace->multiple_threads = true;
 	trace->multiple_threads = true;
 
 
-	if (symbol__init() < 0)
-		return -1;
-
 	session = perf_session__new(&file, false, &trace->tool);
 	session = perf_session__new(&file, false, &trace->tool);
 	if (session == NULL)
 	if (session == NULL)
 		return -ENOMEM;
 		return -ENOMEM;
 
 
+	if (symbol__init() < 0)
+		goto out;
+
 	trace->host = &session->machines.host;
 	trace->host = &session->machines.host;
 
 
 	err = perf_session__set_tracepoints_handlers(session, handlers);
 	err = perf_session__set_tracepoints_handlers(session, handlers);