]> git.sur5r.net Git - freertos/blobdiff - FreeRTOS/Source/portable/MemMang/heap_4.c
Update version number in readiness for V10.3.0 release. Sync SVN with reviewed releas...
[freertos] / FreeRTOS / Source / portable / MemMang / heap_4.c
index d40fea1ec35b7ba864567496bbb1afae2649cc12..911d4f9a597e5a1a36a3eaee211f0d2a16ba637b 100644 (file)
@@ -1,77 +1,36 @@
 /*\r
-    FreeRTOS V7.3.0 - Copyright (C) 2012 Real Time Engineers Ltd.\r
-\r
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT \r
-    http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
-\r
-    ***************************************************************************\r
-     *                                                                       *\r
-     *    FreeRTOS tutorial books are available in pdf and paperback.        *\r
-     *    Complete, revised, and edited pdf reference manuals are also       *\r
-     *    available.                                                         *\r
-     *                                                                       *\r
-     *    Purchasing FreeRTOS documentation will not only help you, by       *\r
-     *    ensuring you get running as quickly as possible and with an        *\r
-     *    in-depth knowledge of how to use FreeRTOS, it will also help       *\r
-     *    the FreeRTOS project to continue with its mission of providing     *\r
-     *    professional grade, cross platform, de facto standard solutions    *\r
-     *    for microcontrollers - completely free of charge!                  *\r
-     *                                                                       *\r
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\r
-     *                                                                       *\r
-     *    Thank you for using FreeRTOS, and thank you for your support!      *\r
-     *                                                                       *\r
-    ***************************************************************************\r
-\r
-\r
-    This file is part of the FreeRTOS distribution.\r
-\r
-    FreeRTOS is free software; you can redistribute it and/or modify it under\r
-    the terms of the GNU General Public License (version 2) as published by the\r
-    Free Software Foundation AND MODIFIED BY the FreeRTOS exception.\r
-    >>>NOTE<<< The modification to the GPL is included to allow you to\r
-    distribute a combined work that includes FreeRTOS without being obliged to\r
-    provide the source code for proprietary components outside of the FreeRTOS\r
-    kernel.  FreeRTOS is distributed in the hope that it will be useful, but\r
-    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
-    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
-    more details. You should have received a copy of the GNU General Public\r
-    License and the FreeRTOS license exception along with FreeRTOS; if not it\r
-    can be viewed here: http://www.freertos.org/a00114.html and also obtained\r
-    by writing to Richard Barry, contact details for whom are available on the\r
-    FreeRTOS WEB site.\r
-\r
-    1 tab == 4 spaces!\r
-    \r
-    ***************************************************************************\r
-     *                                                                       *\r
-     *    Having a problem?  Start by reading the FAQ "My application does   *\r
-     *    not run, what could be wrong?"                                     *\r
-     *                                                                       *\r
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *\r
-     *                                                                       *\r
-    ***************************************************************************\r
-\r
-    \r
-    http://www.FreeRTOS.org - Documentation, training, latest versions, license \r
-    and contact details.  \r
-    \r
-    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
-    including FreeRTOS+Trace - an indispensable productivity tool.\r
-\r
-    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell \r
-    the code with commercial support, indemnification, and middleware, under \r
-    the OpenRTOS brand: http://www.OpenRTOS.com.  High Integrity Systems also\r
-    provide a safety engineered and independently SIL3 certified version under \r
-    the SafeRTOS brand: http://www.SafeRTOS.com.\r
-*/\r
+ * FreeRTOS Kernel V10.3.0\r
+ * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\r
+ *\r
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of\r
+ * this software and associated documentation files (the "Software"), to deal in\r
+ * the Software without restriction, including without limitation the rights to\r
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of\r
+ * the Software, and to permit persons to whom the Software is furnished to do so,\r
+ * subject to the following conditions:\r
+ *\r
+ * The above copyright notice and this permission notice shall be included in all\r
+ * copies or substantial portions of the Software.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\r
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\r
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\r
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+ *\r
+ * http://www.FreeRTOS.org\r
+ * http://aws.amazon.com/freertos\r
+ *\r
+ * 1 tab == 4 spaces!\r
+ */\r
 \r
 /*\r
- * A sample implementation of pvPortMalloc() and vPortFree() that combines \r
- * (coalescences) adjacent memory blocks as they are freed, and in so doing \r
+ * A sample implementation of pvPortMalloc() and vPortFree() that combines\r
+ * (coalescences) adjacent memory blocks as they are freed, and in so doing\r
  * limits memory fragmentation.\r
  *\r
- * See heap_1.c, heap_2.c and heap_3.c for alternative implementations, and the \r
+ * See heap_1.c, heap_2.c and heap_3.c for alternative implementations, and the\r
  * memory management pages of http://www.FreeRTOS.org for more information.\r
  */\r
 #include <stdlib.h>\r
