提交 d152d1be 编写于 作者: N Namhyung Kim 提交者: Arnaldo Carvalho de Melo

perf tools: Add PARSE_OPT_DISABLED flag

In some cases, we need to reuse exising options with some of them
disabled.  To do that, add PARSE_OPT_DISABLED flag and
set_option_flag() function.
Signed-off-by: NNamhyung Kim <namhyung@kernel.org>
Acked-by: NHemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Alexander Yarygin <yarygin@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1413990949-13953-2-git-send-email-namhyung@kernel.orgSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
上级 29f9e521
...@@ -42,6 +42,8 @@ static int get_value(struct parse_opt_ctx_t *p, ...@@ -42,6 +42,8 @@ static int get_value(struct parse_opt_ctx_t *p,
return opterror(opt, "takes no value", flags); return opterror(opt, "takes no value", flags);
if (unset && (opt->flags & PARSE_OPT_NONEG)) if (unset && (opt->flags & PARSE_OPT_NONEG))
return opterror(opt, "isn't available", flags); return opterror(opt, "isn't available", flags);
if (opt->flags & PARSE_OPT_DISABLED)
return opterror(opt, "is not usable", flags);
if (!(flags & OPT_SHORT) && p->opt) { if (!(flags & OPT_SHORT) && p->opt) {
switch (opt->type) { switch (opt->type) {
...@@ -509,6 +511,8 @@ static void print_option_help(const struct option *opts, int full) ...@@ -509,6 +511,8 @@ static void print_option_help(const struct option *opts, int full)
} }
if (!full && (opts->flags & PARSE_OPT_HIDDEN)) if (!full && (opts->flags & PARSE_OPT_HIDDEN))
return; return;
if (opts->flags & PARSE_OPT_DISABLED)
return;
pos = fprintf(stderr, " "); pos = fprintf(stderr, " ");
if (opts->short_name) if (opts->short_name)
...@@ -679,3 +683,16 @@ int parse_opt_verbosity_cb(const struct option *opt, ...@@ -679,3 +683,16 @@ int parse_opt_verbosity_cb(const struct option *opt,
} }
return 0; return 0;
} }
void set_option_flag(struct option *opts, int shortopt, const char *longopt,
int flag)
{
for (; opts->type != OPTION_END; opts++) {
if ((shortopt && opts->short_name == shortopt) ||
(opts->long_name && longopt &&
!strcmp(opts->long_name, longopt))) {
opts->flags |= flag;
break;
}
}
}
...@@ -38,6 +38,7 @@ enum parse_opt_option_flags { ...@@ -38,6 +38,7 @@ enum parse_opt_option_flags {
PARSE_OPT_NONEG = 4, PARSE_OPT_NONEG = 4,
PARSE_OPT_HIDDEN = 8, PARSE_OPT_HIDDEN = 8,
PARSE_OPT_LASTARG_DEFAULT = 16, PARSE_OPT_LASTARG_DEFAULT = 16,
PARSE_OPT_DISABLED = 32,
}; };
struct option; struct option;
...@@ -211,4 +212,5 @@ extern int parse_opt_verbosity_cb(const struct option *, const char *, int); ...@@ -211,4 +212,5 @@ extern int parse_opt_verbosity_cb(const struct option *, const char *, int);
extern const char *parse_options_fix_filename(const char *prefix, const char *file); extern const char *parse_options_fix_filename(const char *prefix, const char *file);
void set_option_flag(struct option *opts, int sopt, const char *lopt, int flag);
#endif /* __PERF_PARSE_OPTIONS_H */ #endif /* __PERF_PARSE_OPTIONS_H */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册