Skip to content

perf config: Improvement the check routine of mutual exclusivity using between system and user config #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ppiyakk2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

perf config: Improvement the check routine of mutual exclusivity using between system and user config #134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions tools/perf/builtin-config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ enum actions {
static struct option config_options[] = {
OPT_SET_UINT('l', "list", &actions,
"show current config variables", ACTION_LIST),
OPT_BOOLEAN(0, "system", &use_system_config, "use system config file"),
OPT_BOOLEAN(0, "user", &use_user_config, "use user config file"),
OPT_BOOLEAN_FLAG(0, "system", &use_system_config, "use system config file", PARSE_OPT_EXCLUSIVE),
OPT_BOOLEAN_FLAG(0, "user", &use_user_config, "use user config file", PARSE_OPT_EXCLUSIVE),
OPT_END()
};

Expand Down Expand Up @@ -61,13 +61,6 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused)
argc = parse_options(argc, argv, config_options, config_usage,
PARSE_OPT_STOP_AT_NON_OPTION);

if (use_system_config && use_user_config) {
pr_err("Error: only one config file at a time\n");
parse_options_usage(config_usage, config_options, "user", 0);
parse_options_usage(NULL, config_options, "system", 0);
return -1;
}

if (use_system_config)
config_exclusive_filename = perf_etc_perfconfig();
else if (use_user_config)
Expand Down