Messages in this thread | | | Date | Fri, 8 Sep 2017 11:33:56 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH v5 2/3] perf config: Once write a config file in the end, not a repeat |
| |
Em Thu, Sep 07, 2017 at 12:18:51PM +0900, Taeung Song escreveu: > Currently set_config() can be repeatedly called for each > input config on the below case: > > $ perf config kmem.default=slab report.children=false ... > > But it's a waste, so only once write a config file > gathering all given config key=value pairs
Thanks, applied.
- Arnaldo
> Cc: Jiri Olsa <jolsa@kernel.org> > Cc: Namhyung Kim <namhyung@kernel.org> > Signed-off-by: Taeung Song <treeze.taeung@gmail.com> > --- > tools/perf/builtin-config.c | 22 ++++++++++++++++------ > 1 file changed, 16 insertions(+), 6 deletions(-) > > diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c > index a1d82e3..b89417d 100644 > --- a/tools/perf/builtin-config.c > +++ b/tools/perf/builtin-config.c > @@ -34,8 +34,7 @@ static struct option config_options[] = { > OPT_END() > }; > > -static int set_config(struct perf_config_set *set, const char *file_name, > - const char *var, const char *value) > +static int set_config(struct perf_config_set *set, const char *file_name) > { > struct perf_config_section *section = NULL; > struct perf_config_item *item = NULL; > @@ -49,7 +48,6 @@ static int set_config(struct perf_config_set *set, const char *file_name, > if (!fp) > return -1; > > - perf_config_set__collect(set, file_name, var, value); > fprintf(fp, "%s\n", first_line); > > /* overwrite configvariables */ > @@ -161,6 +159,7 @@ int cmd_config(int argc, const char **argv) > struct perf_config_set *set; > char *user_config = mkpath("%s/.perfconfig", getenv("HOME")); > const char *config_filename; > + bool changed = false; > > argc = parse_options(argc, argv, config_options, config_usage, > PARSE_OPT_STOP_AT_NON_OPTION); > @@ -231,15 +230,26 @@ int cmd_config(int argc, const char **argv) > goto out_err; > } > } else { > - if (set_config(set, config_filename, var, value) < 0) { > - pr_err("Failed to set '%s=%s' on %s\n", > - var, value, config_filename); > + if (perf_config_set__collect(set, config_filename, > + var, value) < 0) { > + pr_err("Failed to add '%s=%s'\n", > + var, value); > free(arg); > goto out_err; > } > + changed = true; > } > free(arg); > } > + > + if (!changed) > + break; > + > + if (set_config(set, config_filename) < 0) { > + pr_err("Failed to set the configs on %s\n", > + config_filename); > + goto out_err; > + } > } > > ret = 0; > -- > 2.7.4
| |