Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-09-23 16:43:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

use malloc/free instead of mg_slice_alloc0/mg_slice_free; cleanup

Browse Source
This commit is contained in:
Vincent Wei
2021-03-25 16:57:41 +08:00
parent 0f1b251c91
commit 5dd702017f
1 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/blockheap.c
+9 -20
View File
@@ -70,11 +70,13 @@ void InitBlockDataHeap (PBLOCKHEAP heap, size_t bd_size, size_t heap_size)
heap->heap = NULL;
heap->bd_size = bd_size + sizeof (DWORD);
heap->heap_size = heap_size;
heap->free = 0;
heap->nr_alloc = 0;
}
void* BlockDataAlloc (PBLOCKHEAP heap)
{
int i;
size_t i;
char* block_data = NULL;
#ifdef _MGRM_THREADS
@@ -94,19 +96,13 @@ void* BlockDataAlloc (PBLOCKHEAP heap)
heap->free = i + 1;
*((DWORD*)block_data) = BDS_USED;
#if 0
fprintf (stderr, "heap: %p, Allocated: %d, free: %d.\n", heap, i, heap->free);
fprintf (stderr, "Heap: (bd_size: %d, heap_size: %d, heap: %p).\n",
heap->bd_size, heap->heap_size, heap->heap);
#endif
goto ret;
}
block_data += heap->bd_size;
}
#if 0
#if 1
if (!(block_data = calloc (1, heap->bd_size)))
goto ret;
#else
@@ -114,6 +110,8 @@ void* BlockDataAlloc (PBLOCKHEAP heap)
goto ret;
#endif
heap->nr_alloc++;
*((DWORD*)block_data) = BDS_SPECIAL;
ret:
@@ -129,7 +127,7 @@ ret:
void BlockDataFree (PBLOCKHEAP heap, void* data)
{
int i;
size_t i;
char* block_data;
#ifdef _MGRM_THREADS
@@ -138,10 +136,11 @@ void BlockDataFree (PBLOCKHEAP heap, void* data)
block_data = (char*) data - sizeof (DWORD);
if (*((DWORD*)block_data) == BDS_SPECIAL) {
#if 0
#if 1
free (block_data);
#else
mg_slice_free (heap->bd_size, block_data);
heap->nr_alloc--;
#endif
}
else if (*((DWORD*)block_data) == BDS_USED) {
@@ -150,12 +149,6 @@ void BlockDataFree (PBLOCKHEAP heap, void* data)
i = (block_data - (char*)heap->heap)/heap->bd_size;
if (heap->free > i)
heap->free = i;
#if 0
fprintf (stderr, "Heap: %p: Freed: %d, free: %d.\n", heap, i, heap->free);
fprintf (stderr, "Heap: (bd_size: %d, heap_size: %d, heap: %p).\n",
heap->bd_size, heap->heap_size, heap->heap);
#endif
}
#ifdef _MGRM_THREADS
@@ -165,10 +158,6 @@ void BlockDataFree (PBLOCKHEAP heap, void* data)
void DestroyBlockDataHeap (PBLOCKHEAP heap)
{
#if 0
fprintf (stderr, "Heap: (bd_size: %d, heap_size: %d, heap: %p).\n",
heap->bd_size, heap->heap_size, heap->heap);
#endif
#ifdef _MGRM_THREADS
pthread_mutex_destroy (&heap->lock);
#endif