On Tue, 22 Oct 2013 14:56:51 +0400, Stanislav Fomichev wrote:
> If we don't want either power or task events we may use -T or -P
> with the `perf timechart record` command to filter out events while
> recording to keep perf.data small.
>
> Signed-off-by: Stanislav Fomichev <stfomic...@yandex-team.ru>
> ---
> tools/perf/builtin-timechart.c | 98
> +++++++++++++++++++++++++++++++-----------
> 1 file changed, 72 insertions(+), 26 deletions(-)
>
> diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
> index 4d2ac96b75b1..54bdebea4c6b 100644
> --- a/tools/perf/builtin-timechart.c
> +++ b/tools/perf/builtin-timechart.c
> @@ -1031,50 +1031,81 @@ out_delete:
>
> static int __cmd_record(int argc, const char **argv)
> {
> -#ifdef SUPPORT_OLD_POWER_EVENTS
> - const char * const record_old_args[] = {
> + unsigned int rec_argc, i, j;
> + const char **rec_argv;
> + const char **p;
> + unsigned int record_elems;
> +
> + const char * const common_args[] = {
> "record", "-a", "-R", "-c", "1",
> + };
> + unsigned int common_args_no = ARRAY_SIZE(common_args);
It's preferred to use "nr" in the position of "no". Or we can use
'common_argc' instead. Same goes to the below.
> +
> + const char * const power_args[] = {
> + "-e", "power:cpu_frequency",
> + "-e", "power:cpu_idle",
> + };
> + unsigned int power_args_no = ARRAY_SIZE(power_args);
> +
> + const char * const old_power_args[] = {
> +#ifdef SUPPORT_OLD_POWER_EVENTS
> "-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", "-c", "1",
> - "-e", "power:cpu_frequency",
> - "-e", "power:cpu_idle",
> + };
> + unsigned int old_power_args_no = ARRAY_SIZE(power_args);
It should be ARRAY_SIZE(old_power_args).
> +
> + const char * const tasks_args[] = {
> "-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;
> - unsigned int record_elems = ARRAY_SIZE(record_new_args);
> + unsigned int tasks_args_no = ARRAY_SIZE(tasks_args);
>
> #ifdef SUPPORT_OLD_POWER_EVENTS
> if (!is_valid_tracepoint("power:cpu_idle") &&
> is_valid_tracepoint("power:power_start")) {
> use_old_power_events = 1;
> - record_args = record_old_args;
> - record_elems = ARRAY_SIZE(record_old_args);
> + power_args_no = 0;
> + } else {
> + old_power_args_no = 0;
> }
> #endif
>
> - rec_argc = record_elems + argc - 1;
> + if (!proc_num)
> + tasks_args_no = 0;
> +
> + if (no_power) {
> + power_args_no = 0;
> + old_power_args_no = 0;
> + }
> +
> + record_elems = common_args_no + tasks_args_no +
> + power_args_no + old_power_args_no;
> +
> + rec_argc = record_elems + argc;
> rec_argv = calloc(rec_argc + 1, sizeof(char *));
>
> if (rec_argv == NULL)
> return -ENOMEM;
>
> - for (i = 0; i < record_elems; i++)
> - rec_argv[i] = strdup(record_args[i]);
> + p = rec_argv;
> + for (i = 0; i < common_args_no; i++)
> + *p++ = strdup(common_args[i]);
> +
> + for (i = 0; i < tasks_args_no; i++)
> + *p++ = strdup(tasks_args[i]);
> +
> + for (i = 0; i < power_args_no; i++)
> + *p++ = strdup(power_args[i]);
>
> - for (j = 1; j < (unsigned int)argc; j++, i++)
> - rec_argv[i] = argv[j];
> + for (i = 0; i < old_power_args_no; i++)
> + *p++ = strdup(old_power_args[i]);
>
> - return cmd_record(i, rec_argv, NULL);
> + for (j = 1; j < (unsigned int)argc; j++)
> + *p++ = argv[j];
> +
> + return cmd_record(rec_argc, rec_argv, NULL);
> }
>
> static int
> @@ -1108,7 +1139,7 @@ int cmd_timechart(int argc, const char **argv,
> const char *prefix __maybe_unused)
> {
> const char *output_name = "output.svg";
> - const struct option options[] = {
> + const struct option timechart_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"),
> @@ -1130,15 +1161,30 @@ int cmd_timechart(int argc, const char **argv,
> NULL
> };
>
> - argc = parse_options(argc, argv, options, timechart_usage,
> + const struct option record_options[] = {
> + OPT_CALLBACK_NOOPT('P', "power-only", NULL, NULL,
> + "record power data only", parse_power),
> + OPT_CALLBACK_NOOPT('T', "tasks-only", NULL, NULL,
> + "record processes data only", parse_tasks),
> + OPT_END()
> + };
> + const char * const record_usage[] = {
> + "perf timechart record [<options>]",
> + NULL
> + };
Do we really need to separate the option and usage for record? AFAICS
it does exactly same thing..
Thanks,
Namhyung
> + argc = parse_options(argc, argv, timechart_options, timechart_usage,
> PARSE_OPT_STOP_AT_NON_OPTION);
>
> symbol__init();
>
> - if (argc && !strncmp(argv[0], "rec", 3))
> + if (argc && !strncmp(argv[0], "rec", 3)) {
> + argc = parse_options(argc, argv, record_options, record_usage,
> + PARSE_OPT_STOP_AT_NON_OPTION);
> +
> return __cmd_record(argc, argv);
> - else if (argc)
> - usage_with_options(timechart_usage, options);
> + } else if (argc) {
> + usage_with_options(timechart_usage, timechart_options);
> + }
>
> setup_pager();
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
