len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-09-10 08:07:46 -04:00
Code Issues Projects Releases Packages Wiki Activity

Protected override

Browse source 
There was a mistake when the heap was full. Adding a block to the map can fail, i have to check for this and add the block to cache if so.
This commit is contained in:
Sven Bieg 2024-04-15 19:01:37 +02:00
parent e473cf6caa
commit 4542ebbc8b
2 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored Normal file
View file

@ -0,0 +1,3 @@
/.vs
/out

36
portable/Heap/heap.c
View file

@ -139,13 +139,8 @@ else
{
buf=heap_alloc_from_foot(heap, size);
}
if(buf)
{
xSuccessfulAllocations++;
return buf;
}
return NULL;
}
void heap_free(heap_handle_t heap, void* buf)
{
@ -154,7 +149,6 @@ if(!buf)
return;
heap_free_to_map(heap, buf);
heap_free_cache(heap);
xSuccessfulDeletions++;
}
@ -210,15 +204,14 @@ return heap_alloc_from_foot(heap, size);
void heap_free_cache(heap_handle_t heap)
{
size_t free_block=heap->free_block;
heap->free_block=0;
while(free_block)
{
heap_t* heap_ptr=(heap_t*)heap;
size_t free_block=heap_ptr->free_block;
if(!free_block)
return;
size_t* buf=(size_t*)heap_block_get_pointer(free_block);
free_block=*buf;
heap_ptr->free_block=*buf;
heap_free_to_map(heap, buf);
}
}
void heap_free_to_cache(heap_handle_t heap, void* buf)
{
@ -261,14 +254,22 @@ if(info.next.free)
xFreeBlocks--;
xFreeBytes-=info.next.size;
}
heap->free+=size;
xFreeBlocks++;
xFreeBytes+=size;
info.current.offset=offset;
info.current.size=size;
info.current.free=true;
heap_block_init(heap, &info.current);
block_map_add_block(heap, (block_map_t*)&heap->map_free, &info.current);
bool added=block_map_add_block(heap, (block_map_t*)&heap->map_free, &info.current);
if(!added)
{
info.current.free=false;
heap_block_init(heap, &info.current);
buf=heap_block_get_pointer(info.current.offset);
heap_free_to_cache(heap, buf);
return;
}
heap->free+=size;
xFreeBlocks++;
xFreeBytes+=size;
}
@ -317,6 +318,8 @@ if(locked)
}
}
heap_unlock(locked);
if(buf!=NULL)
xSuccessfulAllocations++;
return buf;
}
@ -357,6 +360,7 @@ if(locked)
if(offset>heap_start&&offset<heap_end)
{
heap_free(heap, pv);
xSuccessfulDeletions++;
break;
}
heap=(heap_handle_t)heap->next_heap;