[PATCH v2 3/4] perf config: Correctly check whether it is from system config

[PATCH v2 3/4] perf config: Correctly check whether it is from system config

[Taeung Song]

Currently section's from_system_config was checked twice.
So adjust it in order to correctly check not only section's
but also item's from_system_config.

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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
index 0d38599..2a6ca0d 100644
--- a/tools/perf/builtin-config.c
+++ b/tools/perf/builtin-config.c
@@ -56,7 +56,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",
-- 
2.7.4

Re: [PATCH v2 3/4] perf config: Correctly check whether it is from system config

[Arnaldo Carvalho de Melo]

Em Mon, May 08, 2017 at 08:07:45PM +0900, Taeung Song escreveu:
> Currently section's from_system_config was checked twice.

 you mean:

"The item->from_system_config is not being checked when iterating over
 section->items, instead section->from_system_config is being checked
 multiple times, fix this"

?

> So adjust it in order to correctly check not only section's
> but also item's from_system_config.
> 
> 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 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
> index 0d38599..2a6ca0d 100644
> --- a/tools/perf/builtin-config.c
> +++ b/tools/perf/builtin-config.c
> @@ -56,7 +56,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",
> -- 
> 2.7.4

Re: [PATCH v2 3/4] perf config: Correctly check whether it is from system config

[Taeung Song]

Hi Arnaldo,

On 05/09/2017 01:39 AM, Arnaldo Carvalho de Melo wrote:
> Em Mon, May 08, 2017 at 08:07:45PM +0900, Taeung Song escreveu:
>> Currently section's from_system_config was checked twice.
>
>  you mean:
>
> "The item->from_system_config is not being checked when iterating over
>  section->items, instead section->from_system_config is being checked
>  multiple times, fix this"
>
> ?

Yes, it is.
Change the commit message to be more proper ?

Thanks,
Taeung

>
>> So adjust it in order to correctly check not only section's
>> but also item's from_system_config.
>>
>> 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 | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
>> index 0d38599..2a6ca0d 100644
>> --- a/tools/perf/builtin-config.c
>> +++ b/tools/perf/builtin-config.c
>> @@ -56,7 +56,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",
>> --
>> 2.7.4