@@ -86,20 +45,24 @@ task.h is included from an application file. */
 \r
 #undef MPU_WRAPPERS_INCLUDED_FROM_API_FILE\r
 \r
+#if( configSUPPORT_DYNAMIC_ALLOCATION == 0 )\r
+       #error This file must not be used if configSUPPORT_DYNAMIC_ALLOCATION is 0\r
+#endif\r
+\r
 /* Block sizes must not get too small. */\r
-#define heapMINIMUM_BLOCK_SIZE ( ( size_t ) ( heapSTRUCT_SIZE * 2 ) )\r
+#define heapMINIMUM_BLOCK_SIZE ( ( size_t ) ( xHeapStructSize << 1 ) )\r
 \r
-/* Allocate the memory for the heap.  The struct is used to force byte\r
-alignment without using any non-portable code. */\r
-static union xRTOS_HEAP\r
-{\r
-       #if portBYTE_ALIGNMENT == 8\r
-               volatile portDOUBLE dDummy;\r
-       #else\r
-               volatile unsigned long ulDummy;\r
-       #endif\r
-       unsigned char ucHeap[ configTOTAL_HEAP_SIZE ];\r
-} xHeap;\r
+/* Assumes 8bit bytes! */\r
+#define heapBITS_PER_BYTE              ( ( size_t ) 8 )\r
+\r
+/* Allocate the memory for the heap. */\r
+#if( configAPPLICATION_ALLOCATED_HEAP == 1 )\r
+       /* The application writer has already defined the array used for the RTOS\r
+       heap - probably so it can be placed in a special segment or address. */\r
+       extern uint8_t ucHeap[ configTOTAL_HEAP_SIZE ];\r
+#else\r
+       static uint8_t ucHeap[ configTOTAL_HEAP_SIZE ];\r
+#endif /* configAPPLICATION_ALLOCATED_HEAP */\r
 \r
 /* Define the linked list structure.  This is used to link free blocks in order\r
 of their memory address. */\r
@@ -107,17 +70,17 @@ typedef struct A_BLOCK_LINK
 {\r
        struct A_BLOCK_LINK *pxNextFreeBlock;   /*<< The next free block in the list. */\r
        size_t xBlockSize;                                              /*<< The size of the free block. */\r
-} xBlockLink;\r
+} BlockLink_t;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
 /*\r
- * Inserts a block of memory that is being freed into the correct position in \r
+ * Inserts a block of memory that is being freed into the correct position in\r
  * the list of free memory blocks.  The block being freed will be merged with\r
  * the block in front it and/or the block behind it if the memory blocks are\r
  * adjacent to each other.\r
  */\r
-static void prvInsertBlockIntoFreeList( xBlockLink *pxBlockToInsert );\r
+static void prvInsertBlockIntoFreeList( BlockLink_t *pxBlockToInsert );\r
 \r
 /*\r
  * Called automatically to setup the required heap structures the first time\r
@@ -129,25 +92,29 @@ static void prvHeapInit( void );
 \r
 /* The size of the structure placed at the beginning of each allocated memory\r
 block must by correctly byte aligned. */\r
-static const unsigned short heapSTRUCT_SIZE    = ( sizeof( xBlockLink ) + portBYTE_ALIGNMENT - ( sizeof( xBlockLink ) % portBYTE_ALIGNMENT ) );\r
-\r
-/* Ensure the pxEnd pointer will end up on the correct byte alignment. */\r
-static const size_t xTotalHeapSize = ( ( size_t ) configTOTAL_HEAP_SIZE ) & ( ( size_t ) ~portBYTE_ALIGNMENT_MASK );\r
+static const size_t xHeapStructSize    = ( sizeof( BlockLink_t ) + ( ( size_t ) ( portBYTE_ALIGNMENT - 1 ) ) ) & ~( ( size_t ) portBYTE_ALIGNMENT_MASK );\r
 \r
 /* Create a couple of list links to mark the start and end of the list. */\r
