From 75bfa4584c3d571fe751f4dc14bc4cb2b384f5d5 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Wed, 30 Jun 2021 20:33:29 -0700
Subject: [PATCH] mm: Add kmm_malloc_size and mm_malloc_size
make malloc_size implementation align with malloc
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Change-Id: I8d7781925f06e58a880437a16569dccbfd2ea035
---
arch/sim/src/sim/up_heap.c | 2 +-
include/nuttx/kmalloc.h | 2 ++
include/nuttx/lib/lib.h | 44 +++++++++++++++++++----------------
include/nuttx/mm/mm.h | 10 ++++++++
mm/kmm_heap/Make.defs | 2 +-
mm/kmm_heap/kmm_malloc_size.c | 40 +++++++++++++++++++++++++++++++
mm/mm_heap/mm_malloc_size.c | 3 +--
mm/umm_heap/Make.defs | 2 +-
mm/umm_heap/umm_malloc_size.c | 38 ++++++++++++++++++++++++++++++
9 files changed, 118 insertions(+), 25 deletions(-)
create mode 100644 mm/kmm_heap/kmm_malloc_size.c
create mode 100644 mm/umm_heap/umm_malloc_size.c
diff --git a/arch/sim/src/sim/up_heap.c b/arch/sim/src/sim/up_heap.c
index 5192728a9a..decc5347cf 100644
--- a/arch/sim/src/sim/up_heap.c
+++ b/arch/sim/src/sim/up_heap.c
@@ -413,7 +413,7 @@ void mm_checkcorruption(FAR struct mm_heap_s *heap)
* Name: malloc_size
****************************************************************************/
-size_t malloc_size(FAR void *mem)
+size_t mm_malloc_size(FAR void *mem)
{
return host_malloc_size(mem);
}
diff --git a/include/nuttx/kmalloc.h b/include/nuttx/kmalloc.h
index d75e8457ff..9ea6916d0b 100644
--- a/include/nuttx/kmalloc.h
+++ b/include/nuttx/kmalloc.h
@@ -73,6 +73,7 @@ extern "C"
#define kumm_calloc(n,s) calloc(n,s);
#define kumm_malloc(s) malloc(s)
+#define kumm_malloc_size(p) malloc_size(p)
#define kumm_zalloc(s) zalloc(s)
#define kumm_realloc(p,s) realloc(p,s)
#define kumm_memalign(a,s) memalign(a,s)
@@ -92,6 +93,7 @@ extern "C"
# define kmm_calloc(n,s) calloc(n,s);
# define kmm_malloc(s) malloc(s)
+# define kmm_malloc_size(p) malloc_size(p)
# define kmm_zalloc(s) zalloc(s)
# define kmm_realloc(p,s) realloc(p,s)
# define kmm_memalign(a,s) memalign(a,s)
diff --git a/include/nuttx/lib/lib.h b/include/nuttx/lib/lib.h
index 51c71ec142..2b2e1f63db 100644
--- a/include/nuttx/lib/lib.h
+++ b/include/nuttx/lib/lib.h
@@ -45,37 +45,41 @@
/* Domain-specific allocations */
-# define lib_malloc(s) kmm_malloc(s)
-# define lib_zalloc(s) kmm_zalloc(s)
-# define lib_realloc(p,s) kmm_realloc(p,s)
-# define lib_memalign(p,s) kmm_memalign(p,s)
-# define lib_free(p) kmm_free(p)
+# define lib_malloc(s) kmm_malloc(s)
+# define lib_malloc_size(p) kmm_malloc_size(p)
+# define lib_zalloc(s) kmm_zalloc(s)
+# define lib_realloc(p,s) kmm_realloc(p,s)
+# define lib_memalign(p,s) kmm_memalign(p,s)
+# define lib_free(p) kmm_free(p)
/* User-accessible allocations */
-# define lib_umalloc(s) kumm_malloc(s)
-# define lib_uzalloc(s) kumm_zalloc(s)
-# define lib_urealloc(p,s) kumm_realloc(p,s)
-# define lib_umemalign(p,s) kumm_memalign(p,s)
-# define lib_ufree(p) kumm_free(p)
+# define lib_umalloc(s) kumm_malloc(s)
+# define lib_umalloc_size(p) kumm_malloc_size(p)
+# define lib_uzalloc(s) kumm_zalloc(s)
+# define lib_urealloc(p,s) kumm_realloc(p,s)
+# define lib_umemalign(p,s) kumm_memalign(p,s)
+# define lib_ufree(p) kumm_free(p)
#else
/* Domain-specific allocations */
-# define lib_malloc(s) malloc(s)
-# define lib_zalloc(s) zalloc(s)
-# define lib_realloc(p,s) realloc(p,s)
-# define lib_memalign(p,s) memalign(p,s)
-# define lib_free(p) free(p)
+# define lib_malloc(s) malloc(s)
+# define lib_malloc_size(p) malloc_size(p)
+# define lib_zalloc(s) zalloc(s)
+# define lib_realloc(p,s) realloc(p,s)
+# define lib_memalign(p,s) memalign(p,s)
+# define lib_free(p) free(p)
/* User-accessible allocations */
-# define lib_umalloc(s) malloc(s)
-# define lib_uzalloc(s) zalloc(s)
-# define lib_urealloc(p,s) realloc(p,s)
-# define lib_umemalign(p,s) memalign(p,s)
-# define lib_ufree(p) free(p)
+# define lib_umalloc(s) malloc(s)
+# define lib_umalloc_size(p) malloc_size(p)
+# define lib_uzalloc(s) zalloc(s)
+# define lib_urealloc(p,s) realloc(p,s)
+# define lib_umemalign(p,s) memalign(p,s)
+# define lib_ufree(p) free(p)
#endif
diff --git a/include/nuttx/mm/mm.h b/include/nuttx/mm/mm.h
index 872c781048..eb5ffd97e4 100644
--- a/include/nuttx/mm/mm.h
+++ b/include/nuttx/mm/mm.h
@@ -193,6 +193,16 @@ FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size);
FAR void *kmm_malloc(size_t size);
#endif
+/* Functions contained in mm_malloc_size.c **********************************/
+
+size_t mm_malloc_size(FAR void *mem);
+
+/* Functions contained in kmm_malloc_size.c *********************************/
+
+#ifdef CONFIG_MM_KERNEL_HEAP
+size_t kmm_malloc_size(FAR void *mem);
+#endif
+
/* Functions contained in mm_free.c *****************************************/
void mm_free(FAR struct mm_heap_s *heap, FAR void *mem);
diff --git a/mm/kmm_heap/Make.defs b/mm/kmm_heap/Make.defs
index 8fcf7fcde5..135832fcc5 100644
--- a/mm/kmm_heap/Make.defs
+++ b/mm/kmm_heap/Make.defs
@@ -22,7 +22,7 @@
ifeq ($(CONFIG_MM_KERNEL_HEAP),y)
-CSRCS += kmm_initialize.c kmm_addregion.c
+CSRCS += kmm_initialize.c kmm_addregion.c kmm_malloc_size.c
CSRCS += kmm_brkaddr.c kmm_calloc.c kmm_extend.c kmm_free.c kmm_mallinfo.c
CSRCS += kmm_malloc.c kmm_memalign.c kmm_realloc.c kmm_zalloc.c kmm_heapmember.c
diff --git a/mm/kmm_heap/kmm_malloc_size.c b/mm/kmm_heap/kmm_malloc_size.c
new file mode 100644
index 0000000000..6d20045d71
--- /dev/null
+++ b/mm/kmm_heap/kmm_malloc_size.c
@@ -0,0 +1,40 @@
+/****************************************************************************
+ * mm/kmm_heap/kmm_malloc_size.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/mm/mm.h>
+
+#ifdef CONFIG_MM_KERNEL_HEAP
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+size_t kmm_malloc_size(FAR void *mem)
+{
+ return mm_malloc_size(mem);
+}
+
+#endif /* CONFIG_MM_KERNEL_HEAP */
diff --git a/mm/mm_heap/mm_malloc_size.c b/mm/mm_heap/mm_malloc_size.c
index 40bc7b2622..98ffde645a 100644
--- a/mm/mm_heap/mm_malloc_size.c
+++ b/mm/mm_heap/mm_malloc_size.c
@@ -26,7 +26,6 @@
#include <assert.h>
#include <debug.h>
-#include <malloc.h>
#include <nuttx/mm/mm.h>
@@ -36,7 +35,7 @@
* Public Functions
****************************************************************************/
-size_t malloc_size(FAR void *mem)
+size_t mm_malloc_size(FAR void *mem)
{
FAR struct mm_freenode_s *node;
diff --git a/mm/umm_heap/Make.defs b/mm/umm_heap/Make.defs
index 1446371fc0..c992160c38 100644
--- a/mm/umm_heap/Make.defs
+++ b/mm/umm_heap/Make.defs
@@ -20,7 +20,7 @@
# User heap allocator
-CSRCS += umm_globals.c umm_initialize.c umm_addregion.c
+CSRCS += umm_globals.c umm_initialize.c umm_addregion.c umm_malloc_size.c
CSRCS += umm_brkaddr.c umm_calloc.c umm_extend.c umm_free.c umm_mallinfo.c
CSRCS += umm_malloc.c umm_memalign.c umm_realloc.c umm_zalloc.c umm_heapmember.c
diff --git a/mm/umm_heap/umm_malloc_size.c b/mm/umm_heap/umm_malloc_size.c
new file mode 100644
index 0000000000..74c0e76e96
--- /dev/null
+++ b/mm/umm_heap/umm_malloc_size.c
@@ -0,0 +1,38 @@
+/****************************************************************************
+ * mm/umm_heap/umm_malloc_size.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <malloc.h>
+
+#include <nuttx/mm/mm.h>
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+size_t malloc_size(FAR void *mem)
+{
+ return mm_malloc_size(mem);
+}