RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

heap: Fix heap statistics with protection enabled

Browse Source 
Close #4643.
This commit is contained in:
Sebastian Huber
2022-04-28 09:57:41 +02:00
parent fc89cc7680
commit be5d2bc03d
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cpukit/include/rtems/score/heapimpl.h
View File

@@ -407,15 +407,7 @@ Heap_Block *_Heap_Block_allocate(
(*heap->Protection.block_error)( heap, block, reason );
}
static inline void _Heap_Protection_free_all_delayed_blocks( Heap_Control *heap )
{
uintptr_t large = 0
- (uintptr_t) HEAP_BLOCK_HEADER_SIZE
- (uintptr_t) HEAP_ALLOC_BONUS
- (uintptr_t) 1;
void *p = _Heap_Allocate( heap, large );
_Heap_Free( heap, p );
}
void _Heap_Protection_free_all_delayed_blocks( Heap_Control *heap );
#endif
/**

9
cpukit/score/src/heapallocate.c
View File

@@ -73,6 +73,15 @@
return search_again;
}
void _Heap_Protection_free_all_delayed_blocks( Heap_Control *heap )
{
bool search_again;
do {
search_again = _Heap_Protection_free_delayed_blocks( heap, 0 );
} while ( search_again );
}
#endif
#ifdef RTEMS_HEAP_DEBUG

4
testsuites/libtests/malloctest/init.c
View File

@@ -122,9 +122,13 @@ static void test_heap_default_init(void)
static void test_free( void *addr )
{
uint32_t failed_allocs;
rtems_test_assert( _Heap_Free( &TestHeap, addr ) );
failed_allocs = TestHeap.stats.failed_allocs;
_Heap_Protection_free_all_delayed_blocks( &TestHeap );
rtems_test_assert( failed_allocs == TestHeap.stats.failed_allocs );
}
static void test_heap_cases_1(void)