[PATCH] perf jevents: Silence warning for ArchStd files

[PATCH] perf jevents: Silence warning for ArchStd files

[Ian Rogers]

json files in the level 1 directory are used for ArchStd events (see
preprocess_arch_std_files), as such they shouldn't be warned about.

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/pmu-events/jevents.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
index ed4f0bd72e5a..7422b0ea8790 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
@@ -1123,8 +1123,10 @@ static int process_one_file(const char *fpath, const struct stat *sb,
 			mapfile = strdup(fpath);
 			return 0;
 		}
-
-		pr_info("%s: Ignoring file %s\n", prog, fpath);
+		if (is_json_file(bname))
+			pr_debug("%s: ArchStd json is preprocessed %s\n", prog, fpath);
+		else
+			pr_info("%s: Ignoring file %s\n", prog, fpath);
 		return 0;
 	}
 
-- 
2.31.1.607.g51e8a6a459-goog

Re: [PATCH] perf jevents: Silence warning for ArchStd files

[John Garry]

On 06/05/2021 23:56, Ian Rogers wrote:
> json files in the level 1 directory are used for ArchStd events (see
> preprocess_arch_std_files), as such they shouldn't be warned about.
> 
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
>   tools/perf/pmu-events/jevents.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
> index ed4f0bd72e5a..7422b0ea8790 100644
> --- a/tools/perf/pmu-events/jevents.c
> +++ b/tools/perf/pmu-events/jevents.c
> @@ -1123,8 +1123,10 @@ static int process_one_file(const char *fpath, const struct stat *sb,
>   			mapfile = strdup(fpath);
>   			return 0;
>   		}
> -
> -		pr_info("%s: Ignoring file %s\n", prog, fpath);
> +		if (is_json_file(bname))
> +			pr_debug("%s: ArchStd json is preprocessed %s\n", prog, fpath)
We could get more elaborate and add the same first debug print in 
process_one_file() to preprocess_arch_std_file() to give the allusion 
that they are preprocessed, and change the logic not print that for arch 
std files (in process_one_file()). But not sure it's worth it.

Or else we could also just omit any print here for archstd files here.

But I suppose what you are doing is ok...

Thanks,
John

> +		else
> +			pr_info("%s: Ignoring file %s\n", prog, fpath);
>   		return 0;
>   	}
>   
> 

Re: [PATCH] perf jevents: Silence warning for ArchStd files

[Ian Rogers]

On Fri, May 7, 2021 at 2:00 AM John Garry <john.garry@huawei.com> wrote:
>
> On 06/05/2021 23:56, Ian Rogers wrote:
> > json files in the level 1 directory are used for ArchStd events (see
> > preprocess_arch_std_files), as such they shouldn't be warned about.
> >
> > Signed-off-by: Ian Rogers <irogers@google.com>
> > ---
> >   tools/perf/pmu-events/jevents.c | 6 ++++--
> >   1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
> > index ed4f0bd72e5a..7422b0ea8790 100644
> > --- a/tools/perf/pmu-events/jevents.c
> > +++ b/tools/perf/pmu-events/jevents.c
> > @@ -1123,8 +1123,10 @@ static int process_one_file(const char *fpath, const struct stat *sb,
> >                       mapfile = strdup(fpath);
> >                       return 0;
> >               }
> > -
> > -             pr_info("%s: Ignoring file %s\n", prog, fpath);
> > +             if (is_json_file(bname))
> > +                     pr_debug("%s: ArchStd json is preprocessed %s\n", prog, fpath)
> We could get more elaborate and add the same first debug print in
> process_one_file() to preprocess_arch_std_file() to give the allusion
> that they are preprocessed, and change the logic not print that for arch
> std files (in process_one_file()). But not sure it's worth it.
>
> Or else we could also just omit any print here for archstd files here.

I thought about just dropping the print in the json case but then a
comment would be nice, the pr_debug is a comment and is somewhat
intention revealing. If you think it is overkill then it is ok to
change.

Thanks,
Ian

> But I suppose what you are doing is ok...
>
> Thanks,
> John
>
> > +             else
> > +                     pr_info("%s: Ignoring file %s\n", prog, fpath);
> >               return 0;
> >       }
> >
> >
>

