diff mbox series

[Concept,17/35] malloc: Enable stats if UNIT_TEST or MALLOC_DEBUG

Message ID 20251210000737.180797-18-sjg@u-boot.org
State New
Headers
Series malloc: Add heap debugging commands and mcheck caller tracking |

Commit Message

Simon Glass Dec. 10, 2025, 12:07 a.m. UTC 
  From: Simon Glass <simon.glass@canonical.com>

When debugging or running unit tests it is helpful to have information
available from the malloc subsystem. Enable these features in those
cases.

Signed-off-by: Simon Glass <simon.glass@canonical.com>
---

 common/dlmalloc.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index b5dc2b13dc6..b0845e6ea7c 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -599,12 +599,12 @@  static inline void MALLOC_COPY(void *dest, const void *src, size_t sz) { memcpy(
 #define MORECORE_CONTIGUOUS 1
 #define MORECORE_CANNOT_TRIM 1
 #define MORECORE_CLEARS 1
-#define NO_MALLOC_STATS 1
 #define USE_LOCKS 0
 #define USE_SPIN_LOCKS 0
 
-#if !CONFIG_IS_ENABLED(UNIT_TEST)
+#if !CONFIG_IS_ENABLED(UNIT_TEST) && !IS_ENABLED(CONFIG_MALLOC_DEBUG)
 #define NO_MALLINFO 1
+#define NO_MALLOC_STATS 1
 #endif
 #if !CONFIG_IS_ENABLED(SANDBOX)
 #define INSECURE 1
@@ -3690,6 +3690,9 @@  static struct mallinfo internal_mallinfo(mstate m) {
   return nm;
 }
 
+#endif /* !NO_MALLINFO */
+
+#if CONFIG_IS_ENABLED(MALLOC_DEBUG)
 int malloc_get_info(struct malloc_info *info)
 {
   struct mallinfo mi = internal_mallinfo(gm);
@@ -3699,7 +3702,7 @@  int malloc_get_info(struct malloc_info *info)
 
   return 0;
 }
-#endif /* !NO_MALLINFO */
+#endif
 
 #if !NO_MALLOC_STATS
 static void internal_malloc_stats(mstate m) {