Skip to contentSkip to conversation

perf config: Check not only section->from_system_config but also item's

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

lore
Share & tools
lore

Taeung Song

author
#0 lore raw

PATCH v5 1/3 perf config: Check not only section->from_system_config but also item's

Currently only section->from_system_config is being checked multiple times. items->from_system_config should be also checked, so fix it.

Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Taeung Song <[email protected]>
---
 tools/perf/builtin-config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-config.c +1 -1
index 3ddcc6e..a1d82e3 100644
@@ -59,7 +59,7 @@ static int set_config(struct perf_config_set *set, const char *file_name,
 		fprintf(fp, "[%s]\n", section->name);
 
 		perf_config_items__for_each_entry(&section->items, item) {
-			if (!use_system_config && section->from_system_config)
+			if (!use_system_config && item->from_system_config)
 				continue;
 			if (item->value)
 				fprintf(fp, "\t%s = %s\n",
Signature · 1 line
2.7.4
maintainer Applied
#1 lore raw

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

Quoted 2 lines

Currently only section->from_system_config is being checked multiple times. items->from_system_config should be also checked, so fix it.

Reworded the cset log as:

    perf config: Check not only section->from_system_config but also item's
    
    Currently section->from_system_config is being checked multiple times.
    item->from_system_config should be checked instead, when iterating thru
    the items in a section. Fix it.

applied.

- Arnaldo

Quoted 22 lines
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Taeung Song <[email protected]>
---
 tools/perf/builtin-config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-config.c +1 -1
index 3ddcc6e..a1d82e3 100644
@@ -59,7 +59,7 @@ static int set_config(struct perf_config_set *set, const char *file_name,
 		fprintf(fp, "[%s]\n", section->name);
 
 		perf_config_items__for_each_entry(&section->items, item) {
-			if (!use_system_config && section->from_system_config)
+			if (!use_system_config && item->from_system_config)
 				continue;
 			if (item->value)
 				fprintf(fp, "\t%s = %s\n",
Signature · 1 line
2.7.4
merge bot
#2 lore raw
In reply to Taeung Song
perf config: Check not only section->from_system_config but also item's
Commit-ID:  cba225d6eeaf00bd8181a851fbaa7b8716337e0b
Gitweb:     http://git.kernel.org/tip/cba225d6eeaf00bd8181a851fbaa7b8716337e0b
Author:     Taeung Song <[email protected]>
AuthorDate: Thu, 7 Sep 2017 12:18:45 +0900
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 12 Sep 2017 12:35:11 -0300

perf config: Check not only section->from_system_config but also item's

Currently section->from_system_config is being checked multiple times. item->from_system_config should be checked instead, when iterating thru the items in a section. Fix it.

Signed-off-by Taeung Song <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/builtin-config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-config.c +1 -1
index 3ddcc6e..a1d82e3 100644
@@ -59,7 +59,7 @@ static int set_config(struct perf_config_set *set, const char *file_name,
 		fprintf(fp, "[%s]\n", section->name);
 
 		perf_config_items__for_each_entry(&section->items, item) {
-			if (!use_system_config && section->from_system_config)
+			if (!use_system_config && item->from_system_config)
 				continue;
 			if (item->value)
 				fprintf(fp, "\t%s = %s\n",