perf top: Convert to struct perf_target

Use struct perf_target as it is introduced by previous patch.

This is a preparation of further changes.

Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1335417327-11796-4-git-send-email-namhyung.kim@lge.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 17 insertions, 16 deletions

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 8ef59f8262bb..2c1c207627b4 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -588,7 +588,7 @@ static void *display_thread_tui(void *arg)
          * via --uid.
          */
         list_for_each_entry(pos, &top->evlist->entries, node)
-                pos->hists.uid_filter_str = top->uid_str;
+                pos->hists.uid_filter_str = top->target.uid_str;
 
         perf_evlist__tui_browse_hists(top->evlist, help,
                                       perf_top__sort_new_samples,
@@ -1016,7 +1016,7 @@ static int __cmd_top(struct perf_top *top)
         if (ret)
                 goto out_delete;
 
-        if (top->target_tid || top->uid != UINT_MAX)
+        if (top->target.tid || top->target.uid != UINT_MAX)
                 perf_event__synthesize_thread_map(&top->tool, top->evlist->threads,
                                                   perf_event__process,
                                                   &top->session->host_machine);
@@ -1154,7 +1154,6 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
         struct perf_top top = {
                 .count_filter        = 5,
                 .delay_secs          = 2,
-                .uid                 = UINT_MAX,
                 .freq                = 1000, /* 1 KHz */
                 .mmap_pages          = 128,
                 .sym_pcnt_filter     = 5,
@@ -1166,13 +1165,13 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
                      parse_events_option),
         OPT_INTEGER('c', "count", &top.default_interval,
                     "event period to sample"),
-        OPT_STRING('p', "pid", &top.target_pid, "pid",
+        OPT_STRING('p', "pid", &top.target.pid, "pid",
                     "profile events on existing process id"),
-        OPT_STRING('t', "tid", &top.target_tid, "tid",
+        OPT_STRING('t', "tid", &top.target.tid, "tid",
                     "profile events on existing thread id"),
-        OPT_BOOLEAN('a', "all-cpus", &top.system_wide,
+        OPT_BOOLEAN('a', "all-cpus", &top.target.system_wide,
                             "system-wide collection from all CPUs"),
-        OPT_STRING('C', "cpu", &top.cpu_list, "cpu",
+        OPT_STRING('C', "cpu", &top.target.cpu_list, "cpu",
                     "list of cpus to monitor"),
         OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
                    "file", "vmlinux pathname"),
@@ -1227,7 +1226,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
                     "Display raw encoding of assembly instructions (default)"),
         OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",
                    "Specify disassembler style (e.g. -M intel for intel syntax)"),
-        OPT_STRING('u', "uid", &top.uid_str, "user", "user to profile"),
+        OPT_STRING('u', "uid", &top.target.uid_str, "user", "user to profile"),
         OPT_END()
         };
 
@@ -1253,22 +1252,24 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
 
         setup_browser(false);
 
-        top.uid = parse_target_uid(top.uid_str, top.target_tid, top.target_pid);
-        if (top.uid_str != NULL && top.uid == UINT_MAX - 1)
+        top.target.uid = parse_target_uid(top.target.uid_str, top.target.tid,
+                                          top.target.pid);
+        if (top.target.uid_str != NULL && top.target.uid == UINT_MAX - 1)
                 goto out_delete_evlist;
 
         /* CPU and PID are mutually exclusive */
-        if (top.target_tid && top.cpu_list) {
+        if (top.target.tid && top.target.cpu_list) {
                 printf("WARNING: PID switch overriding CPU\n");
                 sleep(1);
-                top.cpu_list = NULL;
+                top.target.cpu_list = NULL;
         }
 
-        if (top.target_pid)
-                top.target_tid = top.target_pid;
+        if (top.target.pid)
+                top.target.tid = top.target.pid;
 
-        if (perf_evlist__create_maps(top.evlist, top.target_pid,
-                                     top.target_tid, top.uid, top.cpu_list) < 0)
+        if (perf_evlist__create_maps(top.evlist, top.target.pid,
+                                     top.target.tid, top.target.uid,
+                                     top.target.cpu_list) < 0)
                 usage_with_options(top_usage, options);
 
         if (!top.evlist->nr_entries &&