diff mbox series

malloc: cleanup coding style

Message ID 1605173475-18044-1-git-send-email-wangyunjian@huawei.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series malloc: cleanup coding style |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/travis-robot success Travis build: passed
ci/iol-mellanox-Performance success Performance Testing PASS

Commit Message

Yunjian Wang Nov. 12, 2020, 9:31 a.m. UTC 
  From: Yunjian Wang <wangyunjian@huawei.com>

Cleanup code style issue reported by kernel checkpatch. As follows:
  * ERROR:CODE_INDENT: code indent should use tabs where possible
  * ERROR:SPACING: spaces required around that '?' (ctx:VxE)
  * WARNING:INDENTED_LABEL: labels should not be indented

Fixes: b0489e7bca2f ("malloc: fix linear complexity")
Cc: stable@dpdk.org

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
 lib/librte_eal/common/malloc_elem.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Burakov, Anatoly Nov. 12, 2020, 11:40 a.m. UTC | #1 
On 12-Nov-20 9:31 AM, wangyunjian wrote:
> From: Yunjian Wang <wangyunjian@huawei.com>
> 
> Cleanup code style issue reported by kernel checkpatch. As follows:
>    * ERROR:CODE_INDENT: code indent should use tabs where possible
>    * ERROR:SPACING: spaces required around that '?' (ctx:VxE)
>    * WARNING:INDENTED_LABEL: labels should not be indented
> 
> Fixes: b0489e7bca2f ("malloc: fix linear complexity")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
>   lib/librte_eal/common/malloc_elem.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/lib/librte_eal/common/malloc_elem.c b/lib/librte_eal/common/malloc_elem.c
> index c70112f84d..99cbfd02dc 100644
> --- a/lib/librte_eal/common/malloc_elem.c
> +++ b/lib/librte_eal/common/malloc_elem.c
> @@ -391,14 +391,14 @@ malloc_elem_free_list_index(size_t size)
>   		return 0;
>   
>   	/* Find next power of 2 >= size. */
> -	log2 = sizeof(size) * 8 - __builtin_clzl(size-1);
> +	log2 = sizeof(size) * 8 - __builtin_clzl(size - 1);
>   
>   	/* Compute freelist index, based on log2(size). */
>   	index = (log2 - MALLOC_MINSIZE_LOG2 + MALLOC_LOG2_INCREMENT - 1) /
> -	        MALLOC_LOG2_INCREMENT;
> +		MALLOC_LOG2_INCREMENT;

Here and below, I believe we usually add two indents to the continuation 
line, to avoid confusing with things like if statements.

With that fixed,

Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>

>   
> -	return index <= RTE_HEAP_NUM_FREELISTS-1?
> -	        index: RTE_HEAP_NUM_FREELISTS-1;
> +	return index <= RTE_HEAP_NUM_FREELISTS - 1 ?
> +		index : RTE_HEAP_NUM_FREELISTS - 1;
>   }
>   
>   /*
>
Yunjian Wang Nov. 12, 2020, 1:41 p.m. UTC | #2 
> -----Original Message-----
> From: Burakov, Anatoly [mailto:anatoly.burakov@intel.com]
> Sent: Thursday, November 12, 2020 7:40 PM
> To: wangyunjian <wangyunjian@huawei.com>; dev@dpdk.org
> Cc: rsanford2@gmail.com; Lilijun (Jerry) <jerry.lilijun@huawei.com>; xudingke
> <xudingke@huawei.com>; stable@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] malloc: cleanup coding style
> 
> On 12-Nov-20 9:31 AM, wangyunjian wrote:
> > From: Yunjian Wang <wangyunjian@huawei.com>
> >
> > Cleanup code style issue reported by kernel checkpatch. As follows:
> >    * ERROR:CODE_INDENT: code indent should use tabs where possible
> >    * ERROR:SPACING: spaces required around that '?' (ctx:VxE)
> >    * WARNING:INDENTED_LABEL: labels should not be indented
> >
> > Fixes: b0489e7bca2f ("malloc: fix linear complexity")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> > ---
> >   lib/librte_eal/common/malloc_elem.c | 8 ++++----
> >   1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/lib/librte_eal/common/malloc_elem.c
> b/lib/librte_eal/common/malloc_elem.c
> > index c70112f84d..99cbfd02dc 100644
> > --- a/lib/librte_eal/common/malloc_elem.c
> > +++ b/lib/librte_eal/common/malloc_elem.c
> > @@ -391,14 +391,14 @@ malloc_elem_free_list_index(size_t size)
> >   		return 0;
> >
> >   	/* Find next power of 2 >= size. */
> > -	log2 = sizeof(size) * 8 - __builtin_clzl(size-1);
> > +	log2 = sizeof(size) * 8 - __builtin_clzl(size - 1);
> >
> >   	/* Compute freelist index, based on log2(size). */
> >   	index = (log2 - MALLOC_MINSIZE_LOG2 +
> MALLOC_LOG2_INCREMENT - 1) /
> > -	        MALLOC_LOG2_INCREMENT;
> > +		MALLOC_LOG2_INCREMENT;
> 
> Here and below, I believe we usually add two indents to the continuation
> line, to avoid confusing with things like if statements.

