Re: [PATCH 1/4] perf tools: Allow use of an exclusive option more than once
From: Masami Hiramatsu
Date: Mon Jan 12 2015 - 06:44:34 EST
(2015/01/10 19:33), Namhyung Kim wrote:
> The exclusive options are to prohibit use of conflicting options at the
> same time. But it had a side effect that it also limits a such option
> can be used at most once. Currently the only user of the flag is perf
> probe and it allows to use such options more than once, but when one
> tries to use it, perf will fail like below:
>
> $ sudo perf probe -x /lib/libc-2.20.so --add malloc --add free
> Error: option `add' cannot be used with add
> ...
>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Thanks!
> Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
> ---
> tools/perf/util/parse-options.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c
> index f62dee7bd924..4a015f77e2b5 100644
> --- a/tools/perf/util/parse-options.c
> +++ b/tools/perf/util/parse-options.c
> @@ -46,7 +46,7 @@ static int get_value(struct parse_opt_ctx_t *p,
> return opterror(opt, "is not usable", flags);
>
> if (opt->flags & PARSE_OPT_EXCLUSIVE) {
> - if (p->excl_opt) {
> + if (p->excl_opt && p->excl_opt != opt) {
> char msg[128];
>
> if (((flags & OPT_SHORT) && p->excl_opt->short_name) ||
>
--
Masami HIRAMATSU
Software Platform Research Dept. Linux Technology Research Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: masami.hiramatsu.pt@xxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/