Re: [PATCH -next] perf bench: fix return value check in do_run_multi_threaded()

From: Yuehaibing
Date: Fri Sep 04 2020 - 09:45:22 EST



On 2020/9/4 2:55, Arnaldo Carvalho de Melo wrote:
> Em Thu, Sep 03, 2020 at 03:54:51PM -0300, Arnaldo Carvalho de Melo escreveu:
>> Em Thu, Sep 03, 2020 at 03:53:01PM -0300, Arnaldo Carvalho de Melo escreveu:
>>> Em Wed, Sep 02, 2020 at 10:05:26PM +0800, YueHaibing escreveu:
>>>> In case of error, the function perf_session__new() returns ERR_PTR()
>>>> and never returns NULL. The NULL test in the return value check
>>>> should be replaced with IS_ERR()
>>>>
>>>> Fixes: 13edc237200c ("perf bench: Add a multi-threaded synthesize benchmark")
>>>> Signed-off-by: YueHaibing <yuehaibing@xxxxxxxxxx>
>>>
>>> Thanks, applied, kudos for adding the Fixes: tag, appreciated!
>>
>> But...

OOps, sorry for this, I'll pay attention next time.

>>
>>>> ---
>>>> tools/perf/bench/synthesize.c | 4 ++--
>>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/tools/perf/bench/synthesize.c b/tools/perf/bench/synthesize.c
>>>> index 8d624aea1c5e..e39daa609db2 100644
>>>> --- a/tools/perf/bench/synthesize.c
>>>> +++ b/tools/perf/bench/synthesize.c
>>>> @@ -162,8 +162,8 @@ static int do_run_multi_threaded(struct target *target,
>>>> init_stats(&event_stats);
>>>> for (i = 0; i < multi_iterations; i++) {
>>>> session = perf_session__new(NULL, false, NULL);
>>>> - if (!session)
>>>> - return -ENOMEM;
>>>> + if (IS_ERR(session)) {
>>>> + return PTR_ERR(session);
>>
>> This doesn't compile, so I take back that kudo ;-\
>>
>> I'm fixing this by removing that needless '{'.
>
> diff --git a/tools/perf/bench/synthesize.c b/tools/perf/bench/synthesize.c
> index e39daa609db2ed9b..b2924e3181dc3844 100644
> --- a/tools/perf/bench/synthesize.c
> +++ b/tools/perf/bench/synthesize.c
> @@ -162,7 +162,7 @@ static int do_run_multi_threaded(struct target *target,
> init_stats(&event_stats);
> for (i = 0; i < multi_iterations; i++) {
> session = perf_session__new(NULL, false, NULL);
> - if (IS_ERR(session)) {
> + if (IS_ERR(session))
> return PTR_ERR(session);
>
> atomic_set(&event_count, 0);
>
> .
>