Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-28 15:53:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

confdefs.h: Fix heap alloc size estimate

Browse Source 
Account for the heap minimum block size.
This commit is contained in:
Sebastian Huber
2016-05-25 12:43:53 +02:00
parent addf1aa868
commit 25e28d84d7
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/sapi/include/confdefs.h
+8 -4
View File
@@ -1369,10 +1369,13 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
#define _Configure_Zero_or_One(_number) ((_number) ? 1 : 0)
/**
* General helper to aligned a value up to a power of two boundary.
* General helper to align up a value.
*/
#define _Configure_Align_up(_val, _align) \
(((_val) + (_align) - 1) & ~((_align) - 1))
(((_val) + (_align) - 1) - ((_val) + (_align) - 1) % (_align))
#define CONFIGURE_HEAP_MIN_BLOCK_SIZE \
_Configure_Align_up(sizeof(Heap_Block), CPU_HEAP_ALIGNMENT)
/**
* This is a helper macro used in calculations in this file. It is used
@@ -1381,8 +1384,9 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
* may be applied.
*/
#define _Configure_From_workspace(_size) \
(ssize_t) (_Configure_Zero_or_One(_size) * \
_Configure_Align_up((_size) + HEAP_BLOCK_HEADER_SIZE, CPU_HEAP_ALIGNMENT))
(ssize_t) (_Configure_Zero_or_One(_size) * \
_Configure_Align_up(_size + HEAP_BLOCK_HEADER_SIZE, \
CONFIGURE_HEAP_MIN_BLOCK_SIZE))
/**
* This is a helper macro used in stack space calculations in this file. It