Re: [PATCH] perf jevents: Silence warning for ArchStd files

[John Garry]

On 07/05/2021 16:46, Ian Rogers wrote:
> On Fri, May 7, 2021 at 2:00 AM John Garry<john.garry@huawei.com>  wrote:
>> On 06/05/2021 23:56, Ian Rogers wrote:
>>> json files in the level 1 directory are used for ArchStd events (see
>>> preprocess_arch_std_files), as such they shouldn't be warned about.
>>>
>>> Signed-off-by: Ian Rogers<irogers@google.com>
>>> ---
>>>    tools/perf/pmu-events/jevents.c | 6 ++++--
>>>    1 file changed, 4 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
>>> index ed4f0bd72e5a..7422b0ea8790 100644
>>> --- a/tools/perf/pmu-events/jevents.c
>>> +++ b/tools/perf/pmu-events/jevents.c
>>> @@ -1123,8 +1123,10 @@ static int process_one_file(const char *fpath, const struct stat *sb,
>>>                        mapfile = strdup(fpath);
>>>                        return 0;
>>>                }
>>> -
>>> -             pr_info("%s: Ignoring file %s\n", prog, fpath);
>>> +             if (is_json_file(bname))
>>> +                     pr_debug("%s: ArchStd json is preprocessed %s\n", prog, fpath)
>> We could get more elaborate and add the same first debug print in
>> process_one_file() to preprocess_arch_std_file() to give the allusion
>> that they are preprocessed, and change the logic not print that for arch
>> std files (in process_one_file()). But not sure it's worth it.
>>
>> Or else we could also just omit any print here for archstd files here.
> I thought about just dropping the print in the json case but then a
> comment would be nice, the pr_debug is a comment and is somewhat
> intention revealing. If you think it is overkill then it is ok to
> change.

I don't think it's a big deal either way.

Reviewed-by: John Garry <john.garry@huawei.com>

Re: [PATCH] perf jevents: Silence warning for ArchStd files

[Arnaldo Carvalho de Melo]

Em Fri, May 07, 2021 at 05:29:06PM +0100, John Garry escreveu:
> On 07/05/2021 16:46, Ian Rogers wrote:
> > On Fri, May 7, 2021 at 2:00 AM John Garry<john.garry@huawei.com>  wrote:
> > > On 06/05/2021 23:56, Ian Rogers wrote:
> > > > json files in the level 1 directory are used for ArchStd events (see
> > > > preprocess_arch_std_files), as such they shouldn't be warned about.
> > > > 
> > > > Signed-off-by: Ian Rogers<irogers@google.com>
> > > > ---
> > > >    tools/perf/pmu-events/jevents.c | 6 ++++--
> > > >    1 file changed, 4 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
> > > > index ed4f0bd72e5a..7422b0ea8790 100644
> > > > --- a/tools/perf/pmu-events/jevents.c
> > > > +++ b/tools/perf/pmu-events/jevents.c
> > > > @@ -1123,8 +1123,10 @@ static int process_one_file(const char *fpath, const struct stat *sb,
> > > >                        mapfile = strdup(fpath);
> > > >                        return 0;
> > > >                }
> > > > -
> > > > -             pr_info("%s: Ignoring file %s\n", prog, fpath);
> > > > +             if (is_json_file(bname))
> > > > +                     pr_debug("%s: ArchStd json is preprocessed %s\n", prog, fpath)
> > > We could get more elaborate and add the same first debug print in
> > > process_one_file() to preprocess_arch_std_file() to give the allusion
> > > that they are preprocessed, and change the logic not print that for arch
> > > std files (in process_one_file()). But not sure it's worth it.
> > > 
> > > Or else we could also just omit any print here for archstd files here.
> > I thought about just dropping the print in the json case but then a
> > comment would be nice, the pr_debug is a comment and is somewhat
> > intention revealing. If you think it is overkill then it is ok to
> > change.
> 
> I don't think it's a big deal either way.
> 
> Reviewed-by: John Garry <john.garry@huawei.com>

Thanks, applied.

- Arnaldo