1 files changed, 13 insertions, 27 deletions

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index a66f4272b994..b513e40974f4 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -102,6 +102,7 @@ struct sym_entry		*sym_filter_entry_sched		=   NULL;
 static int                      sym_pcnt_filter                 =      5;
 static int                      sym_counter                     =      0;
 static int                      display_weighted                =     -1;
+static const char               *cpu_list;
 
 /*
  * Symbols
@@ -982,6 +983,7 @@ static void event__process_sample(const event_t *self,
         u64 ip = self->ip.ip;
         struct sym_entry *syme;
         struct addr_location al;
+        struct sample_data data;
         struct machine *machine;
         u8 origin = self->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
 
@@ -1024,7 +1026,8 @@ static void event__process_sample(const event_t *self,
         if (self->header.misc & PERF_RECORD_MISC_EXACT_IP)
                 exact_samples++;
 
-        if (event__preprocess_sample(self, session, &al, symbol_filter) < 0 ||
+        if (event__preprocess_sample(self, session, &al, &data,
+                                     symbol_filter) < 0 ||
             al.filtered)
                 return;
 
@@ -1079,26 +1082,6 @@ static void event__process_sample(const event_t *self,
         }
 }
 
-static int event__process(event_t *event, struct perf_session *session)
-{
-        switch (event->header.type) {
-        case PERF_RECORD_COMM:
-                event__process_comm(event, session);
-                break;
-        case PERF_RECORD_MMAP:
-                event__process_mmap(event, session);
-                break;
-        case PERF_RECORD_FORK:
-        case PERF_RECORD_EXIT:
-                event__process_task(event, session);
-                break;
-        default:
-                break;
-        }
-
-        return 0;
-}
-
 struct mmap_data {
         int                     counter;
         void                    *base;
@@ -1351,8 +1334,8 @@ static const struct option options[] = {
                     "profile events on existing thread id"),
         OPT_BOOLEAN('a', "all-cpus", &system_wide,
                             "system-wide collection from all CPUs"),
-        OPT_INTEGER('C', "CPU", &profile_cpu,
-                    "CPU to profile on"),
+        OPT_STRING('C', "cpu", &cpu_list, "cpu",
+                    "list of cpus to monitor"),
         OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
                    "file", "vmlinux pathname"),
         OPT_BOOLEAN('K', "hide_kernel_symbols", &hide_kernel_symbols,
@@ -1428,10 +1411,10 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
                 return -ENOMEM;
 
         /* CPU and PID are mutually exclusive */
-        if (target_tid > 0 && profile_cpu != -1) {
+        if (target_tid > 0 && cpu_list) {
                 printf("WARNING: PID switch overriding CPU\n");
                 sleep(1);
-                profile_cpu = -1;
+                cpu_list = NULL;
         }
 
         if (!nr_counters)
@@ -1469,10 +1452,13 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
                 attrs[counter].sample_period = default_interval;
         }
 
-        if (target_tid != -1 || profile_cpu != -1)
+        if (target_tid != -1)
                 nr_cpus = 1;
         else
-                nr_cpus = read_cpu_map();
+                nr_cpus = read_cpu_map(cpu_list);
+
+        if (nr_cpus < 1)
+                usage_with_options(top_usage, options);
 
         get_term_dimensions(&winsize);
         if (print_entries == 0) {