From a2a810d34066e91b9819e79a5adfd3f05a1b9d7b Mon Sep 17 00:00:00 2001 From: Adrien BAK Date: Fri, 7 Mar 2014 16:26:02 +0900 Subject: [PATCH 1/7] prevent unknown options from being filtered away --- tools/perf/builtin-script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 9e9c91f5b7fae9..7e1319aace91cb 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -1578,7 +1578,7 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) setup_scripting(); argc = parse_options(argc, argv, options, script_usage, - PARSE_OPT_STOP_AT_NON_OPTION); + PARSE_OPT_KEEP_UNKNOWN); file.path = input_name; From 56c7d536287ccc1e6b37d1bac5abce1ecc398e80 Mon Sep 17 00:00:00 2001 From: Adrien BAK Date: Fri, 7 Mar 2014 19:10:13 +0900 Subject: [PATCH 2/7] fix the problem with options not being passed to the script. Introduce a new mode for perf options, in which the parsing stopsafter the first option that has this flag active --- tools/perf/builtin-script.c | 6 +++--- tools/perf/util/parse-options.c | 4 ++++ tools/perf/util/parse-options.h | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 7e1319aace91cb..77338a1f7264a2 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -1523,9 +1523,9 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) "show latency attributes (irqs/preemption disabled, etc)"), OPT_CALLBACK_NOOPT('l', "list", NULL, NULL, "list available scripts", list_available_scripts), - OPT_CALLBACK('s', "script", NULL, "name", - "script file name (lang:script name, script name, or *)", - parse_scriptname), + OPT_CALLBACK_FINAL_OPTION('s', "script", NULL, "name", + "script file name (lang:script name, script name, or *)", + parse_scriptname), OPT_STRING('g', "gen-script", &generate_script_lang, "lang", "generate perf-script.xx script in specified language"), OPT_STRING('i', "input", &input_name, "file", "input file name"), diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c index d22e3f8017dc42..77f566d78760ce 100644 --- a/tools/perf/util/parse-options.c +++ b/tools/perf/util/parse-options.c @@ -112,6 +112,8 @@ static int get_value(struct parse_opt_ctx_t *p, return (*opt->callback)(opt, NULL, 0) ? (-1) : 0; if (get_arg(p, opt, flags, &arg)) return -1; + if (opt->flags & PARSE_OPT_FINAL_OPTION) + return (*opt->callback)(opt, arg, 0)?(-1) : (-3); return (*opt->callback)(opt, arg, 0) ? (-1) : 0; case OPTION_INTEGER: @@ -366,6 +368,8 @@ int parse_options_step(struct parse_opt_ctx_t *ctx, return parse_options_usage(usagestr, options, arg + 1, 1); case -2: goto unknown; + case -3: + return PARSE_OPT_DONE; default: break; } diff --git a/tools/perf/util/parse-options.h b/tools/perf/util/parse-options.h index cbf0149cf22178..fca3468195ace4 100644 --- a/tools/perf/util/parse-options.h +++ b/tools/perf/util/parse-options.h @@ -38,6 +38,7 @@ enum parse_opt_option_flags { PARSE_OPT_NONEG = 4, PARSE_OPT_HIDDEN = 8, PARSE_OPT_LASTARG_DEFAULT = 16, + PARSE_OPT_FINAL_OPTION = 32, }; struct option; @@ -123,6 +124,8 @@ struct option { { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), .argh = "time", .help = (h), .callback = parse_opt_approxidate_cb } #define OPT_CALLBACK(s, l, v, a, h, f) \ { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f) } +#define OPT_CALLBACK_FINAL_OPTION(s, l, v, a, h, f) \ + { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f), .flags = PARSE_OPT_FINAL_OPTION } #define OPT_CALLBACK_NOOPT(s, l, v, a, h, f) \ { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f), .flags = PARSE_OPT_NOARG } #define OPT_CALLBACK_DEFAULT(s, l, v, a, h, f, d) \ From 95dffb9f1ae9bf8a97b16f047dc30a831cc26f46 Mon Sep 17 00:00:00 2001 From: Adrien BAK Date: Mon, 17 Mar 2014 16:17:20 +0100 Subject: [PATCH 3/7] white space --- tools/perf/builtin-script.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 77338a1f7264a2..7444c49cdc7794 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -1480,7 +1480,7 @@ static int have_cmd(int argc, const char **argv) memcpy(__argv, argv, sizeof(const char *) * argc); argc = parse_options(argc, (const char **)__argv, record_options, - NULL, PARSE_OPT_STOP_AT_NON_OPTION); + NULL, PARSE_OPT_STOP_AT_NON_OPTION); free(__argv); system_wide = (argc == 0); @@ -1518,11 +1518,11 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, "dump raw trace in ASCII"), OPT_INCR('v', "verbose", &verbose, - "be more verbose (show symbol address, etc)"), + "be more verbose (show symbol address, etc)"), OPT_BOOLEAN('L', "Latency", &latency_format, "show latency attributes (irqs/preemption disabled, etc)"), OPT_CALLBACK_NOOPT('l', "list", NULL, NULL, "list available scripts", - list_available_scripts), + list_available_scripts), OPT_CALLBACK_FINAL_OPTION('s', "script", NULL, "name", "script file name (lang:script name, script name, or *)", parse_scriptname), @@ -1542,10 +1542,10 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory", "Look for files with symbols relative to this directory"), OPT_CALLBACK('f', "fields", NULL, "str", - "comma separated output fields prepend with 'type:'. " - "Valid types: hw,sw,trace,raw. " - "Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso," - "addr,symoff", parse_output_fields), + "comma separated output fields prepend with 'type:'. " + "Valid types: hw,sw,trace,raw. " + "Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso," + "addr,symoff", parse_output_fields), OPT_BOOLEAN('a', "all-cpus", &system_wide, "system-wide collection from all CPUs"), OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]", @@ -1578,7 +1578,7 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) setup_scripting(); argc = parse_options(argc, argv, options, script_usage, - PARSE_OPT_KEEP_UNKNOWN); + PARSE_OPT_KEEP_UNKNOWN); file.path = input_name; From 976c02f9016b5be29a39948820fd731b1f8e2fd6 Mon Sep 17 00:00:00 2001 From: Adrien BAK Date: Mon, 17 Mar 2014 16:58:45 +0100 Subject: [PATCH 4/7] Revert "white space" This reverts commit 95dffb9f1ae9bf8a97b16f047dc30a831cc26f46. --- tools/perf/builtin-script.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 7444c49cdc7794..77338a1f7264a2 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -1480,7 +1480,7 @@ static int have_cmd(int argc, const char **argv) memcpy(__argv, argv, sizeof(const char *) * argc); argc = parse_options(argc, (const char **)__argv, record_options, - NULL, PARSE_OPT_STOP_AT_NON_OPTION); + NULL, PARSE_OPT_STOP_AT_NON_OPTION); free(__argv); system_wide = (argc == 0); @@ -1518,11 +1518,11 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, "dump raw trace in ASCII"), OPT_INCR('v', "verbose", &verbose, - "be more verbose (show symbol address, etc)"), + "be more verbose (show symbol address, etc)"), OPT_BOOLEAN('L', "Latency", &latency_format, "show latency attributes (irqs/preemption disabled, etc)"), OPT_CALLBACK_NOOPT('l', "list", NULL, NULL, "list available scripts", - list_available_scripts), + list_available_scripts), OPT_CALLBACK_FINAL_OPTION('s', "script", NULL, "name", "script file name (lang:script name, script name, or *)", parse_scriptname), @@ -1542,10 +1542,10 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory", "Look for files with symbols relative to this directory"), OPT_CALLBACK('f', "fields", NULL, "str", - "comma separated output fields prepend with 'type:'. " - "Valid types: hw,sw,trace,raw. " - "Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso," - "addr,symoff", parse_output_fields), + "comma separated output fields prepend with 'type:'. " + "Valid types: hw,sw,trace,raw. " + "Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso," + "addr,symoff", parse_output_fields), OPT_BOOLEAN('a', "all-cpus", &system_wide, "system-wide collection from all CPUs"), OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]", @@ -1578,7 +1578,7 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) setup_scripting(); argc = parse_options(argc, argv, options, script_usage, - PARSE_OPT_KEEP_UNKNOWN); + PARSE_OPT_KEEP_UNKNOWN); file.path = input_name; From 5c5cec4a04b2fa3c7b6a1063d66073fc82ea4ebc Mon Sep 17 00:00:00 2001 From: Adrien BAK Date: Mon, 17 Mar 2014 17:33:25 +0100 Subject: [PATCH 5/7] white space --- tools/perf/builtin-script.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 77338a1f7264a2..54f37b70c1be5f 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -1524,8 +1524,8 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) OPT_CALLBACK_NOOPT('l', "list", NULL, NULL, "list available scripts", list_available_scripts), OPT_CALLBACK_FINAL_OPTION('s', "script", NULL, "name", - "script file name (lang:script name, script name, or *)", - parse_scriptname), + "script file name (lang:script name, script name, or *)", + parse_scriptname), OPT_STRING('g', "gen-script", &generate_script_lang, "lang", "generate perf-script.xx script in specified language"), OPT_STRING('i', "input", &input_name, "file", "input file name"), @@ -1578,7 +1578,7 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) setup_scripting(); argc = parse_options(argc, argv, options, script_usage, - PARSE_OPT_KEEP_UNKNOWN); + PARSE_OPT_KEEP_UNKNOWN); file.path = input_name; From fab2e24d902ca6f750bc31ee3adb0b8be59346f0 Mon Sep 17 00:00:00 2001 From: Adrien BAK Date: Tue, 18 Mar 2014 13:51:44 +0100 Subject: [PATCH 6/7] linux coding style bites hard --- tools/perf/builtin-script.c | 4 ++-- tools/perf/util/parse-options.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 54f37b70c1be5f..3cd6a466cd0df1 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -1524,8 +1524,8 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) OPT_CALLBACK_NOOPT('l', "list", NULL, NULL, "list available scripts", list_available_scripts), OPT_CALLBACK_FINAL_OPTION('s', "script", NULL, "name", - "script file name (lang:script name, script name, or *)", - parse_scriptname), + "script file name (lang:script name, script name, or *)", + parse_scriptname), OPT_STRING('g', "gen-script", &generate_script_lang, "lang", "generate perf-script.xx script in specified language"), OPT_STRING('i', "input", &input_name, "file", "input file name"), diff --git a/tools/perf/util/parse-options.h b/tools/perf/util/parse-options.h index fca3468195ace4..6d0cc4834c120e 100644 --- a/tools/perf/util/parse-options.h +++ b/tools/perf/util/parse-options.h @@ -125,7 +125,8 @@ struct option { #define OPT_CALLBACK(s, l, v, a, h, f) \ { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f) } #define OPT_CALLBACK_FINAL_OPTION(s, l, v, a, h, f) \ - { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f), .flags = PARSE_OPT_FINAL_OPTION } + { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), \ + .callback = (f), .flags = PARSE_OPT_FINAL_OPTION } #define OPT_CALLBACK_NOOPT(s, l, v, a, h, f) \ { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f), .flags = PARSE_OPT_NOARG } #define OPT_CALLBACK_DEFAULT(s, l, v, a, h, f, d) \ From a6bff87fa6cb5c9b8fb67fc7c517b75deafc6792 Mon Sep 17 00:00:00 2001 From: Adrien BAK Date: Tue, 18 Mar 2014 14:02:03 +0100 Subject: [PATCH 7/7] really hard --- tools/perf/util/parse-options.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/parse-options.h b/tools/perf/util/parse-options.h index 6d0cc4834c120e..b1fa6b6c2039e1 100644 --- a/tools/perf/util/parse-options.h +++ b/tools/perf/util/parse-options.h @@ -125,8 +125,9 @@ struct option { #define OPT_CALLBACK(s, l, v, a, h, f) \ { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f) } #define OPT_CALLBACK_FINAL_OPTION(s, l, v, a, h, f) \ - { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), \ - .callback = (f), .flags = PARSE_OPT_FINAL_OPTION } + { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l),\ + .value = (v), (a), .help = (h), .callback = (f),\ + .flags = PARSE_OPT_FINAL_OPTION} #define OPT_CALLBACK_NOOPT(s, l, v, a, h, f) \ { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f), .flags = PARSE_OPT_NOARG } #define OPT_CALLBACK_DEFAULT(s, l, v, a, h, f, d) \