-static xBlockLink xStart, *pxEnd = NULL;\r
+static BlockLink_t xStart, *pxEnd = NULL;\r
 \r
-/* Keeps track of the number of free bytes remaining, but says nothing about\r
-fragmentation. */\r
-static size_t xFreeBytesRemaining = ( ( size_t ) configTOTAL_HEAP_SIZE ) & ( ( size_t ) ~portBYTE_ALIGNMENT_MASK );\r
+/* Keeps track of the number of calls to allocate and free memory as well as the\r
+number of free bytes remaining, but says nothing about fragmentation. */\r
+static size_t xFreeBytesRemaining = 0U;\r
+static size_t xMinimumEverFreeBytesRemaining = 0U;\r
+static size_t xNumberOfSuccessfulAllocations = 0;\r
+static size_t xNumberOfSuccessfulFrees = 0;\r
 \r
-/* STATIC FUNCTIONS ARE DEFINED AS MACROS TO MINIMIZE THE FUNCTION CALL DEPTH. */\r
+/* Gets set to the top bit of an size_t type.  When this bit in the xBlockSize\r
+member of an BlockLink_t structure is set then the block belongs to the\r
+application.  When the bit is free the block is still part of the free heap\r
+space. */\r
+static size_t xBlockAllocatedBit = 0;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
 void *pvPortMalloc( size_t xWantedSize )\r
 {\r
-xBlockLink *pxBlock, *pxPreviousBlock, *pxNewBlockLink;\r
+BlockLink_t *pxBlock, *pxPreviousBlock, *pxNewBlockLink;\r
 void *pvReturn = NULL;\r
 \r
        vTaskSuspendAll();\r
@@ -158,68 +125,124 @@ void *pvReturn = NULL;
                {\r
                        prvHeapInit();\r
                }\r
-\r
-               /* The wanted size is increased so it can contain a xBlockLink\r
-               structure in addition to the requested amount of bytes. */\r
-               if( xWantedSize > 0 )\r
+               else\r
                {\r
-                       xWantedSize += heapSTRUCT_SIZE;\r
-\r
-                       /* Ensure that blocks are always aligned to the required number of \r
-                       bytes. */\r
-                       if( xWantedSize & portBYTE_ALIGNMENT_MASK )\r
-                       {\r
-                               /* Byte alignment required. */\r
-                               xWantedSize += ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) );\r
-                       }\r
+                       mtCOVERAGE_TEST_MARKER();\r
                }\r
 \r
