Skip to contentSkip to conversation

perf config: Allow creating empty config set for config file autogeneration

PATCH Applied Taeung Song 3 participants 4 messages Sep 7, 2017 – Sep 22, 2017 perf events

lore
Share & tools
lore
#0 lore raw

PATCH v5 3/3 perf config: Allow creating empty config set for config file autogeneration

When there isn't a config file (e.g. ~/.perfconfig)
or it has nothing, the config set wasn't created.
If the config set not exists, a config file can't be autogenerated.

So allow creating a empty config set in the above case, then we can support the config file autogeneration.

Before:

  $ rm -f ~/.perfconfig
  $ perf config --user report.children=false
  $ cat ~/.perfconfig
  cat: /root/.perfconfig: No such file or directory

But I think it should work even if there isn't a config file.

After:

  $ rm -f ~/.perfconfig
  $ perf config --user report.children=false
  $ cat ~/.perfconfig
  # this file is auto-generated.
  [report]
      children = false

NOTE:
As a result, if perf_config_set__init() is failed,
it seems that the config set isn't freed. But it isn't a problem. Because the config set will be freed by perf_config_set__delete() at the end of cmd_config().

Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
---
 tools/perf/util/config.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
tools/perf/util/config.c +1 -4
index bc75596..d2b6983 100644
@@ -700,10 +700,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;
Signature · 1 line
2.7.4
maintainer Applied
#1 lore raw

Em Thu, Sep 07, 2017 at 12:18:56PM +0900, Taeung Song escreveu:

Quoted 6 lines

When there isn't a config file (e.g. ~/.perfconfig)
or it has nothing, the config set wasn't created.
If the config set not exists, a config file can't be autogenerated.

So allow creating a empty config set in the above case, then we can support the config file autogeneration.

Applied, and rephased a bit the cset log message.

- Arnaldo

Quoted 51 lines

Before:

  $ rm -f ~/.perfconfig
  $ perf config --user report.children=false
  $ cat ~/.perfconfig
  cat: /root/.perfconfig: No such file or directory

But I think it should work even if there isn't a config file.

After:

  $ rm -f ~/.perfconfig
  $ perf config --user report.children=false
  $ cat ~/.perfconfig
  # this file is auto-generated.
  [report]
      children = false

NOTE:
As a result, if perf_config_set__init() is failed,
it seems that the config set isn't freed. But it isn't a problem. Because the config set will be freed by perf_config_set__delete() at the end of cmd_config().

Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
---
 tools/perf/util/config.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
tools/perf/util/config.c +1 -4
index bc75596..d2b6983 100644
@@ -700,10 +700,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;
Signature · 1 line
2.7.4
#2 lore raw

Thank you !! :)

- Taeung

Quoted 63 lines · Arnaldo Carvalho de Melo

Em Thu, Sep 07, 2017 at 12:18:56PM +0900, Taeung Song escreveu:

Quoted 6 lines

When there isn't a config file (e.g. ~/.perfconfig)
or it has nothing, the config set wasn't created.
If the config set not exists, a config file can't be autogenerated.

So allow creating a empty config set in the above case, then we can support the config file autogeneration.

Applied, and rephased a bit the cset log message.

- Arnaldo

Quoted 51 lines

Before:

   $ rm -f ~/.perfconfig
   $ perf config --user report.children=false
   $ cat ~/.perfconfig
   cat: /root/.perfconfig: No such file or directory

But I think it should work even if there isn't a config file.

After:

   $ rm -f ~/.perfconfig
   $ perf config --user report.children=false
   $ cat ~/.perfconfig
   # this file is auto-generated.
   [report]
       children = false

NOTE:
As a result, if perf_config_set__init() is failed,
it seems that the config set isn't freed. But it isn't a problem. Because the config set will be freed by perf_config_set__delete() at the end of cmd_config().

Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
---
  tools/perf/util/config.c | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
tools/perf/util/config.c +1 -4
index bc75596..d2b6983 100644
@@ -700,10 +700,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;
Signature · 1 line
2.7.4
#3 lore raw
In reply to Taeung Song
perf config: Allow creating empty config set for config file autogeneration
Commit-ID:  55421b4fb7054f85274b1b6a321e204dac696133
Gitweb:     http://git.kernel.org/tip/55421b4fb7054f85274b1b6a321e204dac696133
Author:     Taeung Song <[email protected]>
AuthorDate: Thu, 7 Sep 2017 12:18:56 +0900
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 13 Sep 2017 09:49:16 -0300

perf config: Allow creating empty config set for config file autogeneration

When there isn't a config file (e.g. ~/.perfconfig) or it has nothing, the config set wasn't created.

If the config set does not exist, a config file can't be autogenerated.

So allow creating a empty config set in the above case, then we can support the config file autogeneration.

Before:

  $ rm -f ~/.perfconfig
  $ perf config --user report.children=false
  $ cat ~/.perfconfig
  cat: /root/.perfconfig: No such file or directory

But I think it should work even if there isn't a config file.

After:

  $ rm -f ~/.perfconfig
  $ perf config --user report.children=false
  $ cat ~/.perfconfig
  # this file is auto-generated.
  [report]
      children = false

NOTE:

As a result, if perf_config_set__init() fails, it looks as if the config set isn't freed. But it isn't a problem. Because the config set will be freed by perf_config_set__delete() at the end of cmd_config().

---
 tools/perf/util/config.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
tools/perf/util/config.c +1 -4
index bc75596..d2b6983 100644
@@ -700,10 +700,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;