mirror of
https://github.com/apache/nuttx.git
synced 2026-06-07 01:05:54 +08:00
Add support for multiple heaps
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5720 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
@@ -77,9 +77,6 @@ extern "C"
|
||||
|
||||
#ifndef CONFIG_NUTTX_KERNEL
|
||||
|
||||
struct mm_heap_s;
|
||||
extern struct mm_heap_s g_mmheap;
|
||||
|
||||
# define kmm_initialize(h,s) mm_initialize(h,s)
|
||||
# define kmm_addregion(h,s) mm_addregion(h,s)
|
||||
# define kmm_trysemaphore() mm_trysemaphore(&g_mmheap)
|
||||
@@ -94,7 +91,7 @@ extern struct mm_heap_s g_mmheap;
|
||||
|
||||
void kmm_initialize(FAR void *heap_start, size_t heap_size);
|
||||
void kmm_addregion(FAR void *heapstart, size_t heapsize);
|
||||
int kmm_trysemaphore(void);
|
||||
int kmm_trysemaphore(void);
|
||||
void kmm_givesemaphore(void);
|
||||
|
||||
FAR void *kmalloc(size_t);
|
||||
|
||||
+232
-9
@@ -41,25 +41,178 @@
|
||||
****************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <semaphore.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
****************************************************************************/
|
||||
/* Configuration ************************************************************/
|
||||
/* If the MCU has a small (16-bit) address capability, then we will use
|
||||
* a smaller chunk header that contains 16-bit size/offset information.
|
||||
* We will also use the smaller header on MCUs with wider addresses if
|
||||
* CONFIG_MM_SMALL is selected. This configuration is common with MCUs
|
||||
* that have a large FLASH space, but only a tiny internal SRAM.
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_SMALL_MEMORY
|
||||
/* If the MCU has a small addressing capability, then for the smaller
|
||||
* chunk header.
|
||||
*/
|
||||
|
||||
# undef CONFIG_MM_SMALL
|
||||
# define CONFIG_MM_SMALL 1
|
||||
#endif
|
||||
|
||||
/* Chunk Header Definitions *************************************************/
|
||||
/* These definitions define the characteristics of allocator
|
||||
*
|
||||
* MM_MIN_SHIFT is used to define MM_MIN_CHUNK.
|
||||
* MM_MIN_CHUNK - is the smallest physical chunk that can
|
||||
* be allocated. It must be at least a large as
|
||||
* sizeof(struct mm_freenode_s). Larger values may
|
||||
* improve performance slightly, but will waste memory
|
||||
* due to quantization losses.
|
||||
*
|
||||
* MM_MAX_SHIFT is used to define MM_MAX_CHUNK
|
||||
* MM_MAX_CHUNK is the largest, contiguous chunk of memory
|
||||
* that can be allocated. It can range from 16-bytes to
|
||||
* 4Gb. Larger values of MM_MAX_SHIFT can cause larger
|
||||
* data structure sizes and, perhaps, minor performance
|
||||
* losses.
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_MM_SMALL
|
||||
# define MM_MIN_SHIFT 4 /* 16 bytes */
|
||||
# define MM_MAX_SHIFT 15 /* 32 Kb */
|
||||
#else
|
||||
# define MM_MIN_SHIFT 4 /* 16 bytes */
|
||||
# define MM_MAX_SHIFT 22 /* 4 Mb */
|
||||
#endif
|
||||
|
||||
/* All other definitions derive from these two */
|
||||
|
||||
#define MM_MIN_CHUNK (1 << MM_MIN_SHIFT)
|
||||
#define MM_MAX_CHUNK (1 << MM_MAX_SHIFT)
|
||||
#define MM_NNODES (MM_MAX_SHIFT - MM_MIN_SHIFT + 1)
|
||||
|
||||
#define MM_GRAN_MASK (MM_MIN_CHUNK-1)
|
||||
#define MM_ALIGN_UP(a) (((a) + MM_GRAN_MASK) & ~MM_GRAN_MASK)
|
||||
#define MM_ALIGN_DOWN(a) ((a) & ~MM_GRAN_MASK)
|
||||
|
||||
/* An allocated chunk is distinguished from a free chunk by bit 31 (or 15)
|
||||
* of the 'preceding' chunk size. If set, then this is an allocated chunk.
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_MM_SMALL
|
||||
# define MM_ALLOC_BIT 0x8000
|
||||
#else
|
||||
# define MM_ALLOC_BIT 0x80000000
|
||||
#endif
|
||||
#define MM_IS_ALLOCATED(n) \
|
||||
((int)((struct mm_allocnode_s*)(n)->preceding) < 0))
|
||||
|
||||
/****************************************************************************
|
||||
* Global Data
|
||||
* Public Types
|
||||
****************************************************************************/
|
||||
|
||||
/* Determines the size of the chunk size/offset type */
|
||||
|
||||
#ifdef CONFIG_MM_SMALL
|
||||
typedef uint16_t mmsize_t;
|
||||
# define MMSIZE_MAX 0xffff
|
||||
#else
|
||||
typedef size_t mmsize_t;
|
||||
# define MMSIZE_MAX SIZE_MAX
|
||||
#endif
|
||||
|
||||
/* This describes an allocated chunk. An allocated chunk is
|
||||
* distinguished from a free chunk by bit 15/31 of the 'preceding' chunk
|
||||
* size. If set, then this is an allocated chunk.
|
||||
*/
|
||||
|
||||
struct mm_allocnode_s
|
||||
{
|
||||
mmsize_t size; /* Size of this chunk */
|
||||
mmsize_t preceding; /* Size of the preceding chunk */
|
||||
};
|
||||
|
||||
/* What is the size of the allocnode? */
|
||||
|
||||
#ifdef CONFIG_MM_SMALL
|
||||
# define SIZEOF_MM_ALLOCNODE 4
|
||||
#else
|
||||
# define SIZEOF_MM_ALLOCNODE 8
|
||||
#endif
|
||||
|
||||
#define CHECK_ALLOCNODE_SIZE \
|
||||
DEBUGASSERT(sizeof(struct mm_allocnode_s) == SIZEOF_MM_ALLOCNODE)
|
||||
|
||||
/* This describes a free chunk */
|
||||
|
||||
struct mm_freenode_s
|
||||
{
|
||||
mmsize_t size; /* Size of this chunk */
|
||||
mmsize_t preceding; /* Size of the preceding chunk */
|
||||
FAR struct mm_freenode_s *flink; /* Supports a doubly linked list */
|
||||
FAR struct mm_freenode_s *blink;
|
||||
};
|
||||
|
||||
/* What is the size of the freenode? */
|
||||
|
||||
#ifdef CONFIG_MM_SMALL
|
||||
# ifdef CONFIG_SMALL_MEMORY
|
||||
# define SIZEOF_MM_FREENODE 8
|
||||
# else
|
||||
# define SIZEOF_MM_FREENODE 12
|
||||
# endif
|
||||
#else
|
||||
# define SIZEOF_MM_FREENODE 16
|
||||
#endif
|
||||
|
||||
#define CHECK_FREENODE_SIZE \
|
||||
DEBUGASSERT(sizeof(struct mm_freenode_s) == SIZEOF_MM_FREENODE)
|
||||
|
||||
/* This describes one heap (possibly with multiple regions) */
|
||||
|
||||
struct mm_heap_s
|
||||
{
|
||||
/* Mutually exclusive access to this data set is enforced with
|
||||
* the following un-named semaphore.
|
||||
*/
|
||||
|
||||
sem_t mm_semaphore;
|
||||
pid_t mm_holder;
|
||||
int mm_counts_held;
|
||||
|
||||
/* This is the size of the heap provided to mm */
|
||||
|
||||
size_t mm_heapsize;
|
||||
|
||||
/* This is the first and last nodes of the heap */
|
||||
|
||||
FAR struct mm_allocnode_s *mm_heapstart[CONFIG_MM_REGIONS];
|
||||
FAR struct mm_allocnode_s *mm_heapend[CONFIG_MM_REGIONS];
|
||||
|
||||
#if CONFIG_MM_REGIONS > 1
|
||||
int mm_nregions;
|
||||
#endif
|
||||
|
||||
/* All free nodes are maintained in a doubly linked list. This
|
||||
* array provides some hooks into the list at various points to
|
||||
* speed searches for free nodes.
|
||||
*/
|
||||
|
||||
struct mm_freenode_s mm_nodelist[MM_NNODES];
|
||||
};
|
||||
|
||||
/****************************************************************************
|
||||
* Global Function Prototypes
|
||||
* Public Data
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Global Function Prototypes
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef __cplusplus
|
||||
#undef EXTERN
|
||||
#if defined(__cplusplus)
|
||||
#define EXTERN extern "C"
|
||||
extern "C"
|
||||
{
|
||||
@@ -67,6 +220,17 @@ extern "C"
|
||||
#define EXTERN extern
|
||||
#endif
|
||||
|
||||
#if !defined(CONFIG_NUTTX_KERNEL) || !defined(__KERNEL__)
|
||||
/* This is the user heap */
|
||||
|
||||
EXTERN struct mm_heap_s g_mmheap;
|
||||
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Public Function Prototypes
|
||||
****************************************************************************/
|
||||
|
||||
/* Functions contained in mm_initialize.c ***********************************/
|
||||
|
||||
void mm_initialize(FAR void *heap_start, size_t heap_size);
|
||||
@@ -74,10 +238,69 @@ void mm_addregion(FAR void *heapstart, size_t heapsize);
|
||||
|
||||
/* Functions contained in mm_sem.c ******************************************/
|
||||
|
||||
struct mm_heap_s;
|
||||
int mm_trysemaphore(FAR struct mm_heap_s *heap);
|
||||
void mm_seminitialize(FAR struct mm_heap_s *heap);
|
||||
void mm_takesemaphore(FAR struct mm_heap_s *heap);
|
||||
int mm_trysemaphore(FAR struct mm_heap_s *heap);
|
||||
void mm_givesemaphore(FAR struct mm_heap_s *heap);
|
||||
|
||||
/* Functions contained in mm_malloc.c ***************************************/
|
||||
|
||||
#ifdef CONFIG_MM_MULTIHEAP
|
||||
FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size);
|
||||
#endif
|
||||
|
||||
/* Functions contained in mm_free.c *****************************************/
|
||||
|
||||
#ifdef CONFIG_MM_MULTIHEAP
|
||||
void mm_free(FAR struct mm_heap_s *heap, FAR void *mem);
|
||||
#endif
|
||||
|
||||
/* Functions contained in mm_realloc.c **************************************/
|
||||
|
||||
#ifdef CONFIG_MM_MULTIHEAP
|
||||
FAR void *mm_realloc(FAR struct mm_heap_s *heap, FAR void *oldmem,
|
||||
size_t size);
|
||||
#endif
|
||||
|
||||
/* Functions contained in mm_calloc.c ***************************************/
|
||||
|
||||
#ifdef CONFIG_MM_MULTIHEAP
|
||||
FAR void *mm_calloc(FAR struct mm_heap_s *heap, size_t n, size_t elem_size);
|
||||
#endif
|
||||
|
||||
/* Functions contained in mm_zalloc.c ***************************************/
|
||||
|
||||
#ifdef CONFIG_MM_MULTIHEAP
|
||||
FAR void *mm_zalloc(FAR struct mm_heap_s *heap, size_t size);
|
||||
#endif
|
||||
|
||||
/* Functions contained in mm_memalign.c *************************************/
|
||||
|
||||
#ifdef CONFIG_MM_MULTIHEAP
|
||||
FAR void *mm_memalign(FAR struct mm_heap_s *heap, size_t alignment,
|
||||
size_t size);
|
||||
#endif
|
||||
|
||||
/* Functions contained in mm_mallinfo.c *************************************/
|
||||
|
||||
#ifdef CONFIG_MM_MULTIHEAP
|
||||
int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info);
|
||||
#endif
|
||||
|
||||
/* Functions contained in mm_shrinkchunk.c **********************************/
|
||||
|
||||
void mm_shrinkchunk(FAR struct mm_heap_s *heap,
|
||||
FAR struct mm_allocnode_s *node, size_t size);
|
||||
|
||||
/* Functions contained in mm_addfreechunk.c *********************************/
|
||||
|
||||
void mm_addfreechunk(FAR struct mm_heap_s *heap,
|
||||
FAR struct mm_freenode_s *node);
|
||||
|
||||
/* Functions contained in mm_size2ndx.c.c ***********************************/
|
||||
|
||||
int mm_size2ndx(size_t size);
|
||||
|
||||
#undef EXTERN
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
+32
-31
@@ -107,47 +107,48 @@ struct mallinfo
|
||||
#undef EXTERN
|
||||
#if defined(__cplusplus)
|
||||
#define EXTERN extern "C"
|
||||
extern "C" {
|
||||
extern "C"
|
||||
{
|
||||
#else
|
||||
#define EXTERN extern
|
||||
#endif
|
||||
|
||||
/* Random number generation */
|
||||
|
||||
EXTERN void srand(unsigned int seed);
|
||||
EXTERN int rand(void);
|
||||
void srand(unsigned int seed);
|
||||
int rand(void);
|
||||
|
||||
/* Environment variable support */
|
||||
|
||||
#ifndef CONFIG_DISABLE_ENIVRON
|
||||
EXTERN FAR char **get_environ_ptr( void );
|
||||
EXTERN FAR char *getenv(FAR const char *name);
|
||||
EXTERN int putenv(FAR const char *string);
|
||||
EXTERN int clearenv(void);
|
||||
EXTERN int setenv(const char *name, const char *value, int overwrite);
|
||||
EXTERN int unsetenv(const char *name);
|
||||
FAR char **get_environ_ptr( void );
|
||||
FAR char *getenv(FAR const char *name);
|
||||
int putenv(FAR const char *string);
|
||||
int clearenv(void);
|
||||
int setenv(const char *name, const char *value, int overwrite);
|
||||
int unsetenv(const char *name);
|
||||
#endif
|
||||
|
||||
/* Process exit functions */
|
||||
|
||||
EXTERN void exit(int status) noreturn_function;
|
||||
EXTERN void abort(void) noreturn_function;
|
||||
void exit(int status) noreturn_function;
|
||||
void abort(void) noreturn_function;
|
||||
#ifdef CONFIG_SCHED_ATEXIT
|
||||
EXTERN int atexit(CODE void (*func)(void));
|
||||
int atexit(CODE void (*func)(void));
|
||||
#endif
|
||||
#ifdef CONFIG_SCHED_ONEXIT
|
||||
EXTERN int on_exit(CODE void (*func)(int, FAR void *), FAR void *arg);
|
||||
int on_exit(CODE void (*func)(int, FAR void *), FAR void *arg);
|
||||
#endif
|
||||
|
||||
/* String to binary conversions */
|
||||
|
||||
EXTERN long strtol(const char *, char **, int);
|
||||
EXTERN unsigned long strtoul(const char *, char **, int);
|
||||
long strtol(const char *, char **, int);
|
||||
unsigned long strtoul(const char *, char **, int);
|
||||
#ifdef CONFIG_HAVE_LONG_LONG
|
||||
EXTERN long long strtoll(const char *, char **, int);
|
||||
EXTERN unsigned long long strtoull(const char *, char **, int);
|
||||
long long strtoll(const char *, char **, int);
|
||||
unsigned long long strtoull(const char *, char **, int);
|
||||
#endif
|
||||
EXTERN double_t strtod(const char *, char **);
|
||||
double_t strtod(const char *, char **);
|
||||
|
||||
#define atoi(nptr) strtol((nptr), NULL, 10)
|
||||
#define atol(nptr) strtol((nptr), NULL, 10)
|
||||
@@ -158,30 +159,30 @@ EXTERN double_t strtod(const char *, char **);
|
||||
|
||||
/* Memory Management */
|
||||
|
||||
EXTERN FAR void *malloc(size_t);
|
||||
EXTERN void free(FAR void*);
|
||||
EXTERN FAR void *realloc(FAR void*, size_t);
|
||||
EXTERN FAR void *memalign(size_t, size_t);
|
||||
EXTERN FAR void *zalloc(size_t);
|
||||
EXTERN FAR void *calloc(size_t, size_t);
|
||||
FAR void *malloc(size_t);
|
||||
void free(FAR void*);
|
||||
FAR void *realloc(FAR void*, size_t);
|
||||
FAR void *memalign(size_t, size_t);
|
||||
FAR void *zalloc(size_t);
|
||||
FAR void *calloc(size_t, size_t);
|
||||
|
||||
/* Misc */
|
||||
|
||||
EXTERN int abs(int j);
|
||||
EXTERN long int labs(long int j);
|
||||
int abs(int j);
|
||||
long int labs(long int j);
|
||||
#ifdef CONFIG_HAVE_LONG_LONG
|
||||
EXTERN long long int llabs(long long int j);
|
||||
long long int llabs(long long int j);
|
||||
#endif
|
||||
|
||||
/* Sorting */
|
||||
|
||||
EXTERN void qsort(void *base, size_t nmemb, size_t size,
|
||||
int(*compar)(const void *, const void *));
|
||||
void qsort(void *base, size_t nmemb, size_t size,
|
||||
int(*compar)(const void *, const void *));
|
||||
|
||||
#ifdef CONFIG_CAN_PASS_STRUCTS
|
||||
EXTERN struct mallinfo mallinfo(void);
|
||||
struct mallinfo mallinfo(void);
|
||||
#else
|
||||
EXTERN int mallinfo(struct mallinfo *info);
|
||||
int mallinfo(struct mallinfo *info);
|
||||
#endif
|
||||
|
||||
#undef EXTERN
|
||||
|
||||
Reference in New Issue
Block a user