Changeset 30c71c3 in rtems

Timestamp:

Jan 7, 2021, 11:05:37 AM (3 months ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

master

Children:

b35ac99

Parents:

c734e86

git-author:

Sebastian Huber <sebastian.huber@…> (01/07/21 11:05:37)

git-committer:

Sebastian Huber <sebastian.huber@…> (01/26/21 14:29:36)

Message:

heap: Fix _Heap_Area_overhead()

The first block must be a proper block. Account for this in
_Heap_Area_overhead().

File:

• cpukit/include/rtems/score/heap.h (modified) (1 diff)

cpukit/include/rtems/score/heap.h

@@ -456 +456 @@
   }
 
-  return 2 * (page_size - 1) + HEAP_BLOCK_HEADER_SIZE;
+  /*
+   * Account for a potential alignment of the area begin address to a page
+   * boundary, the first block, and the last block.  The last block consists
+   * only of a block header.
+   */
+  return page_size - 1 + _Heap_Min_block_size( page_size ) +
+    HEAP_BLOCK_HEADER_SIZE;
 }