On Thu, 23 Nov 2017 18:33:32 +0200
"Vladislav Valtchev (VMware)" <vladislav.valtc...@gmail.com> wrote:
> +static void init_common_record_context(struct common_record_context
*ctx,
> + enum trace_cmd curr_cmd)
> +{
> + memset(ctx, 0, sizeof(*ctx));
> + ctx->instance = &top_instance;
> + ctx->curr_cmd = curr_cmd;
> + init_instance(ctx->instance);
> + cpu_count = count_cpus();
> +}
>
> +void trace_start(int argc, char **argv)
> +{
> + struct common_record_context ctx;
> +
> + init_common_record_context(&ctx, CMD_start);
> + parse_record_options(argc, argv, &ctx);
> + record_trace(argc, argv, &ctx);
> + exit(0);
> +}
> +
> +void trace_extract(int argc, char **argv)
> +{
> + struct common_record_context ctx;
> +
> + init_common_record_context(&ctx, CMD_extract);
> + parse_record_options(argc, argv, &ctx);
> + record_trace(argc, argv, &ctx);
> + exit(0);
> +}
> +
> +void trace_stream(int argc, char **argv)
> +{
> + struct common_record_context ctx;
> +
> + init_common_record_context(&ctx, CMD_stream);
> + parse_record_options(argc, argv, &ctx);
> + record_trace(argc, argv, &ctx);
> + exit(0);
> +}
> +
> +void trace_profile(int argc, char **argv)
> +{
> + struct common_record_context ctx;
> +
> + init_common_record_context(&ctx, CMD_profile);
> +
> + handle_init = trace_init_profile;
> + ctx.events = 1;
Why setting events = 1?
> +
> + parse_record_options(argc, argv, &ctx);
> +
> + /*
> + * If no instances were set, then enable profiling on the top instance.
> + */
> + if (!buffer_instances)
> + top_instance.profile = 1;
> +
> + record_trace(argc, argv, &ctx);
> + trace_profile_int();
> exit(0);
> }
>
> @@ -4934,24 +4980,8 @@ void trace_record(int argc, char **argv)
> {
> struct common_record_context ctx;
>
> - init_common_record_context(&ctx);
> - init_instance(ctx.instance);
> -
> - if (strcmp(argv[1], "record") == 0)
> - ctx.curr_cmd = CMD_record;
> - else if (strcmp(argv[1], "start") == 0)
> - ctx.curr_cmd = CMD_start;
> - else if (strcmp(argv[1], "extract") == 0)
> - ctx.curr_cmd = CMD_extract;
> - else if (strcmp(argv[1], "stream") == 0)
> - ctx.curr_cmd = CMD_stream;
> - else if (strcmp(argv[1], "profile") == 0) {
> - ctx.curr_cmd = CMD_profile;
> - handle_init = trace_init_profile;
> - ctx.events = 1;
> - } else
> - usage(argv);
> -
> + init_common_record_context(&ctx, CMD_record);
> parse_record_options(argc, argv, &ctx);
As everything is doing both init_common_record_context() and
parse_record_options() why not just move the
init_common_record_context() into parse_record_options(). If you need
to do something special (like set events = 1 for profile) have that
done in parse_record_options() if the cmd is CMD_record. Yes, you need
to pass the CMD_* to parse_record_options() in this case.
-- Steve
> record_trace(argc, argv, &ctx);
> + exit(0);
> }
