forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf timechart: Don't use globals where not needed to

Browse source 
Some variables were global but used in just one function, so move it to
where it belongs.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-fapdrw3h3hz713w8h5eww596@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2012-10-01 15:20:58 -03:00
commit 73bdc7159b
1 changed files with 41 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

100
tools/perf/builtin-timechart.c
View file

@ -38,9 +38,6 @@
#define PWR_EVENT_EXIT -1 #define PWR_EVENT_EXIT -1
static const char *input_name;
static const char *output_name = "output.svg";
static unsigned int numcpus; static unsigned int numcpus;
static u64 min_freq; /* Lowest CPU frequency seen */ static u64 min_freq; /* Lowest CPU frequency seen */
static u64 max_freq; /* Highest 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(); svg_close();
} }
static struct perf_tool perf_timechart = { static int __cmd_timechart(const char *input_name, const char *output_name)
.comm = process_comm_event,
.fork = process_fork_event,
.exit = process_exit_event,
.sample = process_sample_event,
.ordered_samples = true,
};
static int __cmd_timechart(void)
{ {
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, struct perf_session *session = perf_session__new(input_name, O_RDONLY,
0, false, &perf_timechart); 0, false, &perf_timechart);
int ret = -EINVAL; int ret = -EINVAL;
@ -1005,40 +1001,25 @@ out_delete:
return ret; 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) 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; unsigned int rec_argc, i, j;
const char **rec_argv; const char **rec_argv;
const char * const *record_args = record_new_args; 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; return 0;
} }
static const struct option options[] = { int cmd_timechart(int argc, const char **argv,
OPT_STRING('i', "input", &input_name, "file", const char *prefix __maybe_unused)
"input file name"), {
OPT_STRING('o', "output", &output_name, "file", const char *input_name;
"output file name"), const char *output_name = "output.svg";
OPT_INTEGER('w', "width", &svg_page_width, const struct option options[] = {
"page width"), OPT_STRING('i', "input", &input_name, "file", "input file name"),
OPT_BOOLEAN('P', "power-only", &power_only, OPT_STRING('o', "output", &output_name, "file", "output file name"),
"output power data only"), 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", OPT_CALLBACK('p', "process", NULL, "process",
"process selector. Pass a pid or process name.", "process selector. Pass a pid or process name.",
parse_process), parse_process),
OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory", OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
"Look for files with symbols relative to this directory"), "Look for files with symbols relative to this directory"),
OPT_END() 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, argc = parse_options(argc, argv, options, timechart_usage,
PARSE_OPT_STOP_AT_NON_OPTION); PARSE_OPT_STOP_AT_NON_OPTION);
@ -1110,5 +1092,5 @@ int cmd_timechart(int argc, const char **argv,
setup_pager(); setup_pager();
return __cmd_timechart(); return __cmd_timechart(input_name, output_name);
} }