perf timechart: Don' t use globals where not needed to
Commit-ID: 73bdc7159b0a83146fa8d1b8df7baf1cea992d4c Gitweb: http://git.kernel.org/tip/73bdc7159b0a83146fa8d1b8df7baf1cea992d4c Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 1 Oct 2012 15:20:58 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 2 Oct 2012 18:36:34 -0300
perf timechart: Don't use globals where not needed to
Some variables were global but used in just one function, so move it to where it belongs.
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-timechart.c | 100 ++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 59 deletions(-)
tools/perf/builtin-timechart.c +41 -59
@@ -38,9 +38,6 @@#define PWR_EVENT_EXIT -1 -static const char *input_name; -static const char *output_name ="output.svg" ; -static unsigned int numcpus;static u64 min_freq;/* Lowest CPU frequency seen */ static u64 max_freq;/* Highest CPU frequency seen */
@@ -968,16 +965,15 @@ static void write_svg_file(const char *filename)svg_close (); } -static struct perf_tool perf_timechart = { - .comm = process_comm_event, - .fork = process_fork_event, - .exit = process_exit_event, - .sample = process_sample_event, - .ordered_samples = true, -}; - -static int __cmd_timechart (void ) +static int __cmd_timechart (const char *input_name,const char *output_name) { +struct perf_tool perf_timechart = { + .comm = process_comm_event, + .fork = process_fork_event, + .exit = process_exit_event, + .sample = process_sample_event, + .ordered_samples = true, + };struct perf_session *session =perf_session__new (input_name,O_RDONLY ,0 , false, &perf_timechart);int ret = -EINVAL ;
@@ -1005,40 +1001,25 @@ out_delete:return ret; } -static const char *const timechart_usage[] = { -"perf timechart [<options>] {record}" , -NULL -}; - -#ifdef SUPPORT_OLD_POWER_EVENTS -static const char *const record_old_args[] = { -"record" , -"-a" , -"-R" , -"-f" , -"-c" ,"1" , -"-e" ,"power:power_start" , -"-e" ,"power:power_end" , -"-e" ,"power:power_frequency" , -"-e" ,"sched:sched_wakeup" , -"-e" ,"sched:sched_switch" , -}; -#endif - -static const char *const record_new_args[] = { -"record" , -"-a" , -"-R" , -"-f" , -"-c" ,"1" , -"-e" ,"power:cpu_frequency" , -"-e" ,"power:cpu_idle" , -"-e" ,"sched:sched_wakeup" , -"-e" ,"sched:sched_switch" , -}; -static int __cmd_record (int argc,const char **argv) { +#ifdef SUPPORT_OLD_POWER_EVENTS +const char *const record_old_args[] = { +"record" ,"-a" ,"-R" ,"-f" ,"-c" ,"1" , +"-e" ,"power:power_start" , +"-e" ,"power:power_end" , +"-e" ,"power:power_frequency" , +"-e" ,"sched:sched_wakeup" , +"-e" ,"sched:sched_switch" , + }; +#endif +const char *const record_new_args[] = { +"record" ,"-a" ,"-R" ,"-f" ,"-c" ,"1" , +"-e" ,"power:cpu_frequency" , +"-e" ,"power:cpu_idle" , +"-e" ,"sched:sched_wakeup" , +"-e" ,"sched:sched_switch" , + };unsigned int rec_argc, i, j;const char **rec_argv;const char *const *record_args = record_new_args;
@@ -1077,27 +1058,28 @@ parse_process(const struct option *opt __maybe_unused, const char *arg,return 0 ; } -static const struct option options[] = { -OPT_STRING ('i' ,"input" , &input_name,"file" , -"input file name" ), -OPT_STRING ('o' ,"output" , &output_name,"file" , -"output file name" ), -OPT_INTEGER ('w' ,"width" , &svg_page_width, -"page width" ), -OPT_BOOLEAN ('P' ,"power-only" , &power_only, -"output power data only" ), +int cmd_timechart (int argc,const char **argv, +const char *prefix__maybe_unused ) +{ +const char *input_name; +const char *output_name ="output.svg" ; +const struct option options[] = { +OPT_STRING ('i' ,"input" , &input_name,"file" ,"input file name" ), +OPT_STRING ('o' ,"output" , &output_name,"file" ,"output file name" ), +OPT_INTEGER ('w' ,"width" , &svg_page_width,"page width" ), +OPT_BOOLEAN ('P' ,"power-only" , &power_only,"output power data only" ),OPT_CALLBACK ('p' ,"process" ,NULL ,"process" ,"process selector. Pass a pid or process name." , parse_process),OPT_STRING (0 ,"symfs" , &symbol_conf.symfs,"directory" ,"Look for files with symbols relative to this directory" ),OPT_END () -}; - + }; +const char *const timechart_usage[] = { +"perf timechart [<options>] {record}" , +NULL + }; -int cmd_timechart (int argc,const char **argv, -const char *prefix__maybe_unused ) -{ argc =parse_options (argc, argv, options, timechart_usage,PARSE_OPT_STOP_AT_NON_OPTION );
@@ -1110,5 +1092,5 @@ int cmd_timechart(int argc, const char **argv,setup_pager (); -return __cmd_timechart (); +return __cmd_timechart (input_name, output_name); }