perf kmem: Move session handling out of __cmd_kmem()

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-7-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 84b82397a28ea8cf1f8d20b9f7cc164191b85454..349d9b46098ec6b45633e86a56214d64f71de31e 100644 (file)
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -405,10 +405,9 @@ static void sort_result(void)
        __sort_result(&root_caller_stat, &root_caller_sorted, &caller_sort);
 }
 
-static int __cmd_kmem(void)
+static int __cmd_kmem(struct perf_session *session)
 {
        int err = -EINVAL;
-       struct perf_session *session;
        const struct perf_evsel_str_handler kmem_tracepoints[] = {
                { "kmem:kmalloc",               perf_evsel__process_alloc_event, },
                { "kmem:kmem_cache_alloc",      perf_evsel__process_alloc_event, },
@@ -417,31 +416,22 @@ static int __cmd_kmem(void)
                { "kmem:kfree",                 perf_evsel__process_free_event, },
                { "kmem:kmem_cache_free",       perf_evsel__process_free_event, },
        };
-       struct perf_data_file file = {
-               .path = input_name,
-               .mode = PERF_DATA_MODE_READ,
-       };
-
-       session = perf_session__new(&file, false, &perf_kmem);
-       if (session == NULL)
-               return -ENOMEM;
 
        if (!perf_session__has_traces(session, "kmem record"))
-               goto out_delete;
+               goto out;
 
        if (perf_session__set_tracepoints_handlers(session, kmem_tracepoints)) {
                pr_err("Initializing perf session tracepoint handlers failed\n");
-               return -1;
+               goto out;
        }
 
        setup_pager();
        err = perf_session__process_events(session, &perf_kmem);
        if (err != 0)
-               goto out_delete;
+               goto out;
        sort_result();
        print_result(session);
-out_delete:
-       perf_session__delete(session);
+out:
        return err;
 }
 
@@ -688,29 +678,46 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)
                NULL,
                NULL
        };
+       struct perf_session *session;
+       struct perf_data_file file = {
+               .path = input_name,
+               .mode = PERF_DATA_MODE_READ,
+       };
+       int ret = -1;
+
        argc = parse_options_subcommand(argc, argv, kmem_options,
                                        kmem_subcommands, kmem_usage, 0);
 
        if (!argc)
                usage_with_options(kmem_usage, kmem_options);
 
-       symbol__init();
-
        if (!strncmp(argv[0], "rec", 3)) {
+               symbol__init();
                return __cmd_record(argc, argv);
-       } else if (!strcmp(argv[0], "stat")) {
+       }
+
+       session = perf_session__new(&file, false, &perf_kmem);
+       if (session == NULL)
+               return -ENOMEM;
+
+       symbol__init();
+
+       if (!strcmp(argv[0], "stat")) {
                if (cpu__setup_cpunode_map())
-                       return -1;
+                       goto out_delete;
 
                if (list_empty(&caller_sort))
                        setup_sorting(&caller_sort, default_sort_order);
                if (list_empty(&alloc_sort))
                        setup_sorting(&alloc_sort, default_sort_order);
 
-               return __cmd_kmem();
+               ret = __cmd_kmem(session);
        } else
                usage_with_options(kmem_usage, kmem_options);
 
-       return 0;
+out_delete:
+       perf_session__delete(session);
+
+       return ret;
 }