perf: convert usages of profile_cpu in builtin-top.c to use cpu_list
PATCH 1/1 perf: convert usages of profile_cpu in builtin-top.c to use cpu_list
profile_cpu was left over from an earlier implementation that supported running perf top on a single CPU. profile_cpu was no longer set by any switch and usages of it resulted in dead code.
Instead, convert the code to use cpu_list, which is set by the -C <cpu_list> option.
Also improved the printing of nr_cpus and cpu_list by correcting the plurals.
Signed-off-by Corey Ashford <[email protected]>
--- tools/perf/builtin-top.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-)
tools/perf/builtin-top.c +5 -7
@@ -69,7 +69,6 @@ static int target_tid = -1;static pid_t *all_tids =NULL ;static int thread_num =0 ;static bool inherit = false; -static int profile_cpu =-1 ;static int nr_cpus =0 ;static int realtime_prio =0 ;static bool group = false;
@@ -558,13 +557,13 @@ static void print_sym_table(void)else printf (" (all" ); -if (profile_cpu !=-1 ) -printf (", cpu: %d)\n" , profile_cpu); +if (cpu_list) +printf (", CPU%s: %s)\n" , nr_cpus >1 ?"s" :"" , cpu_list);else {if (target_tid !=-1 )printf (")\n" );else -printf (", %d CPUs)\n" , nr_cpus); +printf (", %d CPU%s)\n" , nr_cpus, nr_cpus >1 ?"s" :"" ); }printf ("%-*.*s\n" , win_width, win_width, graph_dotted_line);
@@ -1187,11 +1186,10 @@ int group_fd;static void start_counter (int i,int counter) {struct perf_event_attr *attr; -int cpu; +int cpu =-1 ;int thread_index; - cpu = profile_cpu; -if (target_tid ==-1 && profile_cpu ==-1 ) +if (target_tid ==-1 ) cpu = cpumap[i]; attr = attrs + counter;
Signature · 1 line
1.7.0.4