1.LOG支持彩色输出。
2.内存管理分离到memory.c
This commit is contained in:
MacRsh
251
source/memory.c
Normal file
251
source/memory.c
Normal file
@@ -0,0 +1,251 @@
|
||||
/*
|
||||
* @copyright (c) 2023, MR Development Team
|
||||
*
|
||||
* @license SPDX-License-Identifier: Apache-2.0
|
||||
*
|
||||
* @date 2023-12-20 MacRsh First version
|
||||
*/
|
||||
|
||||
#include "include/mr_api.h"
|
||||
|
||||
/**
|
||||
* @brief Heap memory.
|
||||
*/
|
||||
#ifndef MR_CFG_HEAP_SIZE
|
||||
#define MR_CFG_HEAP_SIZE (4 * 1024) /* If not defined, use 4KB */
|
||||
#endif /* MR_CFG_HEAP_SIZE */
|
||||
static uint8_t heap_mem[MR_CFG_HEAP_SIZE] = {0};
|
||||
|
||||
#define MR_HEAP_BLOCK_FREE (0)
|
||||
#define MR_HEAP_BLOCK_ALLOCATED (1)
|
||||
#define MR_HEAP_BLOCK_MIN_SIZE (sizeof(struct mr_heap_block) << 1)
|
||||
|
||||
/**
|
||||
* @brief Heap block structure.
|
||||
*/
|
||||
static struct mr_heap_block
|
||||
{
|
||||
struct mr_heap_block *next;
|
||||
uint32_t size: 31;
|
||||
uint32_t allocated: 1;
|
||||
} heap_start = {MR_NULL, 0, MR_HEAP_BLOCK_FREE};
|
||||
|
||||
/**
|
||||
* @brief This function initialize the heap.
|
||||
*
|
||||
* @return MR_ERR_OK on success, otherwise an error code.
|
||||
*/
|
||||
int mr_heap_init(void)
|
||||
{
|
||||
struct mr_heap_block *first_block = (struct mr_heap_block *)&heap_mem;
|
||||
|
||||
/* Initialize the first block */
|
||||
first_block->next = MR_NULL;
|
||||
first_block->size = sizeof(heap_mem) - sizeof(struct mr_heap_block);
|
||||
first_block->allocated = MR_HEAP_BLOCK_FREE;
|
||||
|
||||
/* Initialize the heap */
|
||||
heap_start.next = first_block;
|
||||
return MR_EOK;
|
||||
}
|
||||
MR_BOARD_EXPORT(mr_heap_init);
|
||||
|
||||
static void heap_insert_block(struct mr_heap_block *block)
|
||||
{
|
||||
struct mr_heap_block *block_prev = &heap_start;
|
||||
|
||||
/* Search for the previous block */
|
||||
while (((block_prev->next != MR_NULL) && ((uint32_t)block_prev->next < (uint32_t)block)))
|
||||
{
|
||||
block_prev = block_prev->next;
|
||||
}
|
||||
|
||||
/* Insert the block */
|
||||
if (block_prev->next != MR_NULL)
|
||||
{
|
||||
/* Merge with the previous block */
|
||||
if ((void *)(((uint8_t *)block_prev) + sizeof(struct mr_heap_block) + block_prev->size) == (void *)block)
|
||||
{
|
||||
block_prev->size += block->size + sizeof(struct mr_heap_block);
|
||||
block = block_prev;
|
||||
}
|
||||
|
||||
/* Merge with the next block */
|
||||
if ((void *)(((uint8_t *)block) + sizeof(struct mr_heap_block) + block->size) == (void *)block_prev->next)
|
||||
{
|
||||
block->size += block_prev->next->size + sizeof(struct mr_heap_block);
|
||||
block->next = block_prev->next->next;
|
||||
if (block != block_prev)
|
||||
{
|
||||
block_prev->next = block;
|
||||
block = block_prev;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Insert the block */
|
||||
if (block != block_prev)
|
||||
{
|
||||
block->next = block_prev->next;
|
||||
block_prev->next = block;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief This function allocate memory.
|
||||
*
|
||||
* @param size The size of the memory.
|
||||
*
|
||||
* @return The allocated memory.
|
||||
*/
|
||||
MR_WEAK void *mr_malloc(size_t size)
|
||||
{
|
||||
struct mr_heap_block *block_prev = &heap_start;
|
||||
struct mr_heap_block *block = block_prev->next;
|
||||
void *memory = MR_NULL;
|
||||
size_t residual = 0;
|
||||
|
||||
/* Disable interrupt */
|
||||
mr_interrupt_disable();
|
||||
|
||||
/* Check size and residual memory */
|
||||
if ((size == 0) || (size > (UINT32_MAX >> 1) || (block == MR_NULL)))
|
||||
{
|
||||
/* Enable interrupt */
|
||||
mr_interrupt_enable();
|
||||
return MR_NULL;
|
||||
}
|
||||
|
||||
/* Align the size up 4 bytes */
|
||||
size = mr_align4_up(size);
|
||||
|
||||
/* Search for and take blocks that match the criteria */
|
||||
while (block->size < size)
|
||||
{
|
||||
if (block->next == MR_NULL)
|
||||
{
|
||||
/* Enable interrupt */
|
||||
mr_interrupt_enable();
|
||||
return MR_NULL;
|
||||
}
|
||||
block_prev = block;
|
||||
block = block->next;
|
||||
}
|
||||
block_prev->next = block->next;
|
||||
|
||||
/* Allocate memory */
|
||||
memory = (void *)((uint8_t *)block + sizeof(struct mr_heap_block));
|
||||
residual = block->size - size;
|
||||
|
||||
/* Set the block information */
|
||||
block->size = size;
|
||||
block->next = MR_NULL;
|
||||
block->allocated = MR_HEAP_BLOCK_ALLOCATED;
|
||||
|
||||
/* Check if we need to allocate a new block */
|
||||
if (residual > MR_HEAP_BLOCK_MIN_SIZE)
|
||||
{
|
||||
struct mr_heap_block *new_block = (struct mr_heap_block *)(((uint8_t *)memory) + size);
|
||||
|
||||
/* Set the new block information */
|
||||
new_block->size = residual - sizeof(struct mr_heap_block);
|
||||
new_block->next = MR_NULL;
|
||||
new_block->allocated = MR_HEAP_BLOCK_FREE;
|
||||
|
||||
/* Insert the new block */
|
||||
heap_insert_block(new_block);
|
||||
}
|
||||
|
||||
/* Enable interrupt */
|
||||
mr_interrupt_enable();
|
||||
|
||||
return memory;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief This function free memory.
|
||||
*
|
||||
* @param memory The memory to free.
|
||||
*/
|
||||
MR_WEAK void mr_free(void *memory)
|
||||
{
|
||||
if (memory != MR_NULL)
|
||||
{
|
||||
struct mr_heap_block *block = (struct mr_heap_block *)((uint8_t *)memory - sizeof(struct mr_heap_block));
|
||||
|
||||
/* Disable interrupt */
|
||||
mr_interrupt_disable();
|
||||
|
||||
/* Check the block */
|
||||
if (block->allocated == MR_HEAP_BLOCK_ALLOCATED && block->size != 0)
|
||||
{
|
||||
block->allocated = MR_HEAP_BLOCK_FREE;
|
||||
|
||||
/* Insert the free block */
|
||||
heap_insert_block(block);
|
||||
}
|
||||
|
||||
/* Enable interrupt */
|
||||
mr_interrupt_enable();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief This function get the usable size of the memory.
|
||||
*
|
||||
* @param memory The memory.
|
||||
*
|
||||
* @return The usable size of the memory.
|
||||
*/
|
||||
MR_WEAK size_t mr_malloc_usable_size(void *memory)
|
||||
{
|
||||
if (memory != MR_NULL)
|
||||
{
|
||||
struct mr_heap_block *block = (struct mr_heap_block *)((uint8_t *)memory - sizeof(struct mr_heap_block));
|
||||
return block->size;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief This function initialize the memory.
|
||||
*
|
||||
* @param num The number of the memory.
|
||||
* @param size The size of the memory.
|
||||
*
|
||||
* @return The initialized memory.
|
||||
*/
|
||||
MR_WEAK void *mr_calloc(size_t num, size_t size)
|
||||
{
|
||||
size_t total = num * size;
|
||||
void *memory = MR_NULL;
|
||||
|
||||
memory = mr_malloc(total);
|
||||
if (memory != MR_NULL)
|
||||
{
|
||||
memset(memory, 0, total);
|
||||
}
|
||||
return memory;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief This function realloc memory.
|
||||
*
|
||||
* @param memory The memory.
|
||||
* @param size The size of the memory.
|
||||
*
|
||||
* @return The reallocated memory.
|
||||
*/
|
||||
MR_WEAK void *mr_realloc(void *memory, size_t size)
|
||||
{
|
||||
size_t old_size = mr_malloc_usable_size(memory);
|
||||
void *new_memory = MR_NULL;
|
||||
|
||||
new_memory = mr_malloc(size);
|
||||
if (new_memory != MR_NULL)
|
||||
{
|
||||
memcpy(new_memory, memory, old_size);
|
||||
mr_free(memory);
|
||||
}
|
||||
return new_memory;
|
||||
}
|
||||
250
source/service.c
250
source/service.c
@@ -52,248 +52,6 @@ MR_WEAK void mr_interrupt_enable(void)
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Heap memory.
|
||||
*/
|
||||
#ifndef MR_CFG_HEAP_SIZE
|
||||
#define MR_CFG_HEAP_SIZE (4 * 1024) /* If not defined, use 4KB */
|
||||
#endif /* MR_CFG_HEAP_SIZE */
|
||||
static uint8_t heap_mem[MR_CFG_HEAP_SIZE] = {0};
|
||||
|
||||
#define MR_HEAP_BLOCK_FREE (0)
|
||||
#define MR_HEAP_BLOCK_ALLOCATED (1)
|
||||
#define MR_HEAP_BLOCK_MIN_SIZE (sizeof(struct mr_heap_block) << 1)
|
||||
|
||||
/**
|
||||
* @brief Heap block structure.
|
||||
*/
|
||||
static struct mr_heap_block
|
||||
{
|
||||
struct mr_heap_block *next;
|
||||
uint32_t size: 31;
|
||||
uint32_t allocated: 1;
|
||||
} heap_start = {MR_NULL, 0, MR_HEAP_BLOCK_FREE};
|
||||
|
||||
/**
|
||||
* @brief This function initialize the heap.
|
||||
*
|
||||
* @return MR_ERR_OK on success, otherwise an error code.
|
||||
*/
|
||||
int mr_heap_init(void)
|
||||
{
|
||||
struct mr_heap_block *first_block = (struct mr_heap_block *)&heap_mem;
|
||||
|
||||
/* Initialize the first block */
|
||||
first_block->next = MR_NULL;
|
||||
first_block->size = sizeof(heap_mem) - sizeof(struct mr_heap_block);
|
||||
first_block->allocated = MR_HEAP_BLOCK_FREE;
|
||||
|
||||
/* Initialize the heap */
|
||||
heap_start.next = first_block;
|
||||
return MR_EOK;
|
||||
}
|
||||
MR_BOARD_EXPORT(mr_heap_init);
|
||||
|
||||
static void heap_insert_block(struct mr_heap_block *block)
|
||||
{
|
||||
struct mr_heap_block *block_prev = &heap_start;
|
||||
|
||||
/* Search for the previous block */
|
||||
while (((block_prev->next != MR_NULL) && ((uint32_t)block_prev->next < (uint32_t)block)))
|
||||
{
|
||||
block_prev = block_prev->next;
|
||||
}
|
||||
|
||||
/* Insert the block */
|
||||
if (block_prev->next != MR_NULL)
|
||||
{
|
||||
/* Merge with the previous block */
|
||||
if ((void *)(((uint8_t *)block_prev) + sizeof(struct mr_heap_block) + block_prev->size) == (void *)block)
|
||||
{
|
||||
block_prev->size += block->size + sizeof(struct mr_heap_block);
|
||||
block = block_prev;
|
||||
}
|
||||
|
||||
/* Merge with the next block */
|
||||
if ((void *)(((uint8_t *)block) + sizeof(struct mr_heap_block) + block->size) == (void *)block_prev->next)
|
||||
{
|
||||
block->size += block_prev->next->size + sizeof(struct mr_heap_block);
|
||||
block->next = block_prev->next->next;
|
||||
if (block != block_prev)
|
||||
{
|
||||
block_prev->next = block;
|
||||
block = block_prev;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Insert the block */
|
||||
if (block != block_prev)
|
||||
{
|
||||
block->next = block_prev->next;
|
||||
block_prev->next = block;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief This function allocate memory.
|
||||
*
|
||||
* @param size The size of the memory.
|
||||
*
|
||||
* @return The allocated memory.
|
||||
*/
|
||||
MR_WEAK void *mr_malloc(size_t size)
|
||||
{
|
||||
struct mr_heap_block *block_prev = &heap_start;
|
||||
struct mr_heap_block *block = block_prev->next;
|
||||
void *memory = MR_NULL;
|
||||
size_t residual = 0;
|
||||
|
||||
/* Disable interrupt */
|
||||
mr_interrupt_disable();
|
||||
|
||||
/* Check size and residual memory */
|
||||
if ((size == 0) || (size > (UINT32_MAX >> 1) || (block == MR_NULL)))
|
||||
{
|
||||
/* Enable interrupt */
|
||||
mr_interrupt_enable();
|
||||
return MR_NULL;
|
||||
}
|
||||
|
||||
/* Align the size up 4 bytes */
|
||||
size = mr_align4_up(size);
|
||||
|
||||
/* Search for and take blocks that match the criteria */
|
||||
while (block->size < size)
|
||||
{
|
||||
if (block->next == MR_NULL)
|
||||
{
|
||||
/* Enable interrupt */
|
||||
mr_interrupt_enable();
|
||||
return MR_NULL;
|
||||
}
|
||||
block_prev = block;
|
||||
block = block->next;
|
||||
}
|
||||
block_prev->next = block->next;
|
||||
|
||||
/* Allocate memory */
|
||||
memory = (void *)((uint8_t *)block + sizeof(struct mr_heap_block));
|
||||
residual = block->size - size;
|
||||
|
||||
/* Set the block information */
|
||||
block->size = size;
|
||||
block->next = MR_NULL;
|
||||
block->allocated = MR_HEAP_BLOCK_ALLOCATED;
|
||||
|
||||
/* Check if we need to allocate a new block */
|
||||
if (residual > MR_HEAP_BLOCK_MIN_SIZE)
|
||||
{
|
||||
struct mr_heap_block *new_block = (struct mr_heap_block *)(((uint8_t *)memory) + size);
|
||||
|
||||
/* Set the new block information */
|
||||
new_block->size = residual - sizeof(struct mr_heap_block);
|
||||
new_block->next = MR_NULL;
|
||||
new_block->allocated = MR_HEAP_BLOCK_FREE;
|
||||
|
||||
/* Insert the new block */
|
||||
heap_insert_block(new_block);
|
||||
}
|
||||
|
||||
/* Enable interrupt */
|
||||
mr_interrupt_enable();
|
||||
|
||||
return memory;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief This function free memory.
|
||||
*
|
||||
* @param memory The memory to free.
|
||||
*/
|
||||
MR_WEAK void mr_free(void *memory)
|
||||
{
|
||||
if (memory != MR_NULL)
|
||||
{
|
||||
struct mr_heap_block *block = (struct mr_heap_block *)((uint8_t *)memory - sizeof(struct mr_heap_block));
|
||||
|
||||
/* Disable interrupt */
|
||||
mr_interrupt_disable();
|
||||
|
||||
/* Check the block */
|
||||
if (block->allocated == MR_HEAP_BLOCK_ALLOCATED && block->size != 0)
|
||||
{
|
||||
block->allocated = MR_HEAP_BLOCK_FREE;
|
||||
|
||||
/* Insert the free block */
|
||||
heap_insert_block(block);
|
||||
}
|
||||
|
||||
/* Enable interrupt */
|
||||
mr_interrupt_enable();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief This function get the usable size of the memory.
|
||||
*
|
||||
* @param memory The memory.
|
||||
*
|
||||
* @return The usable size of the memory.
|
||||
*/
|
||||
MR_WEAK size_t mr_malloc_usable_size(void *memory)
|
||||
{
|
||||
if (memory != MR_NULL)
|
||||
{
|
||||
struct mr_heap_block *block = (struct mr_heap_block *)((uint8_t *)memory - sizeof(struct mr_heap_block));
|
||||
return block->size;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief This function initialize the memory.
|
||||
*
|
||||
* @param num The number of the memory.
|
||||
* @param size The size of the memory.
|
||||
*
|
||||
* @return The initialized memory.
|
||||
*/
|
||||
MR_WEAK void *mr_calloc(size_t num, size_t size)
|
||||
{
|
||||
size_t total = num * size;
|
||||
void *memory = MR_NULL;
|
||||
|
||||
memory = mr_malloc(total);
|
||||
if (memory != MR_NULL)
|
||||
{
|
||||
memset(memory, 0, total);
|
||||
}
|
||||
return memory;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief This function realloc memory.
|
||||
*
|
||||
* @param memory The memory.
|
||||
* @param size The size of the memory.
|
||||
*
|
||||
* @return The reallocated memory.
|
||||
*/
|
||||
MR_WEAK void *mr_realloc(void *memory, size_t size)
|
||||
{
|
||||
size_t old_size = mr_malloc_usable_size(memory);
|
||||
void *new_memory = MR_NULL;
|
||||
|
||||
new_memory = mr_malloc(size);
|
||||
if (new_memory != MR_NULL)
|
||||
{
|
||||
memcpy(new_memory, memory, old_size);
|
||||
mr_free(memory);
|
||||
}
|
||||
return new_memory;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief This function delay us.
|
||||
*
|
||||
@@ -361,7 +119,7 @@ MR_WEAK int mr_printf_output(const char *buf, size_t size)
|
||||
}
|
||||
return (int)mr_dev_write(console, buf, size);
|
||||
#else
|
||||
return 0;
|
||||
return printf("%s", buf);
|
||||
#endif /* MR_USING_CONSOLE */
|
||||
}
|
||||
|
||||
@@ -479,10 +237,10 @@ int mr_ringbuf_allocate(struct mr_ringbuf *ringbuf, size_t size)
|
||||
return MR_EOK;
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* @brief This function free the ringbuffer.
|
||||
*
|
||||
* @param ringbuf The ringbuffer to free.
|
||||
*
|
||||
* @param ringbuf The ringbuffer to free.
|
||||
*/
|
||||
void mr_ringbuf_free(struct mr_ringbuf *ringbuf)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user