[dpdk-dev] [PATCH] mem: more const qualifiers in malloc API

[dpdk-dev] [PATCH] mem: more const qualifiers in malloc API

[Thomas Monjalon]

Some functions don't modify their parameter which should be marked as const.

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
 lib/librte_malloc/malloc_elem.h |    6 +++---
 lib/librte_malloc/malloc_heap.c |    2 +-
 lib/librte_malloc/malloc_heap.h |    2 +-
 lib/librte_malloc/rte_malloc.c  |    4 ++--
 lib/librte_malloc/rte_malloc.h  |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/librte_malloc/malloc_elem.h b/lib/librte_malloc/malloc_elem.h
index 8a75e0c..fadf0a5 100644
--- a/lib/librte_malloc/malloc_elem.h
+++ b/lib/librte_malloc/malloc_elem.h
@@ -62,7 +62,7 @@ static const unsigned MALLOC_ELEM_TRAILER_LEN = 0;
 
 /* dummy function - just check if pointer is non-null */
 static inline int
-malloc_elem_cookies_ok(struct malloc_elem *elem){ return elem != NULL; }
+malloc_elem_cookies_ok(const struct malloc_elem *elem){ return elem != NULL; }
 
 /* dummy function - no header if malloc_debug is not enabled */
 static inline void
@@ -100,7 +100,7 @@ set_trailer(struct malloc_elem *elem)
 
 /* check that the header and trailer cookies are set correctly */
 static inline int
-malloc_elem_cookies_ok(struct malloc_elem *elem)
+malloc_elem_cookies_ok(const struct malloc_elem *elem)
 {
 	return (elem != NULL &&
 			MALLOC_ELEM_HEADER(elem) == MALLOC_HEADER_COOKIE &&
@@ -117,7 +117,7 @@ static const unsigned MALLOC_ELEM_HEADER_LEN = sizeof(struct malloc_elem);
  * the actual malloc_elem header for that block.
  */
 static inline struct malloc_elem *
-malloc_elem_from_data(void *data)
+malloc_elem_from_data(const void *data)
 {
 	if (data == NULL)
 		return NULL;
diff --git a/lib/librte_malloc/malloc_heap.c b/lib/librte_malloc/malloc_heap.c
index b6d83a4..54b6b0c 100644
--- a/lib/librte_malloc/malloc_heap.c
+++ b/lib/librte_malloc/malloc_heap.c
@@ -201,7 +201,7 @@ malloc_heap_alloc(struct malloc_heap *heap,
  * Function to retrieve data for heap on given socket
  */
 int
-malloc_heap_get_stats(struct malloc_heap *heap,
+malloc_heap_get_stats(const struct malloc_heap *heap,
 		struct rte_malloc_socket_stats *socket_stats)
 {
 	if (!heap->initialised)
diff --git a/lib/librte_malloc/malloc_heap.h b/lib/librte_malloc/malloc_heap.h
index e4a5063..e3eb906 100644
--- a/lib/librte_malloc/malloc_heap.h
+++ b/lib/librte_malloc/malloc_heap.h
@@ -53,7 +53,7 @@ malloc_heap_alloc(struct malloc_heap *heap, const char *type,
 		size_t size, unsigned align);
 
 int
-malloc_heap_get_stats(struct malloc_heap *heap,
+malloc_heap_get_stats(const struct malloc_heap *heap,
 		struct rte_malloc_socket_stats *socket_stats);
 
 int
diff --git a/lib/librte_malloc/rte_malloc.c b/lib/librte_malloc/rte_malloc.c
index 03db51f..e16ba9c 100644
--- a/lib/librte_malloc/rte_malloc.c
+++ b/lib/librte_malloc/rte_malloc.c
@@ -169,9 +169,9 @@ rte_realloc(void *ptr, size_t size, unsigned align)
 }
 
 int
-rte_malloc_validate(void *ptr, size_t *size)
+rte_malloc_validate(const void *ptr, size_t *size)
 {
-	struct malloc_elem *elem = malloc_elem_from_data(ptr);
+	const struct malloc_elem *elem = malloc_elem_from_data(ptr);
 	if (!malloc_elem_cookies_ok(elem))
 		return -1;
 	if (size != NULL)
diff --git a/lib/librte_malloc/rte_malloc.h b/lib/librte_malloc/rte_malloc.h
index 64ffaf0..acf2ae0 100644
--- a/lib/librte_malloc/rte_malloc.h
+++ b/lib/librte_malloc/rte_malloc.h
@@ -273,7 +273,7 @@ rte_free(void *ptr);
  *   0 on success
  */
 int
-rte_malloc_validate(void *ptr, size_t *size);
+rte_malloc_validate(const void *ptr, size_t *size);
 
 /**
  * Get heap statistics for the specified heap.
-- 
1.7.10.4

Re: [dpdk-dev] [PATCH] mem: more const qualifiers in malloc API

[Adrien Mazarguil]

On Fri, Jul 26, 2013 at 04:06:40PM +0200, Thomas Monjalon wrote:
> Some functions don't modify their parameter which should be marked as const.
> 
> Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
> ---
>  lib/librte_malloc/malloc_elem.h |    6 +++---
>  lib/librte_malloc/malloc_heap.c |    2 +-
>  lib/librte_malloc/malloc_heap.h |    2 +-
>  lib/librte_malloc/rte_malloc.c  |    4 ++--
>  lib/librte_malloc/rte_malloc.h  |    2 +-
>  5 files changed, 8 insertions(+), 8 deletions(-)

Acked-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>

-- 
Adrien Mazarguil
6WIND

Re: [dpdk-dev] [PATCH] mem: more const qualifiers in malloc API

[Thomas Monjalon]

26/07/2013 16:37, Adrien Mazarguil :
> On Fri, Jul 26, 2013 at 04:06:40PM +0200, Thomas Monjalon wrote:
> > Some functions don't modify their parameter which should be marked as
> > const.
> > 
> > Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
> > ---
> > 
> >  lib/librte_malloc/malloc_elem.h |    6 +++---
> >  lib/librte_malloc/malloc_heap.c |    2 +-
> >  lib/librte_malloc/malloc_heap.h |    2 +-
> >  lib/librte_malloc/rte_malloc.c  |    4 ++--
> >  lib/librte_malloc/rte_malloc.h  |    2 +-
> >  5 files changed, 8 insertions(+), 8 deletions(-)
> 
> Acked-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>

pushed

-- 
Thomas