From 183da24fc505edf73f3cf0d7dd67135c27ceffcf Mon Sep 17 00:00:00 2001 From: Gustavo Henrique Nihei Date: Tue, 7 Jun 2022 11:49:56 -0300 Subject: [PATCH] mm: Log name of the Heap to which the new region is being added Signed-off-by: Gustavo Henrique Nihei --- mm/mm_heap/mm_initialize.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/mm/mm_heap/mm_initialize.c b/mm/mm_heap/mm_initialize.c index df28679764..69d81732e4 100644 --- a/mm/mm_heap/mm_initialize.c +++ b/mm/mm_heap/mm_initialize.c @@ -105,7 +105,14 @@ void mm_addregion(FAR struct mm_heap_s *heap, FAR void *heapstart, heapend = MM_ALIGN_DOWN((uintptr_t)heapstart + (uintptr_t)heapsize); heapsize = heapend - heapbase; +#if defined(CONFIG_FS_PROCFS) && \ + !defined(CONFIG_FS_PROCFS_EXCLUDE_MEMINFO) && \ + (defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)) + minfo("[%s] Region %d: base=%p size=%zu\n", + heap->mm_procfs.name, IDX + 1, heapstart, heapsize); +#else minfo("Region %d: base=%p size=%zu\n", IDX + 1, heapstart, heapsize); +#endif /* Add the size of this region to the total size of the heap */ @@ -209,10 +216,6 @@ FAR struct mm_heap_s *mm_initialize(FAR const char *name, mm_seminitialize(heap); - /* Add the initial region of memory to the heap */ - - mm_addregion(heap, heapstart, heapsize); - #if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_MEMINFO) #if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__) heap->mm_procfs.name = name; @@ -220,6 +223,15 @@ FAR struct mm_heap_s *mm_initialize(FAR const char *name, #if defined (CONFIG_DEBUG_MM) && defined(CONFIG_MM_BACKTRACE_DEFAULT) heap->mm_procfs.backtrace = true; #endif +#endif +#endif + + /* Add the initial region of memory to the heap */ + + mm_addregion(heap, heapstart, heapsize); + +#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_MEMINFO) +#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__) procfs_register_meminfo(&heap->mm_procfs); #endif #endif