[incubator-nuttx] branch master updated: mm: Check the function result with suitable macro.

[xi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 460d94729a mm: Check the function result with suitable macro.
460d94729a is described below

commit 460d94729aea753ed1d75ed868a7941d847da54b
Author: xiangdong6 <xi...@xiaomi.com>
AuthorDate: Sat Sep 3 13:27:24 2022 +0800

    mm: Check the function result with suitable macro.
    
    The return value of function mm_takesemaphore will never below
    than zero, DEBUGVERIFY make no effect to check it, use DEBUGASSERT
    instead.
    
    Signed-off-by: xiangdong6 <xi...@xiaomi.com>
---
 mm/mm_heap/mm_extend.c     | 4 +++-
 mm/mm_heap/mm_initialize.c | 4 +++-
 mm/mm_heap/mm_malloc.c     | 4 +++-
 mm/mm_heap/mm_memalign.c   | 4 +++-
 mm/mm_heap/mm_realloc.c    | 4 +++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/mm/mm_heap/mm_extend.c b/mm/mm_heap/mm_extend.c
index 17fb0f08e2..2308457615 100644
--- a/mm/mm_heap/mm_extend.c
+++ b/mm/mm_heap/mm_extend.c
@@ -56,6 +56,7 @@ void mm_extend(FAR struct mm_heap_s *heap, FAR void *mem, size_t size,
   FAR struct mm_allocnode_s *newnode;
   uintptr_t blockstart;
   uintptr_t blockend;
+  bool ret;
 
   /* Make sure that we were passed valid parameters */
 
@@ -77,7 +78,8 @@ void mm_extend(FAR struct mm_heap_s *heap, FAR void *mem, size_t size,
 
   /* Take the memory manager semaphore */
 
-  DEBUGVERIFY(mm_takesemaphore(heap));
+  ret = mm_takesemaphore(heap);
+  DEBUGASSERT(ret);
 
   /* Get the terminal node in the old heap.  The block to extend must
    * immediately follow this node.
diff --git a/mm/mm_heap/mm_initialize.c b/mm/mm_heap/mm_initialize.c
index 3b5ac7ed8a..1204ec9c5f 100644
--- a/mm/mm_heap/mm_initialize.c
+++ b/mm/mm_heap/mm_initialize.c
@@ -61,6 +61,7 @@ void mm_addregion(FAR struct mm_heap_s *heap, FAR void *heapstart,
   FAR struct mm_freenode_s *node;
   uintptr_t heapbase;
   uintptr_t heapend;
+  bool ret;
 #if CONFIG_MM_REGIONS > 1
   int IDX;
 
@@ -91,7 +92,8 @@ void mm_addregion(FAR struct mm_heap_s *heap, FAR void *heapstart,
 
   kasan_register(heapstart, &heapsize);
 
-  DEBUGVERIFY(mm_takesemaphore(heap));
+  ret = mm_takesemaphore(heap);
+  DEBUGASSERT(ret);
 
   /* Adjust the provided heap start and size.
    *
diff --git a/mm/mm_heap/mm_malloc.c b/mm/mm_heap/mm_malloc.c
index a38633bbfe..de9542be5e 100644
--- a/mm/mm_heap/mm_malloc.c
+++ b/mm/mm_heap/mm_malloc.c
@@ -108,6 +108,7 @@ FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size)
   size_t alignsize;
   FAR void *ret = NULL;
   int ndx;
+  bool val;
 
   /* Free the delay list first */
 
@@ -137,7 +138,8 @@ FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size)
 
   /* We need to hold the MM semaphore while we muck with the nodelist. */
 
-  DEBUGVERIFY(mm_takesemaphore(heap));
+  val = mm_takesemaphore(heap);
+  DEBUGASSERT(val);
 
   /* Get the location in the node list to start the search. Special case
    * really big allocations
diff --git a/mm/mm_heap/mm_memalign.c b/mm/mm_heap/mm_memalign.c
index 47c27d61ba..2f92f53a28 100644
--- a/mm/mm_heap/mm_memalign.c
+++ b/mm/mm_heap/mm_memalign.c
@@ -57,6 +57,7 @@ FAR void *mm_memalign(FAR struct mm_heap_s *heap, size_t alignment,
   size_t mask = (size_t)(alignment - 1);
   size_t allocsize;
   size_t newsize;
+  bool ret;
 
   /* Make sure that alignment is less than half max size_t */
 
@@ -118,7 +119,8 @@ FAR void *mm_memalign(FAR struct mm_heap_s *heap, size_t alignment,
    * nodelist.
    */
 
-  DEBUGVERIFY(mm_takesemaphore(heap));
+  ret = mm_takesemaphore(heap);
+  DEBUGASSERT(ret);
 
   /* Get the node associated with the allocation and the next node after
    * the allocation.
diff --git a/mm/mm_heap/mm_realloc.c b/mm/mm_heap/mm_realloc.c
index 6331465d34..a1ef1bd289 100644
--- a/mm/mm_heap/mm_realloc.c
+++ b/mm/mm_heap/mm_realloc.c
@@ -72,6 +72,7 @@ FAR void *mm_realloc(FAR struct mm_heap_s *heap, FAR void *oldmem,
   size_t prevsize = 0;
   size_t nextsize = 0;
   FAR void *newmem;
+  bool ret;
 
   /* If oldmem is NULL, then realloc is equivalent to malloc */
 
@@ -108,7 +109,8 @@ FAR void *mm_realloc(FAR struct mm_heap_s *heap, FAR void *oldmem,
 
   /* We need to hold the MM semaphore while we muck with the nodelist. */
 
-  DEBUGVERIFY(mm_takesemaphore(heap));
+  ret = mm_takesemaphore(heap);
+  DEBUGASSERT(ret);
   DEBUGASSERT(oldnode->preceding & MM_ALLOC_BIT);
   DEBUGASSERT(mm_heapmember(heap, oldmem));