From b1a51a5b30f9c9a3904accf685791b6d8099bbaf Mon Sep 17 00:00:00 2001
From: Jiuzhu Dong <dongjiuzhu1@xiaomi.com>
Date: Mon, 24 Jan 2022 20:15:20 +0800
Subject: [PATCH] mm/mm_checkcorruption: using mm_foreach to do
 mm_checkcorruption

Signed-off-by: Jiuzhu Dong <dongjiuzhu1@xiaomi.com>
---
 mm/mm_heap/mm_checkcorruption.c | 85 +++++++++++----------------------
 1 file changed, 27 insertions(+), 58 deletions(-)

diff --git a/mm/mm_heap/mm_checkcorruption.c b/mm/mm_heap/mm_checkcorruption.c
index 80412db16eb..666d1b675d3 100644
--- a/mm/mm_heap/mm_checkcorruption.c
+++ b/mm/mm_heap/mm_checkcorruption.c
@@ -33,6 +33,32 @@
 
 #include "mm_heap/mm.h"
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void checkcorruption_handler(FAR struct mm_allocnode_s *node,
+                                    FAR void *arg)
+{
+  if ((node->preceding & MM_ALLOC_BIT) != 0)
+    {
+      assert(node->size >= SIZEOF_MM_ALLOCNODE);
+    }
+  else
+    {
+      FAR struct mm_freenode_s *fnode = (FAR void *)node;
+
+      assert(node->size >= SIZEOF_MM_FREENODE);
+      assert(fnode->blink->flink == fnode);
+      assert(fnode->blink->size <= fnode->size);
+      assert(fnode->flink == NULL ||
+             fnode->flink->blink == fnode);
+      assert(fnode->flink == NULL ||
+             fnode->flink->size == 0 ||
+             fnode->flink->size >= fnode->size);
+    }
+}
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -47,62 +73,5 @@
 
 void mm_checkcorruption(FAR struct mm_heap_s *heap)
 {
-  FAR struct mm_allocnode_s *node;
-  FAR struct mm_allocnode_s *prev;
-
-#if CONFIG_MM_REGIONS > 1
-  int region;
-#else
-# define region 0
-#endif
-
-  /* Visit each region */
-
-#if CONFIG_MM_REGIONS > 1
-  for (region = 0; region < heap->mm_nregions; region++)
-#endif
-    {
-      prev = NULL;
-
-      /* Visit each node in the region
-       * Retake the semaphore for each region to reduce latencies
-       */
-
-      if (mm_takesemaphore(heap) == false)
-        {
-          return;
-        }
-
-      for (node = heap->mm_heapstart[region];
-           node < heap->mm_heapend[region];
-           node = (FAR struct mm_allocnode_s *)
-                  ((FAR char *)node + node->size))
-        {
-          if ((node->preceding & MM_ALLOC_BIT) != 0)
-            {
-              assert(node->size >= SIZEOF_MM_ALLOCNODE);
-            }
-          else
-            {
-              FAR struct mm_freenode_s *fnode = (FAR void *)node;
-
-              assert(node->size >= SIZEOF_MM_FREENODE);
-              assert(fnode->blink->flink == fnode);
-              assert(fnode->blink->size <= fnode->size);
-              assert(fnode->flink == NULL ||
-                     fnode->flink->blink == fnode);
-              assert(fnode->flink == NULL ||
-                     fnode->flink->size == 0 ||
-                     fnode->flink->size >= fnode->size);
-            }
-
-          assert(prev == NULL ||
-                 prev->size == (node->preceding & ~MM_ALLOC_BIT));
-          prev = node;
-        }
-
-      assert(node == heap->mm_heapend[region]);
-
-      mm_givesemaphore(heap);
-    }
+  mm_foreach(heap, checkcorruption_handler, NULL);
 }