-               if( ( xWantedSize > 0 ) && ( xWantedSize < xTotalHeapSize ) )\r
+               /* Check the requested block size is not so large that the top bit is\r
+               set.  The top bit of the block size member of the BlockLink_t structure\r
+               is used to determine who owns the block - the application or the\r
+               kernel, so it must be free. */\r
+               if( ( xWantedSize & xBlockAllocatedBit ) == 0 )\r
                {\r
-                       /* Traverse the list from the start     (lowest address) block until one\r
-                       of adequate size is found. */\r
-                       pxPreviousBlock = &xStart;\r
-                       pxBlock = xStart.pxNextFreeBlock;\r
-                       while( ( pxBlock->xBlockSize < xWantedSize ) && ( pxBlock->pxNextFreeBlock != NULL ) )\r
+                       /* The wanted size is increased so it can contain a BlockLink_t\r
+                       structure in addition to the requested amount of bytes. */\r
+                       if( xWantedSize > 0 )\r
                        {\r
-                               pxPreviousBlock = pxBlock;\r
-                               pxBlock = pxBlock->pxNextFreeBlock;\r
-                       }\r
+                               xWantedSize += xHeapStructSize;\r
 \r
-                       /* If the end marker was reached then a block of adequate size was\r
-                       not found. */\r
-                       if( pxBlock != pxEnd )\r
+                               /* Ensure that blocks are always aligned to the required number\r
+                               of bytes. */\r
+                               if( ( xWantedSize & portBYTE_ALIGNMENT_MASK ) != 0x00 )\r
+                               {\r
+                                       /* Byte alignment required. */\r
+                                       xWantedSize += ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) );\r
+                                       configASSERT( ( xWantedSize & portBYTE_ALIGNMENT_MASK ) == 0 );\r
+                               }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
+                       }\r
+                       else\r
                        {\r
-                               /* Return the memory space - jumping over the xBlockLink structure\r
-                               at its start. */\r
-                               pvReturn = ( void * ) ( ( ( unsigned char * ) pxPreviousBlock->pxNextFreeBlock ) + heapSTRUCT_SIZE );\r
-\r
-                               /* This block is being returned for use so must be taken out of\r
-                               the     list of free blocks. */\r
-                               pxPreviousBlock->pxNextFreeBlock = pxBlock->pxNextFreeBlock;\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
 \r
-                               /* If the block is larger than required it can be split into two. */\r
-                               if( ( pxBlock->xBlockSize - xWantedSize ) > heapMINIMUM_BLOCK_SIZE )\r
+                       if( ( xWantedSize > 0 ) && ( xWantedSize <= xFreeBytesRemaining ) )\r
+                       {\r
+                               /* Traverse the list from the start     (lowest address) block until\r
+                               one     of adequate size is found. */\r
+                               pxPreviousBlock = &xStart;\r
+                               pxBlock = xStart.pxNextFreeBlock;\r
+                               while( ( pxBlock->xBlockSize < xWantedSize ) && ( pxBlock->pxNextFreeBlock != NULL ) )\r
                                {\r
-                                       /* This block is to be split into two.  Create a new block\r
-                                       following the number of bytes requested. The void cast is\r
-                                       used to prevent byte alignment warnings from the compiler. */\r
-                                       pxNewBlockLink = ( void * ) ( ( ( unsigned char * ) pxBlock ) + xWantedSize );\r
-\r
-                                       /* Calculate the sizes of two blocks split from the single\r
-                                       block. */\r
-                                       pxNewBlockLink->xBlockSize = pxBlock->xBlockSize - xWantedSize;\r
-                                       pxBlock->xBlockSize = xWantedSize;\r
-\r
-                                       /* Insert the new block into the list of free blocks. */\r
-                                       prvInsertBlockIntoFreeList( ( pxNewBlockLink ) );\r
+                                       pxPreviousBlock = pxBlock;\r
+                                       pxBlock = pxBlock->pxNextFreeBlock;\r
                                }\r
 \r
-                               xFreeBytesRemaining -= pxBlock->xBlockSize;\r
+                               /* If the end marker was reached then a block of adequate size\r
+                               was     not found. */\r
+                               if( pxBlock != pxEnd )\r
+                               {\r
+                                       /* Return the memory space pointed to - jumping over the\r
+                                       BlockLink_t structure at its start. */\r
+                                       pvReturn = ( void * ) ( ( ( uint8_t * ) pxPreviousBlock->pxNextFreeBlock ) + xHeapStructSize );\r
+\r
+                                       /* This block is being returned for use so must be taken out\r
+                                       of the list of free blocks. */\r
+                                       pxPreviousBlock->pxNextFreeBlock = pxBlock->pxNextFreeBlock;\r
+\r
+                                       /* If the block is larger than required it can be split into\r
+                                       two. */\r
+                                       if( ( pxBlock->xBlockSize - xWantedSize ) > heapMINIMUM_BLOCK_SIZE )\r
+                                       {\r
+                                               /* This block is to be split into two.  Create a new\r
+                                               block following the number of bytes requested. The void\r
+                                               cast is used to prevent byte alignment warnings from the\r
+                                               compiler. */\r
+                                               pxNewBlockLink = ( void * ) ( ( ( uint8_t * ) pxBlock ) + xWantedSize );\r
+                                               configASSERT( ( ( ( size_t ) pxNewBlockLink ) & portBYTE_ALIGNMENT_MASK ) == 0 );\r
+\r
+                                               /* Calculate the sizes of two blocks split from the\r
+                                               single block. */\r
+                                               pxNewBlockLink->xBlockSize = pxBlock->xBlockSize - xWantedSize;\r
+                                               pxBlock->xBlockSize = xWantedSize;\r
+\r
+                                               /* Insert the new block into the list of free blocks. */\r
+                                               prvInsertBlockIntoFreeList( pxNewBlockLink );\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
+\r
+                                       xFreeBytesRemaining -= pxBlock->xBlockSize;\r
+\r
+                                       if( xFreeBytesRemaining < xMinimumEverFreeBytesRemaining )\r
+                                       {\r
+                                               xMinimumEverFreeBytesRemaining = xFreeBytesRemaining;\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
+\r
+                                       /* The block is being returned - it is allocated and owned\r
+                                       by the application and has no "next" block. */\r
+                                       pxBlock->xBlockSize |= xBlockAllocatedBit;\r
+                                       pxBlock->pxNextFreeBlock = NULL;\r
+                                       xNumberOfSuccessfulAllocations++;\r
+                               }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
+                       }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
                        }\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
+\r
+               traceMALLOC( pvReturn, xWantedSize );\r
        }\r
-       xTaskResumeAll();\r
+       ( void ) xTaskResumeAll();\r
 \r
        #if( configUSE_MALLOC_FAILED_HOOK == 1 )\r
        {\r
@@ -228,34 +251,63 @@ void *pvReturn = NULL;
                        extern void vApplicationMallocFailedHook( void );\r
                        vApplicationMallocFailedHook();\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
        }\r
        #endif\r
 \r
+       configASSERT( ( ( ( size_t ) pvReturn ) & ( size_t ) portBYTE_ALIGNMENT_MASK ) == 0 );\r
        return pvReturn;\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 void vPortFree( void *pv )\r
 {\r
-unsigned char *puc = ( unsigned char * ) pv;\r
-xBlockLink *pxLink;\r
+uint8_t *puc = ( uint8_t * ) pv;\r
+BlockLink_t *pxLink;\r
 \r
        if( pv != NULL )\r
        {\r
-               /* The memory being freed will have an xBlockLink structure immediately\r
+               /* The memory being freed will have an BlockLink_t structure immediately\r
                before it. */\r
-               puc -= heapSTRUCT_SIZE;\r
+               puc -= xHeapStructSize;\r
 \r
                /* This casting is to keep the compiler from issuing warnings. */\r
                pxLink = ( void * ) puc;\r
 \r
-               vTaskSuspendAll();\r
+               /* Check the block is actually allocated. */\r
+               configASSERT( ( pxLink->xBlockSize & xBlockAllocatedBit ) != 0 );\r
+               configASSERT( pxLink->pxNextFreeBlock == NULL );\r
+\r
+               if( ( pxLink->xBlockSize & xBlockAllocatedBit ) != 0 )\r
+               {\r
+                       if( pxLink->pxNextFreeBlock == NULL )\r
+                       {\r
+                               /* The block is being returned to the heap - it is no longer\r
+                               allocated. */\r
+                               pxLink->xBlockSize &= ~xBlockAllocatedBit;\r
+\r
+                               vTaskSuspendAll();\r
+                               {\r
+                                       /* Add this block to the list of free blocks. */\r
+                                       xFreeBytesRemaining += pxLink->xBlockSize;\r
+                                       traceFREE( pv, pxLink->xBlockSize );\r
+                                       prvInsertBlockIntoFreeList( ( ( BlockLink_t * ) pxLink ) );\r
+                                       xNumberOfSuccessfulFrees++;\r
+                               }\r
+                               ( void ) xTaskResumeAll();\r
+                       }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
+               }\r
+               else\r
                {\r
-                       /* Add this block to the list of free blocks. */\r
-                       xFreeBytesRemaining += pxLink->xBlockSize;\r
-                       prvInsertBlockIntoFreeList( ( ( xBlockLink * ) pxLink ) );                      \r
+                       mtCOVERAGE_TEST_MARKER();\r
                }\r
-               xTaskResumeAll();\r
        }\r
 }\r
 /*-----------------------------------------------------------*/\r
@@ -266,6 +318,12 @@ size_t xPortGetFreeHeapSize( void )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
+size_t xPortGetMinimumEverFreeHeapSize( void )\r
+{\r
+       return xMinimumEverFreeBytesRemaining;\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
 void vPortInitialiseBlocks( void )\r
 {\r
        /* This just exists to keep the linker quiet. */\r
@@ -274,41 +332,56 @@ void vPortInitialiseBlocks( void )
 \r
 static void prvHeapInit( void )\r
 {\r
-xBlockLink *pxFirstFreeBlock;\r
-unsigned char *pucHeapEnd;\r
+BlockLink_t *pxFirstFreeBlock;\r
+uint8_t *pucAlignedHeap;\r
+size_t uxAddress;\r
+size_t xTotalHeapSize = configTOTAL_HEAP_SIZE;\r
 \r
-       /* Ensure the start of the heap is aligned. */\r
-       configASSERT( ( ( ( unsigned long ) xHeap.ucHeap ) & ( ( unsigned long ) portBYTE_ALIGNMENT_MASK ) ) == 0UL );\r
+       /* Ensure the heap starts on a correctly aligned boundary. */\r
+       uxAddress = ( size_t ) ucHeap;\r
+\r
+       if( ( uxAddress & portBYTE_ALIGNMENT_MASK ) != 0 )\r
+       {\r
+               uxAddress += ( portBYTE_ALIGNMENT - 1 );\r
+               uxAddress &= ~( ( size_t ) portBYTE_ALIGNMENT_MASK );\r
+               xTotalHeapSize -= uxAddress - ( size_t ) ucHeap;\r
+       }\r
+\r
+       pucAlignedHeap = ( uint8_t * ) uxAddress;\r
 \r
        /* xStart is used to hold a pointer to the first item in the list of free\r
        blocks.  The void cast is used to prevent compiler warnings. */\r
-       xStart.pxNextFreeBlock = ( void * ) xHeap.ucHeap;\r
+       xStart.pxNextFreeBlock = ( void * ) pucAlignedHeap;\r
        xStart.xBlockSize = ( size_t ) 0;\r
 \r
        /* pxEnd is used to mark the end of the list of free blocks and is inserted\r
        at the end of the heap space. */\r
-       pucHeapEnd = xHeap.ucHeap + xTotalHeapSize;\r
-       pucHeapEnd -= heapSTRUCT_SIZE;\r
-       pxEnd = ( void * ) pucHeapEnd;\r
-       configASSERT( ( ( ( unsigned long ) pxEnd ) & ( ( unsigned long ) portBYTE_ALIGNMENT_MASK ) ) == 0UL );\r
+       uxAddress = ( ( size_t ) pucAlignedHeap ) + xTotalHeapSize;\r
+       uxAddress -= xHeapStructSize;\r
+       uxAddress &= ~( ( size_t ) portBYTE_ALIGNMENT_MASK );\r
+       pxEnd = ( void * ) uxAddress;\r
        pxEnd->xBlockSize = 0;\r
        pxEnd->pxNextFreeBlock = NULL;\r
 \r
        /* To start with there is a single free block that is sized to take up the\r
        entire heap space, minus the space taken by pxEnd. */\r
-       pxFirstFreeBlock = ( void * ) xHeap.ucHeap;\r
-       pxFirstFreeBlock->xBlockSize = xTotalHeapSize - heapSTRUCT_SIZE;\r
+       pxFirstFreeBlock = ( void * ) pucAlignedHeap;\r
+       pxFirstFreeBlock->xBlockSize = uxAddress - ( size_t ) pxFirstFreeBlock;\r
        pxFirstFreeBlock->pxNextFreeBlock = pxEnd;\r
 \r
-       /* The heap now contains pxEnd. */\r
-       xFreeBytesRemaining -= heapSTRUCT_SIZE;\r
+       /* Only one block exists - and it covers the entire usable heap space. */\r
+       xMinimumEverFreeBytesRemaining = pxFirstFreeBlock->xBlockSize;\r
+       xFreeBytesRemaining = pxFirstFreeBlock->xBlockSize;\r
+\r
+       /* Work out the position of the top bit in a size_t variable. */\r
+       xBlockAllocatedBit = ( ( size_t ) 1 ) << ( ( sizeof( size_t ) * heapBITS_PER_BYTE ) - 1 );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvInsertBlockIntoFreeList( xBlockLink *pxBlockToInsert )\r
+static void prvInsertBlockIntoFreeList( BlockLink_t *pxBlockToInsert )\r
 {\r
-xBlockLink *pxIterator;\r
-unsigned char *puc;\r
+BlockLink_t *pxIterator;\r
+uint8_t *puc;\r
 \r
        /* Iterate through the list until a block is found that has a higher address\r
        than the block being inserted. */\r
@@ -318,18 +391,22 @@ unsigned char *puc;
        }\r
 \r
        /* Do the block being inserted, and the block it is being inserted after\r
-       make a contiguous block of memory? */   \r
-       puc = ( unsigned char * ) pxIterator;\r
-       if( ( puc + pxIterator->xBlockSize ) == ( unsigned char * ) pxBlockToInsert )\r
+       make a contiguous block of memory? */\r
+       puc = ( uint8_t * ) pxIterator;\r
+       if( ( puc + pxIterator->xBlockSize ) == ( uint8_t * ) pxBlockToInsert )\r
        {\r
                pxIterator->xBlockSize += pxBlockToInsert->xBlockSize;\r
                pxBlockToInsert = pxIterator;\r
        }\r
+       else\r
+       {\r
+               mtCOVERAGE_TEST_MARKER();\r
+       }\r
 \r
        /* Do the block being inserted, and the block it is being inserted before\r
        make a contiguous block of memory? */\r
-       puc = ( unsigned char * ) pxBlockToInsert;\r
-       if( ( puc + pxBlockToInsert->xBlockSize ) == ( unsigned char * ) pxIterator->pxNextFreeBlock )\r
+       puc = ( uint8_t * ) pxBlockToInsert;\r
+       if( ( puc + pxBlockToInsert->xBlockSize ) == ( uint8_t * ) pxIterator->pxNextFreeBlock )\r
        {\r
                if( pxIterator->pxNextFreeBlock != pxEnd )\r
                {\r
@@ -344,7 +421,7 @@ unsigned char *puc;
        }\r
        else\r
        {\r
-               pxBlockToInsert->pxNextFreeBlock = pxIterator->pxNextFreeBlock;         \r
+               pxBlockToInsert->pxNextFreeBlock = pxIterator->pxNextFreeBlock;\r
        }\r
 \r
        /* If the block being inserted plugged a gab, so was merged with the block\r
@@ -355,5 +432,61 @@ unsigned char *puc;
        {\r
                pxIterator->pxNextFreeBlock = pxBlockToInsert;\r
        }\r
+       else\r
+       {\r
+               mtCOVERAGE_TEST_MARKER();\r
+       }\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+void vPortGetHeapStats( HeapStats_t *pxHeapStats )\r
+{\r
+BlockLink_t *pxBlock;\r
+size_t xBlocks = 0, xMaxSize = 0, xMinSize = portMAX_DELAY; /* portMAX_DELAY used as a portable way of getting the maximum value. */\r
+\r
+       vTaskSuspendAll();\r
+       {\r
+               pxBlock = xStart.pxNextFreeBlock;\r
+\r
+               /* pxBlock will be NULL if the heap has not been initialised.  The heap\r
+               is initialised automatically when the first allocation is made. */\r
+               if( pxBlock != NULL )\r
+               {\r
+                       do\r
+                       {\r
+                               /* Increment the number of blocks and record the largest block seen\r
+                               so far. */\r
+                               xBlocks++;\r
+\r
+                               if( pxBlock->xBlockSize > xMaxSize )\r
+                               {\r
+                                       xMaxSize = pxBlock->xBlockSize;\r
+                               }\r
+\r
+                               if( pxBlock->xBlockSize < xMinSize )\r
+                               {\r
+                                       xMinSize = pxBlock->xBlockSize;\r
+                               }\r
+\r
+                               /* Move to the next block in the chain until the last block is\r
+                               reached. */\r
+                               pxBlock = pxBlock->pxNextFreeBlock;\r
+                       } while( pxBlock != pxEnd );\r
+               }\r
+       }\r
+       xTaskResumeAll();\r
+\r
+       pxHeapStats->xSizeOfLargestFreeBlockInBytes = xMaxSize;\r
+       pxHeapStats->xSizeOfSmallestFreeBlockInBytes = xMinSize;\r
+       pxHeapStats->xNumberOfFreeBlocks = xBlocks;\r
+\r
+       taskENTER_CRITICAL();\r
+       {\r
+               pxHeapStats->xAvailableHeapSpaceInBytes = xFreeBytesRemaining;\r
+               pxHeapStats->xNumberOfSuccessfulAllocations = xNumberOfSuccessfulAllocations;\r
+               pxHeapStats->xNumberOfSuccessfulFrees = xNumberOfSuccessfulFrees;\r
+               pxHeapStats->xMinimumEverFreeBytesRemaining = xMinimumEverFreeBytesRemaining;\r
+       }\r
+       taskEXIT_CRITICAL();\r
 }\r
 \r