lkml.org 
[lkml]   [2017]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 7/7] perf config: No free config set when it's initialization failed
Date
Currently if perf_config_set__init() failed in perf_config_set__new(),
config_set will be freed.

However, if we do, config setting feature can't work sometimes
when user or system config files are nonexistent.
So let the config set be empty, not freed totally.
(it'll be freed at the tail end)

Before:

$ cat ~/.perfconfig
cat: /root/.perfconfig: No such file or directory

$ perf config --user report.children=false
Nothing configured, please check your /root/.perfconfig

After:

$ cat ~/.perfconfig
cat: /root/.perfconfig: No such file or directory

$ perf config --user report.children=false

$ cat ~/.perfconfig
# this file is auto-generated.
[report]
children = false

Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
tools/perf/util/config.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 492c862..3c89d74 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -691,10 +691,7 @@ struct perf_config_set *perf_config_set__new(void)

if (set) {
INIT_LIST_HEAD(&set->sections);
- if (perf_config_set__init(set) < 0) {
- perf_config_set__delete(set);
- set = NULL;
- }
+ perf_config_set__init(set);
}

return set;
--
2.7.4
\
 
 \ /
  Last update: 2017-04-26 14:24    [W:0.074 / U:1.436 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site