It is already two indents in the patch. Please double check?

Thanks,
Yunjian

> 
> With that fixed,
> 
> Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
> 
> >
> > -	return index <= RTE_HEAP_NUM_FREELISTS-1?
> > -	        index: RTE_HEAP_NUM_FREELISTS-1;
> > +	return index <= RTE_HEAP_NUM_FREELISTS - 1 ?
> > +		index : RTE_HEAP_NUM_FREELISTS - 1;
> >   }
> >
> >   /*
> >
> 
> 
> --
> Thanks,
> Anatoly
Thomas Monjalon Nov. 22, 2020, 5:44 p.m. UTC | #3 
12/11/2020 14:41, wangyunjian:
> From: Burakov, Anatoly [mailto:anatoly.burakov@intel.com]
> > On 12-Nov-20 9:31 AM, wangyunjian wrote:
> > > From: Yunjian Wang <wangyunjian@huawei.com>
> > >
> > > Cleanup code style issue reported by kernel checkpatch. As follows:
> > >    * ERROR:CODE_INDENT: code indent should use tabs where possible
> > >    * ERROR:SPACING: spaces required around that '?' (ctx:VxE)
> > >    * WARNING:INDENTED_LABEL: labels should not be indented
> > >
> > > Fixes: b0489e7bca2f ("malloc: fix linear complexity")
> > > Cc: stable@dpdk.org
> > >
> > > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> > > ---
> > > --- a/lib/librte_eal/common/malloc_elem.c
> > > +++ b/lib/librte_eal/common/malloc_elem.c
> > > @@ -391,14 +391,14 @@ malloc_elem_free_list_index(size_t size)
> > >   		return 0;
> > >
> > >   	/* Find next power of 2 >= size. */
> > > -	log2 = sizeof(size) * 8 - __builtin_clzl(size-1);
> > > +	log2 = sizeof(size) * 8 - __builtin_clzl(size - 1);
> > >
> > >   	/* Compute freelist index, based on log2(size). */
> > >   	index = (log2 - MALLOC_MINSIZE_LOG2 +
> > MALLOC_LOG2_INCREMENT - 1) /
> > > -	        MALLOC_LOG2_INCREMENT;
> > > +		MALLOC_LOG2_INCREMENT;
> > 
> > Here and below, I believe we usually add two indents to the continuation
> > line, to avoid confusing with things like if statements.
> 
> It is already two indents in the patch. Please double check?

No it is two indents from the beginning of the line,
while Anatoly was asking for double additional indent.

> > With that fixed,

I fix it.

> > Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>

Applied, thanks
diff mbox series

Patch

diff --git a/lib/librte_eal/common/malloc_elem.c b/lib/librte_eal/common/malloc_elem.c
index c70112f84d..99cbfd02dc 100644
--- a/lib/librte_eal/common/malloc_elem.c
+++ b/lib/librte_eal/common/malloc_elem.c
@@ -391,14 +391,14 @@  malloc_elem_free_list_index(size_t size)
 		return 0;
 
 	/* Find next power of 2 >= size. */
-	log2 = sizeof(size) * 8 - __builtin_clzl(size-1);
+	log2 = sizeof(size) * 8 - __builtin_clzl(size - 1);
 
 	/* Compute freelist index, based on log2(size). */
 	index = (log2 - MALLOC_MINSIZE_LOG2 + MALLOC_LOG2_INCREMENT - 1) /
-	        MALLOC_LOG2_INCREMENT;
+		MALLOC_LOG2_INCREMENT;
 
-	return index <= RTE_HEAP_NUM_FREELISTS-1?
-	        index: RTE_HEAP_NUM_FREELISTS-1;
+	return index <= RTE_HEAP_NUM_FREELISTS - 1 ?
+		index : RTE_HEAP_NUM_FREELISTS - 1;
 }
 
 /*