2015-12-15 15:39:38 +00:00
|
|
|
#include <linux/compiler.h>
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <ctype.h>
|
2015-12-15 15:39:36 +00:00
|
|
|
#include "subcmd-util.h"
|
2009-04-20 13:00:56 +00:00
|
|
|
#include "parse-options.h"
|
2015-12-15 15:39:35 +00:00
|
|
|
#include "subcmd-config.h"
|
2015-12-15 15:39:38 +00:00
|
|
|
#include "pager.h"
|
2009-04-20 13:00:56 +00:00
|
|
|
|
|
|
|
#define OPT_SHORT 1
|
|
|
|
#define OPT_UNSET 2
|
|
|
|
|
2015-12-15 15:39:36 +00:00
|
|
|
char *error_buf;
|
2015-10-24 15:49:26 +00:00
|
|
|
|
2009-04-20 13:00:56 +00:00
|
|
|
static int opterror(const struct option *opt, const char *reason, int flags)
|
|
|
|
{
|
|
|
|
if (flags & OPT_SHORT)
|
2015-12-15 15:39:38 +00:00
|
|
|
fprintf(stderr, " Error: switch `%c' %s", opt->short_name, reason);
|
|
|
|
else if (flags & OPT_UNSET)
|
|
|
|
fprintf(stderr, " Error: option `no-%s' %s", opt->long_name, reason);
|
|
|
|
else
|
|
|
|
fprintf(stderr, " Error: option `%s' %s", opt->long_name, reason);
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *skip_prefix(const char *str, const char *prefix)
|
|
|
|
{
|
|
|
|
size_t len = strlen(prefix);
|
|
|
|
return strncmp(str, prefix, len) ? NULL : str + len;
|
2009-04-20 13:00:56 +00:00
|
|
|
}
|
|
|
|
|
perf tools: Make options always available, even if required libs not linked
This patch keeps options of perf builtins same in all conditions. If
one option is disabled because of compiling options, users should be
notified.
Masami suggested another implementation in [1] that, by adding a
OPTION_NEXT_DEPENDS option before those options in the 'struct option'
array, options parser knows an option is disabled. However, in some
cases this array is reordered (options__order()). In addition, in
parse-option.c that array is const, so we can't simply merge
information in decorator option into the affacted option.
This patch chooses a simpler implementation that, introducing a
set_option_nobuild() function and two option parsing flags. Builtins
with such options should call set_option_nobuild() before option
parsing. The complexity of this patch is because we want some of options
can be skipped safely. In this case their arguments should also be
consumed.
Options in 'perf record' and 'perf probe' are fixed in this patch.
[1] http://lkml.kernel.org/g/50399556C9727B4D88A595C8584AAB3752627CD4@GSjpTKYDCembx32.service.hitachi.net
Test result:
Normal case:
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
Build with NO_DWARF=1:
# ./perf probe -L sys_write
Error: switch `L' is not available because NO_DWARF=1
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
or: perf probe [<options>] --del '[GROUP:]EVENT' ...
or: perf probe --list [GROUP:]EVENT ...
or: perf probe [<options>] --funcs
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
# ./perf probe -k /tmp/vmlinux sys_write
Warning: switch `k' is being ignored because NO_DWARF=1
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Warning: option `vmlinux' is being ignored because NO_DWARF=1
Added new event:
[SNIP]
# ./perf probe -l
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
...
-k, --vmlinux <file> vmlinux pathname
(not built-in because NO_DWARF=1)
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
...
-V, --vars <FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT>
Show accessible variables on PROBEDEF
(not built-in because NO_DWARF=1)
--externs Show external variables too (with --vars only)
(not built-in because NO_DWARF=1)
--no-inlines Don't search inlined functions
(not built-in because NO_DWARF=1)
--range Show variables location range in scope (with --vars only)
(not built-in because NO_DWARF=1)
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1450089563-122430-14-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-12-14 10:39:22 +00:00
|
|
|
static void optwarning(const struct option *opt, const char *reason, int flags)
|
|
|
|
{
|
|
|
|
if (flags & OPT_SHORT)
|
2015-12-15 15:39:38 +00:00
|
|
|
fprintf(stderr, " Warning: switch `%c' %s", opt->short_name, reason);
|
perf tools: Make options always available, even if required libs not linked
This patch keeps options of perf builtins same in all conditions. If
one option is disabled because of compiling options, users should be
notified.
Masami suggested another implementation in [1] that, by adding a
OPTION_NEXT_DEPENDS option before those options in the 'struct option'
array, options parser knows an option is disabled. However, in some
cases this array is reordered (options__order()). In addition, in
parse-option.c that array is const, so we can't simply merge
information in decorator option into the affacted option.
This patch chooses a simpler implementation that, introducing a
set_option_nobuild() function and two option parsing flags. Builtins
with such options should call set_option_nobuild() before option
parsing. The complexity of this patch is because we want some of options
can be skipped safely. In this case their arguments should also be
consumed.
Options in 'perf record' and 'perf probe' are fixed in this patch.
[1] http://lkml.kernel.org/g/50399556C9727B4D88A595C8584AAB3752627CD4@GSjpTKYDCembx32.service.hitachi.net
Test result:
Normal case:
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
Build with NO_DWARF=1:
# ./perf probe -L sys_write
Error: switch `L' is not available because NO_DWARF=1
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
or: perf probe [<options>] --del '[GROUP:]EVENT' ...
or: perf probe --list [GROUP:]EVENT ...
or: perf probe [<options>] --funcs
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
# ./perf probe -k /tmp/vmlinux sys_write
Warning: switch `k' is being ignored because NO_DWARF=1
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Warning: option `vmlinux' is being ignored because NO_DWARF=1
Added new event:
[SNIP]
# ./perf probe -l
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
...
-k, --vmlinux <file> vmlinux pathname
(not built-in because NO_DWARF=1)
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
...
-V, --vars <FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT>
Show accessible variables on PROBEDEF
(not built-in because NO_DWARF=1)
--externs Show external variables too (with --vars only)
(not built-in because NO_DWARF=1)
--no-inlines Don't search inlined functions
(not built-in because NO_DWARF=1)
--range Show variables location range in scope (with --vars only)
(not built-in because NO_DWARF=1)
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1450089563-122430-14-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-12-14 10:39:22 +00:00
|
|
|
else if (flags & OPT_UNSET)
|
2015-12-15 15:39:38 +00:00
|
|
|
fprintf(stderr, " Warning: option `no-%s' %s", opt->long_name, reason);
|
perf tools: Make options always available, even if required libs not linked
This patch keeps options of perf builtins same in all conditions. If
one option is disabled because of compiling options, users should be
notified.
Masami suggested another implementation in [1] that, by adding a
OPTION_NEXT_DEPENDS option before those options in the 'struct option'
array, options parser knows an option is disabled. However, in some
cases this array is reordered (options__order()). In addition, in
parse-option.c that array is const, so we can't simply merge
information in decorator option into the affacted option.
This patch chooses a simpler implementation that, introducing a
set_option_nobuild() function and two option parsing flags. Builtins
with such options should call set_option_nobuild() before option
parsing. The complexity of this patch is because we want some of options
can be skipped safely. In this case their arguments should also be
consumed.
Options in 'perf record' and 'perf probe' are fixed in this patch.
[1] http://lkml.kernel.org/g/50399556C9727B4D88A595C8584AAB3752627CD4@GSjpTKYDCembx32.service.hitachi.net
Test result:
Normal case:
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
Build with NO_DWARF=1:
# ./perf probe -L sys_write
Error: switch `L' is not available because NO_DWARF=1
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
or: perf probe [<options>] --del '[GROUP:]EVENT' ...
or: perf probe --list [GROUP:]EVENT ...
or: perf probe [<options>] --funcs
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
# ./perf probe -k /tmp/vmlinux sys_write
Warning: switch `k' is being ignored because NO_DWARF=1
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Warning: option `vmlinux' is being ignored because NO_DWARF=1
Added new event:
[SNIP]
# ./perf probe -l
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
...
-k, --vmlinux <file> vmlinux pathname
(not built-in because NO_DWARF=1)
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
...
-V, --vars <FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT>
Show accessible variables on PROBEDEF
(not built-in because NO_DWARF=1)
--externs Show external variables too (with --vars only)
(not built-in because NO_DWARF=1)
--no-inlines Don't search inlined functions
(not built-in because NO_DWARF=1)
--range Show variables location range in scope (with --vars only)
(not built-in because NO_DWARF=1)
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1450089563-122430-14-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-12-14 10:39:22 +00:00
|
|
|
else
|
2015-12-15 15:39:38 +00:00
|
|
|
fprintf(stderr, " Warning: option `%s' %s", opt->long_name, reason);
|
perf tools: Make options always available, even if required libs not linked
This patch keeps options of perf builtins same in all conditions. If
one option is disabled because of compiling options, users should be
notified.
Masami suggested another implementation in [1] that, by adding a
OPTION_NEXT_DEPENDS option before those options in the 'struct option'
array, options parser knows an option is disabled. However, in some
cases this array is reordered (options__order()). In addition, in
parse-option.c that array is const, so we can't simply merge
information in decorator option into the affacted option.
This patch chooses a simpler implementation that, introducing a
set_option_nobuild() function and two option parsing flags. Builtins
with such options should call set_option_nobuild() before option
parsing. The complexity of this patch is because we want some of options
can be skipped safely. In this case their arguments should also be
consumed.
Options in 'perf record' and 'perf probe' are fixed in this patch.
[1] http://lkml.kernel.org/g/50399556C9727B4D88A595C8584AAB3752627CD4@GSjpTKYDCembx32.service.hitachi.net
Test result:
Normal case:
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
Build with NO_DWARF=1:
# ./perf probe -L sys_write
Error: switch `L' is not available because NO_DWARF=1
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
or: perf probe [<options>] --del '[GROUP:]EVENT' ...
or: perf probe --list [GROUP:]EVENT ...
or: perf probe [<options>] --funcs
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
# ./perf probe -k /tmp/vmlinux sys_write
Warning: switch `k' is being ignored because NO_DWARF=1
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Warning: option `vmlinux' is being ignored because NO_DWARF=1
Added new event:
[SNIP]
# ./perf probe -l
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
...
-k, --vmlinux <file> vmlinux pathname
(not built-in because NO_DWARF=1)
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
...
-V, --vars <FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT>
Show accessible variables on PROBEDEF
(not built-in because NO_DWARF=1)
--externs Show external variables too (with --vars only)
(not built-in because NO_DWARF=1)
--no-inlines Don't search inlined functions
(not built-in because NO_DWARF=1)
--range Show variables location range in scope (with --vars only)
(not built-in because NO_DWARF=1)
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1450089563-122430-14-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-12-14 10:39:22 +00:00
|
|
|
}
|
|
|
|
|
2009-04-20 13:00:56 +00:00
|
|
|
static int get_arg(struct parse_opt_ctx_t *p, const struct option *opt,
|
|
|
|
int flags, const char **arg)
|
|
|
|
{
|
perf tools: Make options always available, even if required libs not linked
This patch keeps options of perf builtins same in all conditions. If
one option is disabled because of compiling options, users should be
notified.
Masami suggested another implementation in [1] that, by adding a
OPTION_NEXT_DEPENDS option before those options in the 'struct option'
array, options parser knows an option is disabled. However, in some
cases this array is reordered (options__order()). In addition, in
parse-option.c that array is const, so we can't simply merge
information in decorator option into the affacted option.
This patch chooses a simpler implementation that, introducing a
set_option_nobuild() function and two option parsing flags. Builtins
with such options should call set_option_nobuild() before option
parsing. The complexity of this patch is because we want some of options
can be skipped safely. In this case their arguments should also be
consumed.
Options in 'perf record' and 'perf probe' are fixed in this patch.
[1] http://lkml.kernel.org/g/50399556C9727B4D88A595C8584AAB3752627CD4@GSjpTKYDCembx32.service.hitachi.net
Test result:
Normal case:
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
Build with NO_DWARF=1:
# ./perf probe -L sys_write
Error: switch `L' is not available because NO_DWARF=1
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
or: perf probe [<options>] --del '[GROUP:]EVENT' ...
or: perf probe --list [GROUP:]EVENT ...
or: perf probe [<options>] --funcs
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
# ./perf probe -k /tmp/vmlinux sys_write
Warning: switch `k' is being ignored because NO_DWARF=1
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Warning: option `vmlinux' is being ignored because NO_DWARF=1
Added new event:
[SNIP]
# ./perf probe -l
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
...
-k, --vmlinux <file> vmlinux pathname
(not built-in because NO_DWARF=1)
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
...
-V, --vars <FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT>
Show accessible variables on PROBEDEF
(not built-in because NO_DWARF=1)
--externs Show external variables too (with --vars only)
(not built-in because NO_DWARF=1)
--no-inlines Don't search inlined functions
(not built-in because NO_DWARF=1)
--range Show variables location range in scope (with --vars only)
(not built-in because NO_DWARF=1)
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1450089563-122430-14-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-12-14 10:39:22 +00:00
|
|
|
const char *res;
|
|
|
|
|
2009-04-20 13:00:56 +00:00
|
|
|
if (p->opt) {
|
perf tools: Make options always available, even if required libs not linked
This patch keeps options of perf builtins same in all conditions. If
one option is disabled because of compiling options, users should be
notified.
Masami suggested another implementation in [1] that, by adding a
OPTION_NEXT_DEPENDS option before those options in the 'struct option'
array, options parser knows an option is disabled. However, in some
cases this array is reordered (options__order()). In addition, in
parse-option.c that array is const, so we can't simply merge
information in decorator option into the affacted option.
This patch chooses a simpler implementation that, introducing a
set_option_nobuild() function and two option parsing flags. Builtins
with such options should call set_option_nobuild() before option
parsing. The complexity of this patch is because we want some of options
can be skipped safely. In this case their arguments should also be
consumed.
Options in 'perf record' and 'perf probe' are fixed in this patch.
[1] http://lkml.kernel.org/g/50399556C9727B4D88A595C8584AAB3752627CD4@GSjpTKYDCembx32.service.hitachi.net
Test result:
Normal case:
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
Build with NO_DWARF=1:
# ./perf probe -L sys_write
Error: switch `L' is not available because NO_DWARF=1
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
or: perf probe [<options>] --del '[GROUP:]EVENT' ...
or: perf probe --list [GROUP:]EVENT ...
or: perf probe [<options>] --funcs
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
# ./perf probe -k /tmp/vmlinux sys_write
Warning: switch `k' is being ignored because NO_DWARF=1
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Warning: option `vmlinux' is being ignored because NO_DWARF=1
Added new event:
[SNIP]
# ./perf probe -l
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
...
-k, --vmlinux <file> vmlinux pathname
(not built-in because NO_DWARF=1)
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
...
-V, --vars <FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT>
Show accessible variables on PROBEDEF
(not built-in because NO_DWARF=1)
--externs Show external variables too (with --vars only)
(not built-in because NO_DWARF=1)
--no-inlines Don't search inlined functions
(not built-in because NO_DWARF=1)
--range Show variables location range in scope (with --vars only)
(not built-in because NO_DWARF=1)
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1450089563-122430-14-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-12-14 10:39:22 +00:00
|
|
|
res = p->opt;
|
2009-04-20 13:00:56 +00:00
|
|
|
p->opt = NULL;
|
2009-07-02 15:58:20 +00:00
|
|
|
} else if ((opt->flags & PARSE_OPT_LASTARG_DEFAULT) && (p->argc == 1 ||
|
|
|
|
**(p->argv + 1) == '-')) {
|
perf tools: Make options always available, even if required libs not linked
This patch keeps options of perf builtins same in all conditions. If
one option is disabled because of compiling options, users should be
notified.
Masami suggested another implementation in [1] that, by adding a
OPTION_NEXT_DEPENDS option before those options in the 'struct option'
array, options parser knows an option is disabled. However, in some
cases this array is reordered (options__order()). In addition, in
parse-option.c that array is const, so we can't simply merge
information in decorator option into the affacted option.
This patch chooses a simpler implementation that, introducing a
set_option_nobuild() function and two option parsing flags. Builtins
with such options should call set_option_nobuild() before option
parsing. The complexity of this patch is because we want some of options
can be skipped safely. In this case their arguments should also be
consumed.
Options in 'perf record' and 'perf probe' are fixed in this patch.
[1] http://lkml.kernel.org/g/50399556C9727B4D88A595C8584AAB3752627CD4@GSjpTKYDCembx32.service.hitachi.net
Test result:
Normal case:
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
Build with NO_DWARF=1:
# ./perf probe -L sys_write
Error: switch `L' is not available because NO_DWARF=1
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
or: perf probe [<options>] --del '[GROUP:]EVENT' ...
or: perf probe --list [GROUP:]EVENT ...
or: perf probe [<options>] --funcs
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
# ./perf probe -k /tmp/vmlinux sys_write
Warning: switch `k' is being ignored because NO_DWARF=1
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Warning: option `vmlinux' is being ignored because NO_DWARF=1
Added new event:
[SNIP]
# ./perf probe -l
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
...
-k, --vmlinux <file> vmlinux pathname
(not built-in because NO_DWARF=1)
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
...
-V, --vars <FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT>
Show accessible variables on PROBEDEF
(not built-in because NO_DWARF=1)
--externs Show external variables too (with --vars only)
(not built-in because NO_DWARF=1)
--no-inlines Don't search inlined functions
(not built-in because NO_DWARF=1)
--range Show variables location range in scope (with --vars only)
(not built-in because NO_DWARF=1)
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1450089563-122430-14-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-12-14 10:39:22 +00:00
|
|
|
res = (const char *)opt->defval;
|
2009-04-20 13:00:56 +00:00
|
|
|
} else if (p->argc > 1) {
|
|
|
|
p->argc--;
|
perf tools: Make options always available, even if required libs not linked
This patch keeps options of perf builtins same in all conditions. If
one option is disabled because of compiling options, users should be
notified.
Masami suggested another implementation in [1] that, by adding a
OPTION_NEXT_DEPENDS option before those options in the 'struct option'
array, options parser knows an option is disabled. However, in some
cases this array is reordered (options__order()). In addition, in
parse-option.c that array is const, so we can't simply merge
information in decorator option into the affacted option.
This patch chooses a simpler implementation that, introducing a
set_option_nobuild() function and two option parsing flags. Builtins
with such options should call set_option_nobuild() before option
parsing. The complexity of this patch is because we want some of options
can be skipped safely. In this case their arguments should also be
consumed.
Options in 'perf record' and 'perf probe' are fixed in this patch.
[1] http://lkml.kernel.org/g/50399556C9727B4D88A595C8584AAB3752627CD4@GSjpTKYDCembx32.service.hitachi.net
Test result:
Normal case:
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
Build with NO_DWARF=1:
# ./perf probe -L sys_write
Error: switch `L' is not available because NO_DWARF=1
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
or: perf probe [<options>] --del '[GROUP:]EVENT' ...
or: perf probe --list [GROUP:]EVENT ...
or: perf probe [<options>] --funcs
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
# ./perf probe -k /tmp/vmlinux sys_write
Warning: switch `k' is being ignored because NO_DWARF=1
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Warning: option `vmlinux' is being ignored because NO_DWARF=1
Added new event:
[SNIP]
# ./perf probe -l
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
...
-k, --vmlinux <file> vmlinux pathname
(not built-in because NO_DWARF=1)
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
...
-V, --vars <FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT>
Show accessible variables on PROBEDEF
(not built-in because NO_DWARF=1)
--externs Show external variables too (with --vars only)
(not built-in because NO_DWARF=1)
--no-inlines Don't search inlined functions
(not built-in because NO_DWARF=1)
--range Show variables location range in scope (with --vars only)
(not built-in because NO_DWARF=1)
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1450089563-122430-14-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-12-14 10:39:22 +00:00
|
|
|
res = *++p->argv;
|
2009-04-20 13:00:56 +00:00
|
|
|
} else
|
|
|
|
return opterror(opt, "requires a value", flags);
|
perf tools: Make options always available, even if required libs not linked
This patch keeps options of perf builtins same in all conditions. If
one option is disabled because of compiling options, users should be
notified.
Masami suggested another implementation in [1] that, by adding a
OPTION_NEXT_DEPENDS option before those options in the 'struct option'
array, options parser knows an option is disabled. However, in some
cases this array is reordered (options__order()). In addition, in
parse-option.c that array is const, so we can't simply merge
information in decorator option into the affacted option.
This patch chooses a simpler implementation that, introducing a
set_option_nobuild() function and two option parsing flags. Builtins
with such options should call set_option_nobuild() before option
parsing. The complexity of this patch is because we want some of options
can be skipped safely. In this case their arguments should also be
consumed.
Options in 'perf record' and 'perf probe' are fixed in this patch.
[1] http://lkml.kernel.org/g/50399556C9727B4D88A595C8584AAB3752627CD4@GSjpTKYDCembx32.service.hitachi.net
Test result:
Normal case:
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
Build with NO_DWARF=1:
# ./perf probe -L sys_write
Error: switch `L' is not available because NO_DWARF=1
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
or: perf probe [<options>] --del '[GROUP:]EVENT' ...
or: perf probe --list [GROUP:]EVENT ...
or: perf probe [<options>] --funcs
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
# ./perf probe -k /tmp/vmlinux sys_write
Warning: switch `k' is being ignored because NO_DWARF=1
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Warning: option `vmlinux' is being ignored because NO_DWARF=1
Added new event:
[SNIP]
# ./perf probe -l
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
...
-k, --vmlinux <file> vmlinux pathname
(not built-in because NO_DWARF=1)
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
...
-V, --vars <FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT>
Show accessible variables on PROBEDEF
(not built-in because NO_DWARF=1)
--externs Show external variables too (with --vars only)
(not built-in because NO_DWARF=1)
--no-inlines Don't search inlined functions
(not built-in because NO_DWARF=1)
--range Show variables location range in scope (with --vars only)
(not built-in because NO_DWARF=1)
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1450089563-122430-14-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-12-14 10:39:22 +00:00
|
|
|
if (arg)
|
|
|
|
*arg = res;
|
2009-04-20 13:00:56 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int get_value(struct parse_opt_ctx_t *p,
|
|
|
|
const struct option *opt, int flags)
|
|
|
|
{
|
2009-06-03 19:48:40 +00:00
|
|
|
const char *s, *arg = NULL;
|
2009-04-20 13:00:56 +00:00
|
|
|
const int unset = flags & OPT_UNSET;
|
2015-03-13 12:51:54 +00:00
|
|
|
int err;
|
2009-04-20 13:00:56 +00:00
|
|
|
|
|
|
|
if (unset && p->opt)
|
|
|
|
return opterror(opt, "takes no value", flags);
|
|
|
|
if (unset && (opt->flags & PARSE_OPT_NONEG))
|
|
|
|
return opterror(opt, "isn't available", flags);
|
2014-10-22 15:15:45 +00:00
|
|
|
if (opt->flags & PARSE_OPT_DISABLED)
|
|
|
|
return opterror(opt, "is not usable", flags);
|
2009-04-20 13:00:56 +00:00
|
|
|
|
2014-10-22 15:15:48 +00:00
|
|
|
if (opt->flags & PARSE_OPT_EXCLUSIVE) {
|
2015-01-10 10:33:45 +00:00
|
|
|
if (p->excl_opt && p->excl_opt != opt) {
|
2014-10-22 15:15:48 +00:00
|
|
|
char msg[128];
|
|
|
|
|
|
|
|
if (((flags & OPT_SHORT) && p->excl_opt->short_name) ||
|
|
|
|
p->excl_opt->long_name == NULL) {
|
2015-12-15 15:39:38 +00:00
|
|
|
snprintf(msg, sizeof(msg), "cannot be used with switch `%c'",
|
|
|
|
p->excl_opt->short_name);
|
2014-10-22 15:15:48 +00:00
|
|
|
} else {
|
2015-12-15 15:39:38 +00:00
|
|
|
snprintf(msg, sizeof(msg), "cannot be used with %s",
|
|
|
|
p->excl_opt->long_name);
|
2014-10-22 15:15:48 +00:00
|
|
|
}
|
|
|
|
opterror(opt, msg, flags);
|
|
|
|
return -3;
|
|
|
|
}
|
|
|
|
p->excl_opt = opt;
|
|
|
|
}
|
2009-04-20 13:00:56 +00:00
|
|
|
if (!(flags & OPT_SHORT) && p->opt) {
|
|
|
|
switch (opt->type) {
|
|
|
|
case OPTION_CALLBACK:
|
|
|
|
if (!(opt->flags & PARSE_OPT_NOARG))
|
|
|
|
break;
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
case OPTION_BOOLEAN:
|
2010-04-13 08:37:33 +00:00
|
|
|
case OPTION_INCR:
|
2009-04-20 13:00:56 +00:00
|
|
|
case OPTION_BIT:
|
2010-05-17 19:22:41 +00:00
|
|
|
case OPTION_SET_UINT:
|
2009-04-20 13:00:56 +00:00
|
|
|
case OPTION_SET_PTR:
|
|
|
|
return opterror(opt, "takes no value", flags);
|
2009-08-15 10:26:57 +00:00
|
|
|
case OPTION_END:
|
|
|
|
case OPTION_ARGUMENT:
|
|
|
|
case OPTION_GROUP:
|
|
|
|
case OPTION_STRING:
|
|
|
|
case OPTION_INTEGER:
|
2010-05-17 18:30:00 +00:00
|
|
|
case OPTION_UINTEGER:
|
2009-08-15 10:26:57 +00:00
|
|
|
case OPTION_LONG:
|
2010-05-17 15:16:48 +00:00
|
|
|
case OPTION_U64:
|
2009-04-20 13:00:56 +00:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
perf tools: Make options always available, even if required libs not linked
This patch keeps options of perf builtins same in all conditions. If
one option is disabled because of compiling options, users should be
notified.
Masami suggested another implementation in [1] that, by adding a
OPTION_NEXT_DEPENDS option before those options in the 'struct option'
array, options parser knows an option is disabled. However, in some
cases this array is reordered (options__order()). In addition, in
parse-option.c that array is const, so we can't simply merge
information in decorator option into the affacted option.
This patch chooses a simpler implementation that, introducing a
set_option_nobuild() function and two option parsing flags. Builtins
with such options should call set_option_nobuild() before option
parsing. The complexity of this patch is because we want some of options
can be skipped safely. In this case their arguments should also be
consumed.
Options in 'perf record' and 'perf probe' are fixed in this patch.
[1] http://lkml.kernel.org/g/50399556C9727B4D88A595C8584AAB3752627CD4@GSjpTKYDCembx32.service.hitachi.net
Test result:
Normal case:
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
Build with NO_DWARF=1:
# ./perf probe -L sys_write
Error: switch `L' is not available because NO_DWARF=1
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
or: perf probe [<options>] --del '[GROUP:]EVENT' ...
or: perf probe --list [GROUP:]EVENT ...
or: perf probe [<options>] --funcs
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
# ./perf probe -k /tmp/vmlinux sys_write
Warning: switch `k' is being ignored because NO_DWARF=1
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Warning: option `vmlinux' is being ignored because NO_DWARF=1
Added new event:
[SNIP]
# ./perf probe -l
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
...
-k, --vmlinux <file> vmlinux pathname
(not built-in because NO_DWARF=1)
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
...
-V, --vars <FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT>
Show accessible variables on PROBEDEF
(not built-in because NO_DWARF=1)
--externs Show external variables too (with --vars only)
(not built-in because NO_DWARF=1)
--no-inlines Don't search inlined functions
(not built-in because NO_DWARF=1)
--range Show variables location range in scope (with --vars only)
(not built-in because NO_DWARF=1)
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1450089563-122430-14-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-12-14 10:39:22 +00:00
|
|
|
if (opt->flags & PARSE_OPT_NOBUILD) {
|
|
|
|
char reason[128];
|
|
|
|
bool noarg = false;
|
|
|
|
|
|
|
|
err = snprintf(reason, sizeof(reason),
|
|
|
|
opt->flags & PARSE_OPT_CANSKIP ?
|
|
|
|
"is being ignored because %s " :
|
|
|
|
"is not available because %s",
|
|
|
|
opt->build_opt);
|
|
|
|
reason[sizeof(reason) - 1] = '\0';
|
|
|
|
|
|
|
|
if (err < 0)
|
|
|
|
strncpy(reason, opt->flags & PARSE_OPT_CANSKIP ?
|
|
|
|
"is being ignored" :
|
|
|
|
"is not available",
|
|
|
|
sizeof(reason));
|
|
|
|
|
|
|
|
if (!(opt->flags & PARSE_OPT_CANSKIP))
|
|
|
|
return opterror(opt, reason, flags);
|
|
|
|
|
|
|
|
err = 0;
|
|
|
|
if (unset)
|
|
|
|
noarg = true;
|
|
|
|
if (opt->flags & PARSE_OPT_NOARG)
|
|
|
|
noarg = true;
|
|
|
|
if (opt->flags & PARSE_OPT_OPTARG && !p->opt)
|
|
|
|
noarg = true;
|
|
|
|
|
|
|
|
switch (opt->type) {
|
|
|
|
case OPTION_BOOLEAN:
|
|
|
|
case OPTION_INCR:
|
|
|
|
case OPTION_BIT:
|
|
|
|
case OPTION_SET_UINT:
|
|
|
|
case OPTION_SET_PTR:
|
|
|
|
case OPTION_END:
|
|
|
|
case OPTION_ARGUMENT:
|
|
|
|
case OPTION_GROUP:
|
|
|
|
noarg = true;
|
|
|
|
break;
|
|
|
|
case OPTION_CALLBACK:
|
|
|
|
case OPTION_STRING:
|
|
|
|
case OPTION_INTEGER:
|
|
|
|
case OPTION_UINTEGER:
|
|
|
|
case OPTION_LONG:
|
|
|
|
case OPTION_U64:
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!noarg)
|
|
|
|
err = get_arg(p, opt, flags, NULL);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
optwarning(opt, reason, flags);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-04-20 13:00:56 +00:00
|
|
|
switch (opt->type) {
|
|
|
|
case OPTION_BIT:
|
|
|
|
if (unset)
|
|
|
|
*(int *)opt->value &= ~opt->defval;
|
|
|
|
else
|
|
|
|
*(int *)opt->value |= opt->defval;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
case OPTION_BOOLEAN:
|
2010-04-13 08:37:33 +00:00
|
|
|
*(bool *)opt->value = unset ? false : true;
|
2013-11-18 09:55:56 +00:00
|
|
|
if (opt->set)
|
|
|
|
*(bool *)opt->set = true;
|
2010-04-13 08:37:33 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
case OPTION_INCR:
|
2009-04-20 13:00:56 +00:00
|
|
|
*(int *)opt->value = unset ? 0 : *(int *)opt->value + 1;
|
|
|
|
return 0;
|
|
|
|
|
2010-05-17 19:22:41 +00:00
|
|
|
case OPTION_SET_UINT:
|
|
|
|
*(unsigned int *)opt->value = unset ? 0 : opt->defval;
|
2009-04-20 13:00:56 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
case OPTION_SET_PTR:
|
|
|
|
*(void **)opt->value = unset ? NULL : (void *)opt->defval;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
case OPTION_STRING:
|
2015-03-13 12:51:54 +00:00
|
|
|
err = 0;
|
2009-04-20 13:00:56 +00:00
|
|
|
if (unset)
|
|
|
|
*(const char **)opt->value = NULL;
|
|
|
|
else if (opt->flags & PARSE_OPT_OPTARG && !p->opt)
|
|
|
|
*(const char **)opt->value = (const char *)opt->defval;
|
|
|
|
else
|
2015-03-13 12:51:54 +00:00
|
|
|
err = get_arg(p, opt, flags, (const char **)opt->value);
|
|
|
|
|
|
|
|
/* PARSE_OPT_NOEMPTY: Allow NULL but disallow empty string. */
|
|
|
|
if (opt->flags & PARSE_OPT_NOEMPTY) {
|
|
|
|
const char *val = *(const char **)opt->value;
|
|
|
|
|
|
|
|
if (!val)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
/* Similar to unset if we are given an empty string. */
|
|
|
|
if (val[0] == '\0') {
|
|
|
|
*(const char **)opt->value = NULL;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
2009-04-20 13:00:56 +00:00
|
|
|
|
|
|
|
case OPTION_CALLBACK:
|
|
|
|
if (unset)
|
|
|
|
return (*opt->callback)(opt, NULL, 1) ? (-1) : 0;
|
|
|
|
if (opt->flags & PARSE_OPT_NOARG)
|
|
|
|
return (*opt->callback)(opt, NULL, 0) ? (-1) : 0;
|
|
|
|
if (opt->flags & PARSE_OPT_OPTARG && !p->opt)
|
|
|
|
return (*opt->callback)(opt, NULL, 0) ? (-1) : 0;
|
|
|
|
if (get_arg(p, opt, flags, &arg))
|
|
|
|
return -1;
|
|
|
|
return (*opt->callback)(opt, arg, 0) ? (-1) : 0;
|
|
|
|
|
|
|
|
case OPTION_INTEGER:
|
|
|
|
if (unset) {
|
|
|
|
*(int *)opt->value = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (opt->flags & PARSE_OPT_OPTARG && !p->opt) {
|
|
|
|
*(int *)opt->value = opt->defval;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (get_arg(p, opt, flags, &arg))
|
|
|
|
return -1;
|
|
|
|
*(int *)opt->value = strtol(arg, (char **)&s, 10);
|
|
|
|
if (*s)
|
|
|
|
return opterror(opt, "expects a numerical value", flags);
|
2009-06-03 09:24:33 +00:00
|
|
|
return 0;
|
|
|
|
|
2010-05-17 18:30:00 +00:00
|
|
|
case OPTION_UINTEGER:
|
|
|
|
if (unset) {
|
|
|
|
*(unsigned int *)opt->value = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (opt->flags & PARSE_OPT_OPTARG && !p->opt) {
|
|
|
|
*(unsigned int *)opt->value = opt->defval;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (get_arg(p, opt, flags, &arg))
|
|
|
|
return -1;
|
|
|
|
*(unsigned int *)opt->value = strtol(arg, (char **)&s, 10);
|
|
|
|
if (*s)
|
|
|
|
return opterror(opt, "expects a numerical value", flags);
|
|
|
|
return 0;
|
|
|
|
|
2009-06-03 09:24:33 +00:00
|
|
|
case OPTION_LONG:
|
|
|
|
if (unset) {
|
|
|
|
*(long *)opt->value = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (opt->flags & PARSE_OPT_OPTARG && !p->opt) {
|
|
|
|
*(long *)opt->value = opt->defval;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (get_arg(p, opt, flags, &arg))
|
|
|
|
return -1;
|
|
|
|
*(long *)opt->value = strtol(arg, (char **)&s, 10);
|
|
|
|
if (*s)
|
|
|
|
return opterror(opt, "expects a numerical value", flags);
|
2009-04-20 13:00:56 +00:00
|
|
|
return 0;
|
|
|
|
|
2010-05-17 15:16:48 +00:00
|
|
|
case OPTION_U64:
|
|
|
|
if (unset) {
|
|
|
|
*(u64 *)opt->value = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (opt->flags & PARSE_OPT_OPTARG && !p->opt) {
|
|
|
|
*(u64 *)opt->value = opt->defval;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (get_arg(p, opt, flags, &arg))
|
|
|
|
return -1;
|
|
|
|
*(u64 *)opt->value = strtoull(arg, (char **)&s, 10);
|
|
|
|
if (*s)
|
|
|
|
return opterror(opt, "expects a numerical value", flags);
|
|
|
|
return 0;
|
|
|
|
|
2009-08-15 10:26:57 +00:00
|
|
|
case OPTION_END:
|
|
|
|
case OPTION_ARGUMENT:
|
|
|
|
case OPTION_GROUP:
|
2009-04-20 13:00:56 +00:00
|
|
|
default:
|
|
|
|
die("should not happen, someone must be hit on the forehead");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int parse_short_opt(struct parse_opt_ctx_t *p, const struct option *options)
|
|
|
|
{
|
|
|
|
for (; options->type != OPTION_END; options++) {
|
|
|
|
if (options->short_name == *p->opt) {
|
|
|
|
p->opt = p->opt[1] ? p->opt + 1 : NULL;
|
|
|
|
return get_value(p, options, OPT_SHORT);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg,
|
|
|
|
const struct option *options)
|
|
|
|
{
|
|
|
|
const char *arg_end = strchr(arg, '=');
|
|
|
|
const struct option *abbrev_option = NULL, *ambiguous_option = NULL;
|
|
|
|
int abbrev_flags = 0, ambiguous_flags = 0;
|
|
|
|
|
|
|
|
if (!arg_end)
|
|
|
|
arg_end = arg + strlen(arg);
|
|
|
|
|
|
|
|
for (; options->type != OPTION_END; options++) {
|
|
|
|
const char *rest;
|
|
|
|
int flags = 0;
|
|
|
|
|
|
|
|
if (!options->long_name)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
rest = skip_prefix(arg, options->long_name);
|
|
|
|
if (options->type == OPTION_ARGUMENT) {
|
|
|
|
if (!rest)
|
|
|
|
continue;
|
|
|
|
if (*rest == '=')
|
|
|
|
return opterror(options, "takes no value", flags);
|
|
|
|
if (*rest)
|
|
|
|
continue;
|
|
|
|
p->out[p->cpidx++] = arg - 2;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!rest) {
|
2013-11-18 09:55:55 +00:00
|
|
|
if (!prefixcmp(options->long_name, "no-")) {
|
|
|
|
/*
|
|
|
|
* The long name itself starts with "no-", so
|
|
|
|
* accept the option without "no-" so that users
|
|
|
|
* do not have to enter "no-no-" to get the
|
|
|
|
* negation.
|
|
|
|
*/
|
|
|
|
rest = skip_prefix(arg, options->long_name + 3);
|
|
|
|
if (rest) {
|
|
|
|
flags |= OPT_UNSET;
|
|
|
|
goto match;
|
|
|
|
}
|
|
|
|
/* Abbreviated case */
|
|
|
|
if (!prefixcmp(options->long_name + 3, arg)) {
|
|
|
|
flags |= OPT_UNSET;
|
|
|
|
goto is_abbreviated;
|
|
|
|
}
|
|
|
|
}
|
2009-04-20 13:00:56 +00:00
|
|
|
/* abbreviated? */
|
|
|
|
if (!strncmp(options->long_name, arg, arg_end - arg)) {
|
|
|
|
is_abbreviated:
|
|
|
|
if (abbrev_option) {
|
|
|
|
/*
|
|
|
|
* If this is abbreviated, it is
|
|
|
|
* ambiguous. So when there is no
|
|
|
|
* exact match later, we need to
|
|
|
|
* error out.
|
|
|
|
*/
|
|
|
|
ambiguous_option = abbrev_option;
|
|
|
|
ambiguous_flags = abbrev_flags;
|
|
|
|
}
|
|
|
|
if (!(flags & OPT_UNSET) && *arg_end)
|
|
|
|
p->opt = arg_end + 1;
|
|
|
|
abbrev_option = options;
|
|
|
|
abbrev_flags = flags;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
/* negated and abbreviated very much? */
|
|
|
|
if (!prefixcmp("no-", arg)) {
|
|
|
|
flags |= OPT_UNSET;
|
|
|
|
goto is_abbreviated;
|
|
|
|
}
|
|
|
|
/* negated? */
|
|
|
|
if (strncmp(arg, "no-", 3))
|
|
|
|
continue;
|
|
|
|
flags |= OPT_UNSET;
|
|
|
|
rest = skip_prefix(arg + 3, options->long_name);
|
|
|
|
/* abbreviated and negated? */
|
|
|
|
if (!rest && !prefixcmp(options->long_name, arg + 3))
|
|
|
|
goto is_abbreviated;
|
|
|
|
if (!rest)
|
|
|
|
continue;
|
|
|
|
}
|
2013-11-18 09:55:55 +00:00
|
|
|
match:
|
2009-04-20 13:00:56 +00:00
|
|
|
if (*rest) {
|
|
|
|
if (*rest != '=')
|
|
|
|
continue;
|
|
|
|
p->opt = rest + 1;
|
|
|
|
}
|
|
|
|
return get_value(p, options, flags);
|
|
|
|
}
|
|
|
|
|
2015-12-15 15:39:38 +00:00
|
|
|
if (ambiguous_option) {
|
|
|
|
fprintf(stderr,
|
|
|
|
" Error: Ambiguous option: %s (could be --%s%s or --%s%s)",
|
|
|
|
arg,
|
|
|
|
(ambiguous_flags & OPT_UNSET) ? "no-" : "",
|
|
|
|
ambiguous_option->long_name,
|
|
|
|
(abbrev_flags & OPT_UNSET) ? "no-" : "",
|
|
|
|
abbrev_option->long_name);
|
|
|
|
return -1;
|
|
|
|
}
|
2009-04-20 13:00:56 +00:00
|
|
|
if (abbrev_option)
|
|
|
|
return get_value(p, abbrev_option, abbrev_flags);
|
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void check_typos(const char *arg, const struct option *options)
|
|
|
|
{
|
|
|
|
if (strlen(arg) < 3)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!prefixcmp(arg, "no-")) {
|
2015-12-15 15:39:38 +00:00
|
|
|
fprintf(stderr, " Error: did you mean `--%s` (with two dashes ?)", arg);
|
2009-04-20 13:00:56 +00:00
|
|
|
exit(129);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (; options->type != OPTION_END; options++) {
|
|
|
|
if (!options->long_name)
|
|
|
|
continue;
|
|
|
|
if (!prefixcmp(options->long_name, arg)) {
|
2015-12-15 15:39:38 +00:00
|
|
|
fprintf(stderr, " Error: did you mean `--%s` (with two dashes ?)", arg);
|
2009-04-20 13:00:56 +00:00
|
|
|
exit(129);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-14 04:18:12 +00:00
|
|
|
static void parse_options_start(struct parse_opt_ctx_t *ctx,
|
|
|
|
int argc, const char **argv, int flags)
|
2009-04-20 13:00:56 +00:00
|
|
|
{
|
|
|
|
memset(ctx, 0, sizeof(*ctx));
|
|
|
|
ctx->argc = argc - 1;
|
|
|
|
ctx->argv = argv + 1;
|
|
|
|
ctx->out = argv;
|
|
|
|
ctx->cpidx = ((flags & PARSE_OPT_KEEP_ARGV0) != 0);
|
|
|
|
ctx->flags = flags;
|
|
|
|
if ((flags & PARSE_OPT_KEEP_UNKNOWN) &&
|
|
|
|
(flags & PARSE_OPT_STOP_AT_NON_OPTION))
|
|
|
|
die("STOP_AT_NON_OPTION and KEEP_UNKNOWN don't go together");
|
|
|
|
}
|
|
|
|
|
|
|
|
static int usage_with_options_internal(const char * const *,
|
2015-10-23 16:27:39 +00:00
|
|
|
const struct option *, int,
|
|
|
|
struct parse_opt_ctx_t *);
|
2009-04-20 13:00:56 +00:00
|
|
|
|
2015-12-14 04:18:12 +00:00
|
|
|
static int parse_options_step(struct parse_opt_ctx_t *ctx,
|
|
|
|
const struct option *options,
|
|
|
|
const char * const usagestr[])
|
2009-04-20 13:00:56 +00:00
|
|
|
{
|
|
|
|
int internal_help = !(ctx->flags & PARSE_OPT_NO_INTERNAL_HELP);
|
2014-10-22 15:15:48 +00:00
|
|
|
int excl_short_opt = 1;
|
|
|
|
const char *arg;
|
2009-04-20 13:00:56 +00:00
|
|
|
|
|
|
|
/* we must reset ->opt, unknown short option leave it dangling */
|
|
|
|
ctx->opt = NULL;
|
|
|
|
|
|
|
|
for (; ctx->argc; ctx->argc--, ctx->argv++) {
|
2014-10-22 15:15:48 +00:00
|
|
|
arg = ctx->argv[0];
|
2009-04-20 13:00:56 +00:00
|
|
|
if (*arg != '-' || !arg[1]) {
|
|
|
|
if (ctx->flags & PARSE_OPT_STOP_AT_NON_OPTION)
|
|
|
|
break;
|
|
|
|
ctx->out[ctx->cpidx++] = ctx->argv[0];
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (arg[1] != '-') {
|
2014-10-22 15:15:48 +00:00
|
|
|
ctx->opt = ++arg;
|
2015-10-23 16:27:39 +00:00
|
|
|
if (internal_help && *ctx->opt == 'h') {
|
|
|
|
return usage_with_options_internal(usagestr, options, 0, ctx);
|
|
|
|
}
|
2009-04-20 13:00:56 +00:00
|
|
|
switch (parse_short_opt(ctx, options)) {
|
|
|
|
case -1:
|
2014-10-22 15:15:48 +00:00
|
|
|
return parse_options_usage(usagestr, options, arg, 1);
|
2009-04-20 13:00:56 +00:00
|
|
|
case -2:
|
|
|
|
goto unknown;
|
2014-10-22 15:15:48 +00:00
|
|
|
case -3:
|
|
|
|
goto exclusive;
|
2009-08-15 10:26:57 +00:00
|
|
|
default:
|
|
|
|
break;
|
2009-04-20 13:00:56 +00:00
|
|
|
}
|
|
|
|
if (ctx->opt)
|
2014-10-22 15:15:48 +00:00
|
|
|
check_typos(arg, options);
|
2009-04-20 13:00:56 +00:00
|
|
|
while (ctx->opt) {
|
|
|
|
if (internal_help && *ctx->opt == 'h')
|
2015-10-23 16:27:39 +00:00
|
|
|
return usage_with_options_internal(usagestr, options, 0, ctx);
|
2013-11-01 07:33:11 +00:00
|
|
|
arg = ctx->opt;
|
2009-04-20 13:00:56 +00:00
|
|
|
switch (parse_short_opt(ctx, options)) {
|
|
|
|
case -1:
|
2013-11-01 07:33:11 +00:00
|
|
|
return parse_options_usage(usagestr, options, arg, 1);
|
2009-04-20 13:00:56 +00:00
|
|
|
case -2:
|
|
|
|
/* fake a short option thing to hide the fact that we may have
|
|
|
|
* started to parse aggregated stuff
|
|
|
|
*
|
|
|
|
* This is leaky, too bad.
|
|
|
|
*/
|
|
|
|
ctx->argv[0] = strdup(ctx->opt - 1);
|
|
|
|
*(char *)ctx->argv[0] = '-';
|
|
|
|
goto unknown;
|
2014-10-22 15:15:48 +00:00
|
|
|
case -3:
|
|
|
|
goto exclusive;
|
2009-08-15 10:26:57 +00:00
|
|
|
default:
|
|
|
|
break;
|
2009-04-20 13:00:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!arg[2]) { /* "--" */
|
|
|
|
if (!(ctx->flags & PARSE_OPT_KEEP_DASHDASH)) {
|
|
|
|
ctx->argc--;
|
|
|
|
ctx->argv++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2014-10-22 15:15:48 +00:00
|
|
|
arg += 2;
|
|
|
|
if (internal_help && !strcmp(arg, "help-all"))
|
2015-10-23 16:27:39 +00:00
|
|
|
return usage_with_options_internal(usagestr, options, 1, ctx);
|
2014-10-22 15:15:48 +00:00
|
|
|
if (internal_help && !strcmp(arg, "help"))
|
2015-10-23 16:27:39 +00:00
|
|
|
return usage_with_options_internal(usagestr, options, 0, ctx);
|
2014-10-22 15:15:48 +00:00
|
|
|
if (!strcmp(arg, "list-opts"))
|
2014-03-04 01:26:36 +00:00
|
|
|
return PARSE_OPT_LIST_OPTS;
|
2014-10-22 15:15:48 +00:00
|
|
|
if (!strcmp(arg, "list-cmds"))
|
2014-03-04 01:26:36 +00:00
|
|
|
return PARSE_OPT_LIST_SUBCMDS;
|
2014-10-22 15:15:48 +00:00
|
|
|
switch (parse_long_opt(ctx, arg, options)) {
|
2009-04-20 13:00:56 +00:00
|
|
|
case -1:
|
2014-10-22 15:15:48 +00:00
|
|
|
return parse_options_usage(usagestr, options, arg, 0);
|
2009-04-20 13:00:56 +00:00
|
|
|
case -2:
|
|
|
|
goto unknown;
|
2014-10-22 15:15:48 +00:00
|
|
|
case -3:
|
|
|
|
excl_short_opt = 0;
|
|
|
|
goto exclusive;
|
2009-08-15 10:26:57 +00:00
|
|
|
default:
|
|
|
|
break;
|
2009-04-20 13:00:56 +00:00
|
|
|
}
|
|
|
|
continue;
|
|
|
|
unknown:
|
|
|
|
if (!(ctx->flags & PARSE_OPT_KEEP_UNKNOWN))
|
|
|
|
return PARSE_OPT_UNKNOWN;
|
|
|
|
ctx->out[ctx->cpidx++] = ctx->argv[0];
|
|
|
|
ctx->opt = NULL;
|
|
|
|
}
|
|
|
|
return PARSE_OPT_DONE;
|
2014-10-22 15:15:48 +00:00
|
|
|
|
|
|
|
exclusive:
|
|
|
|
parse_options_usage(usagestr, options, arg, excl_short_opt);
|
|
|
|
if ((excl_short_opt && ctx->excl_opt->short_name) ||
|
|
|
|
ctx->excl_opt->long_name == NULL) {
|
|
|
|
char opt = ctx->excl_opt->short_name;
|
|
|
|
parse_options_usage(NULL, options, &opt, 1);
|
|
|
|
} else {
|
|
|
|
parse_options_usage(NULL, options, ctx->excl_opt->long_name, 0);
|
|
|
|
}
|
|
|
|
return PARSE_OPT_HELP;
|
2009-04-20 13:00:56 +00:00
|
|
|
}
|
|
|
|
|
2015-12-14 04:18:12 +00:00
|
|
|
static int parse_options_end(struct parse_opt_ctx_t *ctx)
|
2009-04-20 13:00:56 +00:00
|
|
|
{
|
|
|
|
memmove(ctx->out + ctx->cpidx, ctx->argv, ctx->argc * sizeof(*ctx->out));
|
|
|
|
ctx->out[ctx->cpidx + ctx->argc] = NULL;
|
|
|
|
return ctx->cpidx + ctx->argc;
|
|
|
|
}
|
|
|
|
|
2014-03-04 01:26:36 +00:00
|
|
|
int parse_options_subcommand(int argc, const char **argv, const struct option *options,
|
|
|
|
const char *const subcommands[], const char *usagestr[], int flags)
|
2009-04-20 13:00:56 +00:00
|
|
|
{
|
|
|
|
struct parse_opt_ctx_t ctx;
|
|
|
|
|
2014-03-04 01:26:36 +00:00
|
|
|
/* build usage string if it's not provided */
|
|
|
|
if (subcommands && !usagestr[0]) {
|
2015-12-15 15:39:36 +00:00
|
|
|
char *buf = NULL;
|
|
|
|
|
|
|
|
astrcatf(&buf, "%s %s [<options>] {", subcmd_config.exec_name, argv[0]);
|
2014-03-04 01:26:36 +00:00
|
|
|
|
|
|
|
for (int i = 0; subcommands[i]; i++) {
|
|
|
|
if (i)
|
2015-12-15 15:39:36 +00:00
|
|
|
astrcat(&buf, "|");
|
|
|
|
astrcat(&buf, subcommands[i]);
|
2014-03-04 01:26:36 +00:00
|
|
|
}
|
2015-12-15 15:39:36 +00:00
|
|
|
astrcat(&buf, "}");
|
2014-03-04 01:26:36 +00:00
|
|
|
|
2015-12-15 15:39:36 +00:00
|
|
|
usagestr[0] = buf;
|
2014-03-04 01:26:36 +00:00
|
|
|
}
|
|
|
|
|
2009-04-20 13:00:56 +00:00
|
|
|
parse_options_start(&ctx, argc, argv, flags);
|
|
|
|
switch (parse_options_step(&ctx, options, usagestr)) {
|
|
|
|
case PARSE_OPT_HELP:
|
|
|
|
exit(129);
|
|
|
|
case PARSE_OPT_DONE:
|
|
|
|
break;
|
2014-03-04 01:26:36 +00:00
|
|
|
case PARSE_OPT_LIST_OPTS:
|
2012-10-02 15:21:34 +00:00
|
|
|
while (options->type != OPTION_END) {
|
2015-02-27 10:21:30 +00:00
|
|
|
if (options->long_name)
|
|
|
|
printf("--%s ", options->long_name);
|
2012-10-02 15:21:34 +00:00
|
|
|
options++;
|
|
|
|
}
|
2015-02-27 10:21:29 +00:00
|
|
|
putchar('\n');
|
2012-10-02 15:21:34 +00:00
|
|
|
exit(130);
|
2014-03-04 01:26:36 +00:00
|
|
|
case PARSE_OPT_LIST_SUBCMDS:
|
2015-02-13 13:11:52 +00:00
|
|
|
if (subcommands) {
|
|
|
|
for (int i = 0; subcommands[i]; i++)
|
|
|
|
printf("%s ", subcommands[i]);
|
|
|
|
}
|
2015-02-27 10:21:29 +00:00
|
|
|
putchar('\n');
|
2014-03-04 01:26:36 +00:00
|
|
|
exit(130);
|
2009-04-20 13:00:56 +00:00
|
|
|
default: /* PARSE_OPT_UNKNOWN */
|
2015-12-15 15:39:36 +00:00
|
|
|
if (ctx.argv[0][1] == '-')
|
|
|
|
astrcatf(&error_buf, "unknown option `%s'",
|
|
|
|
ctx.argv[0] + 2);
|
|
|
|
else
|
|
|
|
astrcatf(&error_buf, "unknown switch `%c'", *ctx.opt);
|
2009-04-20 13:00:56 +00:00
|
|
|
usage_with_options(usagestr, options);
|
|
|
|
}
|
|
|
|
|
|
|
|
return parse_options_end(&ctx);
|
|
|
|
}
|
|
|
|
|
2014-03-04 01:26:36 +00:00
|
|
|
int parse_options(int argc, const char **argv, const struct option *options,
|
|
|
|
const char * const usagestr[], int flags)
|
|
|
|
{
|
|
|
|
return parse_options_subcommand(argc, argv, options, NULL,
|
|
|
|
(const char **) usagestr, flags);
|
|
|
|
}
|
|
|
|
|
2009-04-20 13:00:56 +00:00
|
|
|
#define USAGE_OPTS_WIDTH 24
|
|
|
|
#define USAGE_GAP 2
|
|
|
|
|
2013-11-01 07:33:11 +00:00
|
|
|
static void print_option_help(const struct option *opts, int full)
|
|
|
|
{
|
|
|
|
size_t pos;
|
|
|
|
int pad;
|
|
|
|
|
|
|
|
if (opts->type == OPTION_GROUP) {
|
|
|
|
fputc('\n', stderr);
|
|
|
|
if (*opts->help)
|
|
|
|
fprintf(stderr, "%s\n", opts->help);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!full && (opts->flags & PARSE_OPT_HIDDEN))
|
|
|
|
return;
|
2014-10-22 15:15:45 +00:00
|
|
|
if (opts->flags & PARSE_OPT_DISABLED)
|
|
|
|
return;
|
2013-11-01 07:33:11 +00:00
|
|
|
|
|
|
|
pos = fprintf(stderr, " ");
|
|
|
|
if (opts->short_name)
|
|
|
|
pos += fprintf(stderr, "-%c", opts->short_name);
|
|
|
|
else
|
|
|
|
pos += fprintf(stderr, " ");
|
|
|
|
|
|
|
|
if (opts->long_name && opts->short_name)
|
|
|
|
pos += fprintf(stderr, ", ");
|
|
|
|
if (opts->long_name)
|
|
|
|
pos += fprintf(stderr, "--%s", opts->long_name);
|
|
|
|
|
|
|
|
switch (opts->type) {
|
|
|
|
case OPTION_ARGUMENT:
|
|
|
|
break;
|
|
|
|
case OPTION_LONG:
|
|
|
|
case OPTION_U64:
|
|
|
|
case OPTION_INTEGER:
|
|
|
|
case OPTION_UINTEGER:
|
|
|
|
if (opts->flags & PARSE_OPT_OPTARG)
|
|
|
|
if (opts->long_name)
|
|
|
|
pos += fprintf(stderr, "[=<n>]");
|
|
|
|
else
|
|
|
|
pos += fprintf(stderr, "[<n>]");
|
|
|
|
else
|
|
|
|
pos += fprintf(stderr, " <n>");
|
|
|
|
break;
|
|
|
|
case OPTION_CALLBACK:
|
|
|
|
if (opts->flags & PARSE_OPT_NOARG)
|
|
|
|
break;
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
case OPTION_STRING:
|
|
|
|
if (opts->argh) {
|
|
|
|
if (opts->flags & PARSE_OPT_OPTARG)
|
|
|
|
if (opts->long_name)
|
|
|
|
pos += fprintf(stderr, "[=<%s>]", opts->argh);
|
|
|
|
else
|
|
|
|
pos += fprintf(stderr, "[<%s>]", opts->argh);
|
|
|
|
else
|
|
|
|
pos += fprintf(stderr, " <%s>", opts->argh);
|
|
|
|
} else {
|
|
|
|
if (opts->flags & PARSE_OPT_OPTARG)
|
|
|
|
if (opts->long_name)
|
|
|
|
pos += fprintf(stderr, "[=...]");
|
|
|
|
else
|
|
|
|
pos += fprintf(stderr, "[...]");
|
|
|
|
else
|
|
|
|
pos += fprintf(stderr, " ...");
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default: /* OPTION_{BIT,BOOLEAN,SET_UINT,SET_PTR} */
|
|
|
|
case OPTION_END:
|
|
|
|
case OPTION_GROUP:
|
|
|
|
case OPTION_BIT:
|
|
|
|
case OPTION_BOOLEAN:
|
|
|
|
case OPTION_INCR:
|
|
|
|
case OPTION_SET_UINT:
|
|
|
|
case OPTION_SET_PTR:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pos <= USAGE_OPTS_WIDTH)
|
|
|
|
pad = USAGE_OPTS_WIDTH - pos;
|
|
|
|
else {
|
|
|
|
fputc('\n', stderr);
|
|
|
|
pad = USAGE_OPTS_WIDTH;
|
|
|
|
}
|
|
|
|
fprintf(stderr, "%*s%s\n", pad + USAGE_GAP, "", opts->help);
|
perf tools: Make options always available, even if required libs not linked
This patch keeps options of perf builtins same in all conditions. If
one option is disabled because of compiling options, users should be
notified.
Masami suggested another implementation in [1] that, by adding a
OPTION_NEXT_DEPENDS option before those options in the 'struct option'
array, options parser knows an option is disabled. However, in some
cases this array is reordered (options__order()). In addition, in
parse-option.c that array is const, so we can't simply merge
information in decorator option into the affacted option.
This patch chooses a simpler implementation that, introducing a
set_option_nobuild() function and two option parsing flags. Builtins
with such options should call set_option_nobuild() before option
parsing. The complexity of this patch is because we want some of options
can be skipped safely. In this case their arguments should also be
consumed.
Options in 'perf record' and 'perf probe' are fixed in this patch.
[1] http://lkml.kernel.org/g/50399556C9727B4D88A595C8584AAB3752627CD4@GSjpTKYDCembx32.service.hitachi.net
Test result:
Normal case:
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
Build with NO_DWARF=1:
# ./perf probe -L sys_write
Error: switch `L' is not available because NO_DWARF=1
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
or: perf probe [<options>] --del '[GROUP:]EVENT' ...
or: perf probe --list [GROUP:]EVENT ...
or: perf probe [<options>] --funcs
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
# ./perf probe -k /tmp/vmlinux sys_write
Warning: switch `k' is being ignored because NO_DWARF=1
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Warning: option `vmlinux' is being ignored because NO_DWARF=1
Added new event:
[SNIP]
# ./perf probe -l
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
...
-k, --vmlinux <file> vmlinux pathname
(not built-in because NO_DWARF=1)
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
...
-V, --vars <FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT>
Show accessible variables on PROBEDEF
(not built-in because NO_DWARF=1)
--externs Show external variables too (with --vars only)
(not built-in because NO_DWARF=1)
--no-inlines Don't search inlined functions
(not built-in because NO_DWARF=1)
--range Show variables location range in scope (with --vars only)
(not built-in because NO_DWARF=1)
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1450089563-122430-14-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-12-14 10:39:22 +00:00
|
|
|
if (opts->flags & PARSE_OPT_NOBUILD)
|
|
|
|
fprintf(stderr, "%*s(not built-in because %s)\n",
|
|
|
|
USAGE_OPTS_WIDTH + USAGE_GAP, "",
|
|
|
|
opts->build_opt);
|
2013-11-01 07:33:11 +00:00
|
|
|
}
|
|
|
|
|
2015-10-23 14:23:28 +00:00
|
|
|
static int option__cmp(const void *va, const void *vb)
|
|
|
|
{
|
|
|
|
const struct option *a = va, *b = vb;
|
|
|
|
int sa = tolower(a->short_name), sb = tolower(b->short_name), ret;
|
|
|
|
|
|
|
|
if (sa == 0)
|
|
|
|
sa = 'z' + 1;
|
|
|
|
if (sb == 0)
|
|
|
|
sb = 'z' + 1;
|
|
|
|
|
|
|
|
ret = sa - sb;
|
|
|
|
|
|
|
|
if (ret == 0) {
|
|
|
|
const char *la = a->long_name ?: "",
|
|
|
|
*lb = b->long_name ?: "";
|
|
|
|
ret = strcmp(la, lb);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct option *options__order(const struct option *opts)
|
|
|
|
{
|
2015-12-15 15:39:38 +00:00
|
|
|
int nr_opts = 0, len;
|
2015-10-23 14:23:28 +00:00
|
|
|
const struct option *o = opts;
|
|
|
|
struct option *ordered;
|
|
|
|
|
|
|
|
for (o = opts; o->type != OPTION_END; o++)
|
|
|
|
++nr_opts;
|
|
|
|
|
2015-12-15 15:39:38 +00:00
|
|
|
len = sizeof(*o) * (nr_opts + 1);
|
|
|
|
ordered = malloc(len);
|
|
|
|
if (!ordered)
|
2015-10-23 14:23:28 +00:00
|
|
|
goto out;
|
2015-12-15 15:39:38 +00:00
|
|
|
memcpy(ordered, opts, len);
|
2015-10-23 14:23:28 +00:00
|
|
|
|
|
|
|
qsort(ordered, nr_opts, sizeof(*o), option__cmp);
|
|
|
|
out:
|
|
|
|
return ordered;
|
|
|
|
}
|
|
|
|
|
2015-10-23 16:27:39 +00:00
|
|
|
static bool option__in_argv(const struct option *opt, const struct parse_opt_ctx_t *ctx)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 1; i < ctx->argc; ++i) {
|
|
|
|
const char *arg = ctx->argv[i];
|
|
|
|
|
perf tools: Search for more options when passing args to -h
Recently 'perf <tool> -h' was made aware of arguments and would show
just the help for the arguments specified, but that required a strict
form, i.e.:
$ perf -h --tui
worked, but:
$ perf -h tui
didn't.
Make it support both cases and also look at the option help when neither
matches, so that he following examples works:
$ perf report -h interface
Usage: perf report [<options>]
--gtk Use the GTK2 interface
--stdio Use the stdio interface
--tui Use the TUI interface
$ perf report -h stack
Usage: perf report [<options>]
-g, --call-graph <print_type,threshold[,print_limit],order,
sort_key[,branch]>
Display call graph (stack chain/backtrace):
print_type: call graph printing style (graph|flat|fractal|none)
threshold: minimum call graph inclusion threshold (<percent>)
print_limit: maximum number of call graph entry (<number>)
order: call graph order (caller|callee)
sort_key: call graph sort key (function|address)
branch: include last branch info to call graph (branch)
Default: graph,0.5,caller,function
--max-stack <n> Set the maximum stack depth when parsing the
callchain, anything beyond the specified depth
will be ignored. Default: 127
$
Suggested-by: Ingo Molnar <mingo@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Chandler Carruth <chandlerc@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-xzqvamzqv3cv0p6w3inhols3@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-10-27 20:35:58 +00:00
|
|
|
if (arg[0] != '-') {
|
|
|
|
if (arg[1] == '\0') {
|
|
|
|
if (arg[0] == opt->short_name)
|
|
|
|
return true;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (opt->long_name && strcmp(opt->long_name, arg) == 0)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
if (opt->help && strcasestr(opt->help, arg) != NULL)
|
|
|
|
return true;
|
|
|
|
|
2015-10-23 16:27:39 +00:00
|
|
|
continue;
|
perf tools: Search for more options when passing args to -h
Recently 'perf <tool> -h' was made aware of arguments and would show
just the help for the arguments specified, but that required a strict
form, i.e.:
$ perf -h --tui
worked, but:
$ perf -h tui
didn't.
Make it support both cases and also look at the option help when neither
matches, so that he following examples works:
$ perf report -h interface
Usage: perf report [<options>]
--gtk Use the GTK2 interface
--stdio Use the stdio interface
--tui Use the TUI interface
$ perf report -h stack
Usage: perf report [<options>]
-g, --call-graph <print_type,threshold[,print_limit],order,
sort_key[,branch]>
Display call graph (stack chain/backtrace):
print_type: call graph printing style (graph|flat|fractal|none)
threshold: minimum call graph inclusion threshold (<percent>)
print_limit: maximum number of call graph entry (<number>)
order: call graph order (caller|callee)
sort_key: call graph sort key (function|address)
branch: include last branch info to call graph (branch)
Default: graph,0.5,caller,function
--max-stack <n> Set the maximum stack depth when parsing the
callchain, anything beyond the specified depth
will be ignored. Default: 127
$
Suggested-by: Ingo Molnar <mingo@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Chandler Carruth <chandlerc@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-xzqvamzqv3cv0p6w3inhols3@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-10-27 20:35:58 +00:00
|
|
|
}
|
2015-10-23 16:27:39 +00:00
|
|
|
|
|
|
|
if (arg[1] == opt->short_name ||
|
|
|
|
(arg[1] == '-' && opt->long_name && strcmp(opt->long_name, arg + 2) == 0))
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2015-12-14 04:18:12 +00:00
|
|
|
static int usage_with_options_internal(const char * const *usagestr,
|
|
|
|
const struct option *opts, int full,
|
|
|
|
struct parse_opt_ctx_t *ctx)
|
2009-04-20 13:00:56 +00:00
|
|
|
{
|
2015-10-23 14:23:28 +00:00
|
|
|
struct option *ordered;
|
|
|
|
|
2009-04-20 13:00:56 +00:00
|
|
|
if (!usagestr)
|
|
|
|
return PARSE_OPT_HELP;
|
|
|
|
|
2015-10-24 15:49:26 +00:00
|
|
|
setup_pager();
|
|
|
|
|
2015-12-15 15:39:36 +00:00
|
|
|
if (error_buf) {
|
|
|
|
fprintf(stderr, " Error: %s\n", error_buf);
|
|
|
|
zfree(&error_buf);
|
2015-10-24 15:49:26 +00:00
|
|
|
}
|
|
|
|
|
2015-10-15 07:39:51 +00:00
|
|
|
fprintf(stderr, "\n Usage: %s\n", *usagestr++);
|
2009-04-20 13:00:56 +00:00
|
|
|
while (*usagestr && **usagestr)
|
2008-04-15 20:39:31 +00:00
|
|
|
fprintf(stderr, " or: %s\n", *usagestr++);
|
2009-04-20 13:00:56 +00:00
|
|
|
while (*usagestr) {
|
|
|
|
fprintf(stderr, "%s%s\n",
|
|
|
|
**usagestr ? " " : "",
|
|
|
|
*usagestr);
|
|
|
|
usagestr++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (opts->type != OPTION_GROUP)
|
|
|
|
fputc('\n', stderr);
|
|
|
|
|
2015-10-23 14:23:28 +00:00
|
|
|
ordered = options__order(opts);
|
|
|
|
if (ordered)
|
|
|
|
opts = ordered;
|
|
|
|
|
2015-10-23 16:27:39 +00:00
|
|
|
for ( ; opts->type != OPTION_END; opts++) {
|
|
|
|
if (ctx && ctx->argc > 1 && !option__in_argv(opts, ctx))
|
|
|
|
continue;
|
2013-11-01 07:33:11 +00:00
|
|
|
print_option_help(opts, full);
|
2015-10-23 16:27:39 +00:00
|
|
|
}
|
2009-04-20 13:00:56 +00:00
|
|
|
|
|
|
|
fputc('\n', stderr);
|
|
|
|
|
2015-10-23 14:23:28 +00:00
|
|
|
free(ordered);
|
|
|
|
|
2009-04-20 13:00:56 +00:00
|
|
|
return PARSE_OPT_HELP;
|
|
|
|
}
|
|
|
|
|
|
|
|
void usage_with_options(const char * const *usagestr,
|
|
|
|
const struct option *opts)
|
|
|
|
{
|
2015-10-23 16:27:39 +00:00
|
|
|
usage_with_options_internal(usagestr, opts, 0, NULL);
|
2009-04-20 13:00:56 +00:00
|
|
|
exit(129);
|
|
|
|
}
|
|
|
|
|
2015-10-24 15:49:27 +00:00
|
|
|
void usage_with_options_msg(const char * const *usagestr,
|
|
|
|
const struct option *opts, const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
2015-12-15 15:39:36 +00:00
|
|
|
char *tmp = error_buf;
|
2015-10-24 15:49:27 +00:00
|
|
|
|
|
|
|
va_start(ap, fmt);
|
2015-12-15 15:39:36 +00:00
|
|
|
if (vasprintf(&error_buf, fmt, ap) == -1)
|
|
|
|
die("vasprintf failed");
|
2015-10-24 15:49:27 +00:00
|
|
|
va_end(ap);
|
|
|
|
|
2015-12-15 15:39:36 +00:00
|
|
|
free(tmp);
|
|
|
|
|
2015-10-24 15:49:27 +00:00
|
|
|
usage_with_options_internal(usagestr, opts, 0, NULL);
|
|
|
|
exit(129);
|
|
|
|
}
|
|
|
|
|
2009-04-20 13:00:56 +00:00
|
|
|
int parse_options_usage(const char * const *usagestr,
|
2013-11-01 07:33:11 +00:00
|
|
|
const struct option *opts,
|
|
|
|
const char *optstr, bool short_opt)
|
2009-04-20 13:00:56 +00:00
|
|
|
{
|
2013-11-01 07:33:11 +00:00
|
|
|
if (!usagestr)
|
2013-11-01 07:33:15 +00:00
|
|
|
goto opt;
|
2013-11-01 07:33:11 +00:00
|
|
|
|
2015-10-15 07:39:51 +00:00
|
|
|
fprintf(stderr, "\n Usage: %s\n", *usagestr++);
|
2013-11-01 07:33:11 +00:00
|
|
|
while (*usagestr && **usagestr)
|
|
|
|
fprintf(stderr, " or: %s\n", *usagestr++);
|
|
|
|
while (*usagestr) {
|
|
|
|
fprintf(stderr, "%s%s\n",
|
|
|
|
**usagestr ? " " : "",
|
|
|
|
*usagestr);
|
|
|
|
usagestr++;
|
|
|
|
}
|
|
|
|
fputc('\n', stderr);
|
|
|
|
|
2013-11-01 07:33:15 +00:00
|
|
|
opt:
|
2013-11-01 07:33:11 +00:00
|
|
|
for ( ; opts->type != OPTION_END; opts++) {
|
|
|
|
if (short_opt) {
|
2015-10-24 15:49:24 +00:00
|
|
|
if (opts->short_name == *optstr) {
|
|
|
|
print_option_help(opts, 0);
|
2013-11-01 07:33:11 +00:00
|
|
|
break;
|
2015-10-24 15:49:24 +00:00
|
|
|
}
|
2013-11-01 07:33:11 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (opts->long_name == NULL)
|
|
|
|
continue;
|
|
|
|
|
2015-10-24 15:49:24 +00:00
|
|
|
if (!prefixcmp(opts->long_name, optstr))
|
|
|
|
print_option_help(opts, 0);
|
|
|
|
if (!prefixcmp("no-", optstr) &&
|
|
|
|
!prefixcmp(opts->long_name, optstr + 3))
|
|
|
|
print_option_help(opts, 0);
|
2013-11-01 07:33:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return PARSE_OPT_HELP;
|
2009-04-20 13:00:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-09-10 22:15:03 +00:00
|
|
|
int parse_opt_verbosity_cb(const struct option *opt,
|
|
|
|
const char *arg __maybe_unused,
|
2009-04-20 13:00:56 +00:00
|
|
|
int unset)
|
|
|
|
{
|
|
|
|
int *target = opt->value;
|
|
|
|
|
|
|
|
if (unset)
|
|
|
|
/* --no-quiet, --no-verbose */
|
|
|
|
*target = 0;
|
|
|
|
else if (opt->short_name == 'v') {
|
|
|
|
if (*target >= 0)
|
|
|
|
(*target)++;
|
|
|
|
else
|
|
|
|
*target = 1;
|
|
|
|
} else {
|
|
|
|
if (*target <= 0)
|
|
|
|
(*target)--;
|
|
|
|
else
|
|
|
|
*target = -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2014-10-22 15:15:45 +00:00
|
|
|
|
perf tools: Make options always available, even if required libs not linked
This patch keeps options of perf builtins same in all conditions. If
one option is disabled because of compiling options, users should be
notified.
Masami suggested another implementation in [1] that, by adding a
OPTION_NEXT_DEPENDS option before those options in the 'struct option'
array, options parser knows an option is disabled. However, in some
cases this array is reordered (options__order()). In addition, in
parse-option.c that array is const, so we can't simply merge
information in decorator option into the affacted option.
This patch chooses a simpler implementation that, introducing a
set_option_nobuild() function and two option parsing flags. Builtins
with such options should call set_option_nobuild() before option
parsing. The complexity of this patch is because we want some of options
can be skipped safely. In this case their arguments should also be
consumed.
Options in 'perf record' and 'perf probe' are fixed in this patch.
[1] http://lkml.kernel.org/g/50399556C9727B4D88A595C8584AAB3752627CD4@GSjpTKYDCembx32.service.hitachi.net
Test result:
Normal case:
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
Build with NO_DWARF=1:
# ./perf probe -L sys_write
Error: switch `L' is not available because NO_DWARF=1
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
or: perf probe [<options>] --del '[GROUP:]EVENT' ...
or: perf probe --list [GROUP:]EVENT ...
or: perf probe [<options>] --funcs
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
# ./perf probe -k /tmp/vmlinux sys_write
Warning: switch `k' is being ignored because NO_DWARF=1
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Warning: option `vmlinux' is being ignored because NO_DWARF=1
Added new event:
[SNIP]
# ./perf probe -l
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
...
-k, --vmlinux <file> vmlinux pathname
(not built-in because NO_DWARF=1)
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
...
-V, --vars <FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT>
Show accessible variables on PROBEDEF
(not built-in because NO_DWARF=1)
--externs Show external variables too (with --vars only)
(not built-in because NO_DWARF=1)
--no-inlines Don't search inlined functions
(not built-in because NO_DWARF=1)
--range Show variables location range in scope (with --vars only)
(not built-in because NO_DWARF=1)
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1450089563-122430-14-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-12-14 10:39:22 +00:00
|
|
|
static struct option *
|
|
|
|
find_option(struct option *opts, int shortopt, const char *longopt)
|
2014-10-22 15:15:45 +00:00
|
|
|
{
|
|
|
|
for (; opts->type != OPTION_END; opts++) {
|
|
|
|
if ((shortopt && opts->short_name == shortopt) ||
|
|
|
|
(opts->long_name && longopt &&
|
perf tools: Make options always available, even if required libs not linked
This patch keeps options of perf builtins same in all conditions. If
one option is disabled because of compiling options, users should be
notified.
Masami suggested another implementation in [1] that, by adding a
OPTION_NEXT_DEPENDS option before those options in the 'struct option'
array, options parser knows an option is disabled. However, in some
cases this array is reordered (options__order()). In addition, in
parse-option.c that array is const, so we can't simply merge
information in decorator option into the affacted option.
This patch chooses a simpler implementation that, introducing a
set_option_nobuild() function and two option parsing flags. Builtins
with such options should call set_option_nobuild() before option
parsing. The complexity of this patch is because we want some of options
can be skipped safely. In this case their arguments should also be
consumed.
Options in 'perf record' and 'perf probe' are fixed in this patch.
[1] http://lkml.kernel.org/g/50399556C9727B4D88A595C8584AAB3752627CD4@GSjpTKYDCembx32.service.hitachi.net
Test result:
Normal case:
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
Build with NO_DWARF=1:
# ./perf probe -L sys_write
Error: switch `L' is not available because NO_DWARF=1
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
or: perf probe [<options>] --del '[GROUP:]EVENT' ...
or: perf probe --list [GROUP:]EVENT ...
or: perf probe [<options>] --funcs
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
# ./perf probe -k /tmp/vmlinux sys_write
Warning: switch `k' is being ignored because NO_DWARF=1
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Warning: option `vmlinux' is being ignored because NO_DWARF=1
Added new event:
[SNIP]
# ./perf probe -l
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
...
-k, --vmlinux <file> vmlinux pathname
(not built-in because NO_DWARF=1)
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
...
-V, --vars <FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT>
Show accessible variables on PROBEDEF
(not built-in because NO_DWARF=1)
--externs Show external variables too (with --vars only)
(not built-in because NO_DWARF=1)
--no-inlines Don't search inlined functions
(not built-in because NO_DWARF=1)
--range Show variables location range in scope (with --vars only)
(not built-in because NO_DWARF=1)
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1450089563-122430-14-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-12-14 10:39:22 +00:00
|
|
|
!strcmp(opts->long_name, longopt)))
|
|
|
|
return opts;
|
2014-10-22 15:15:45 +00:00
|
|
|
}
|
perf tools: Make options always available, even if required libs not linked
This patch keeps options of perf builtins same in all conditions. If
one option is disabled because of compiling options, users should be
notified.
Masami suggested another implementation in [1] that, by adding a
OPTION_NEXT_DEPENDS option before those options in the 'struct option'
array, options parser knows an option is disabled. However, in some
cases this array is reordered (options__order()). In addition, in
parse-option.c that array is const, so we can't simply merge
information in decorator option into the affacted option.
This patch chooses a simpler implementation that, introducing a
set_option_nobuild() function and two option parsing flags. Builtins
with such options should call set_option_nobuild() before option
parsing. The complexity of this patch is because we want some of options
can be skipped safely. In this case their arguments should also be
consumed.
Options in 'perf record' and 'perf probe' are fixed in this patch.
[1] http://lkml.kernel.org/g/50399556C9727B4D88A595C8584AAB3752627CD4@GSjpTKYDCembx32.service.hitachi.net
Test result:
Normal case:
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
Build with NO_DWARF=1:
# ./perf probe -L sys_write
Error: switch `L' is not available because NO_DWARF=1
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
or: perf probe [<options>] --del '[GROUP:]EVENT' ...
or: perf probe --list [GROUP:]EVENT ...
or: perf probe [<options>] --funcs
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
# ./perf probe -k /tmp/vmlinux sys_write
Warning: switch `k' is being ignored because NO_DWARF=1
Added new event:
probe:sys_write (on sys_write)
You can now use it in all perf tools, such as:
perf record -e probe:sys_write -aR sleep 1
# ./perf probe --vmlinux /tmp/vmlinux sys_write
Warning: option `vmlinux' is being ignored because NO_DWARF=1
Added new event:
[SNIP]
# ./perf probe -l
Usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
...
-k, --vmlinux <file> vmlinux pathname
(not built-in because NO_DWARF=1)
-L, --line <FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]>
Show source code lines.
(not built-in because NO_DWARF=1)
...
-V, --vars <FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT>
Show accessible variables on PROBEDEF
(not built-in because NO_DWARF=1)
--externs Show external variables too (with --vars only)
(not built-in because NO_DWARF=1)
--no-inlines Don't search inlined functions
(not built-in because NO_DWARF=1)
--range Show variables location range in scope (with --vars only)
(not built-in because NO_DWARF=1)
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1450089563-122430-14-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-12-14 10:39:22 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void set_option_flag(struct option *opts, int shortopt, const char *longopt,
|
|
|
|
int flag)
|
|
|
|
{
|
|
|
|
struct option *opt = find_option(opts, shortopt, longopt);
|
|
|
|
|
|
|
|
if (opt)
|
|
|
|
opt->flags |= flag;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
void set_option_nobuild(struct option *opts, int shortopt,
|
|
|
|
const char *longopt,
|
|
|
|
const char *build_opt,
|
|
|
|
bool can_skip)
|
|
|
|
{
|
|
|
|
struct option *opt = find_option(opts, shortopt, longopt);
|
|
|
|
|
|
|
|
if (!opt)
|
|
|
|
return;
|
|
|
|
|
|
|
|
opt->flags |= PARSE_OPT_NOBUILD;
|
|
|
|
opt->flags |= can_skip ? PARSE_OPT_CANSKIP : 0;
|
|
|
|
opt->build_opt = build_opt;
|
2014-10-22 15:15:45 +00:00
|
|
|
}
|