sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/sim: Simplify the implementation of textheap by reuse the heap manager

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
dongjiuzhu1 2023-10-13 22:16:57 +08:00 committed by Xiang Xiao
parent dcc006035d
commit 861220f649
1 changed files with 9 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
arch/sim/src/sim/sim_textheap.c
View File

@ -23,8 +23,7 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/queue.h> #include <nuttx/mm/mm.h>
#include <nuttx/kmalloc.h>
#include "sim_internal.h" #include "sim_internal.h"
@ -32,16 +31,7 @@
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
/* Record memory allocated for text sections by sq_queue_t */ static struct mm_heap_s *g_textheap;
struct textheap_s
{
sq_entry_t entry;
void *p;
size_t size;
};
static sq_queue_t g_textheap_list;
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
@ -57,40 +47,13 @@ static sq_queue_t g_textheap_list;
void *up_textheap_memalign(size_t align, size_t size) void *up_textheap_memalign(size_t align, size_t size)
{ {
struct textheap_s *node; if (g_textheap == NULL)
void *p;
irqstate_t flags;
/* host_allocheap (mmap) returns memory aligned to the page size, which
* is always a multiple of the alignment (4/8) for text section. So, we
* don't need to do anything here.
*/
p = host_allocheap(size);
flags = up_irq_save();
if (p)
{ {
node = kmm_malloc(sizeof(*node)); g_textheap = mm_initialize("textheap", host_allocheap(SIM_HEAP_SIZE),
SIM_HEAP_SIZE);
if (node)
{
node->p = p;
node->size = size;
sq_addlast(&node->entry, &g_textheap_list);
}
else
{
host_freeheap(p);
p = NULL;
}
} }
up_irq_restore(flags); return mm_memalign(g_textheap, align, size);
return p;
} }
/**************************************************************************** /****************************************************************************
@ -103,26 +66,10 @@ void *up_textheap_memalign(size_t align, size_t size)
void up_textheap_free(void *p) void up_textheap_free(void *p)
{ {
sq_entry_t *node; if (g_textheap != NULL)
struct textheap_s *entry;
irqstate_t flags = up_irq_save();
for (node = sq_peek(&g_textheap_list);
node != NULL;
node = sq_next(node))
{ {
entry = (struct textheap_s *)node; mm_free(g_textheap, p);
if (entry->p == p)
{
sq_rem(node, &g_textheap_list);
host_freeheap(p);
kmm_free(entry);
break;
} }
}
up_irq_restore(flags);
} }
/**************************************************************************** /****************************************************************************
@ -135,24 +82,5 @@ void up_textheap_free(void *p)
bool up_textheap_heapmember(void *p) bool up_textheap_heapmember(void *p)
{ {
bool ret = false; return g_textheap != NULL && mm_heapmember(g_textheap, p);
sq_entry_t *node;
struct textheap_s *entry;
irqstate_t flags = up_irq_save();
for (node = sq_peek(&g_textheap_list);
node != NULL;
node = sq_next(node))
{
entry = (struct textheap_s *)node;
if (entry->p == p)
{
ret = true;
break;
}
}
up_irq_restore(flags);
return ret;
} }