]> git.sur5r.net Git - freertos/commitdiff
Add coverage test markers.
authorrtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Mon, 23 Dec 2013 18:11:15 +0000 (18:11 +0000)
committerrtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Mon, 23 Dec 2013 18:11:15 +0000 (18:11 +0000)
git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2138 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

FreeRTOS/Source/event_groups.c
FreeRTOS/Source/include/FreeRTOS.h
FreeRTOS/Source/list.c
FreeRTOS/Source/portable/MemMang/heap_4.c
FreeRTOS/Source/queue.c
FreeRTOS/Source/tasks.c
FreeRTOS/Source/timers.c

index 756f2f64e33c87b024cc6b6cb4ceefcfcf409157..981d420b2532c8ece1fd289355542af691ecf1ad 100644 (file)
@@ -219,7 +219,7 @@ portBASE_TYPE xAlreadyYielded;
                }\r
                else\r
                {\r
-                       mtBRANCH_TEST_INSTRUCTION();\r
+                       mtCOVERAGE_TEST_MARKER();\r
                }\r
 \r
                /* The task blocked to wait for its required bits to be set - at this\r
@@ -245,7 +245,7 @@ portBASE_TYPE xAlreadyYielded;
                                }\r
                                else\r
                                {\r
-                                       mtBRANCH_TEST_INSTRUCTION();\r
+                                       mtCOVERAGE_TEST_MARKER();\r
                                }\r
                        }\r
                        taskEXIT_CRITICAL();\r
@@ -302,7 +302,7 @@ portBASE_TYPE xWaitConditionMet, xAlreadyYielded;
                        }\r
                        else\r
                        {\r
-                               mtBRANCH_TEST_INSTRUCTION();\r
+                               mtCOVERAGE_TEST_MARKER();\r
                        }\r
                }\r
                else if( xTicksToWait == ( portTickType ) 0 )\r
@@ -323,7 +323,7 @@ portBASE_TYPE xWaitConditionMet, xAlreadyYielded;
                        }\r
                        else\r
                        {\r
-                               mtBRANCH_TEST_INSTRUCTION();\r
+                               mtCOVERAGE_TEST_MARKER();\r
                        }\r
 \r
                        if( xWaitForAllBits != pdFALSE )\r
@@ -332,7 +332,7 @@ portBASE_TYPE xWaitConditionMet, xAlreadyYielded;
                        }\r
                        else\r
                        {\r
-                               mtBRANCH_TEST_INSTRUCTION();\r
+                               mtCOVERAGE_TEST_MARKER();\r
                        }\r
 \r
                        /* Store the bits that the calling task is waiting for in the\r
@@ -356,7 +356,7 @@ portBASE_TYPE xWaitConditionMet, xAlreadyYielded;
                }\r
                else\r
                {\r
-                       mtBRANCH_TEST_INSTRUCTION();\r
+                       mtCOVERAGE_TEST_MARKER();\r
                }\r
 \r
                /* The task blocked to wait for its required bits to be set - at this\r
@@ -382,12 +382,12 @@ portBASE_TYPE xWaitConditionMet, xAlreadyYielded;
                                        }\r
                                        else\r
                                        {\r
-                                               mtBRANCH_TEST_INSTRUCTION();\r
+                                               mtCOVERAGE_TEST_MARKER();\r
                                        }\r
                                }\r
                                else\r
                                {\r
-                                       mtBRANCH_TEST_INSTRUCTION();\r
+                                       mtCOVERAGE_TEST_MARKER();\r
                                }\r
                        }\r
                        taskEXIT_CRITICAL();\r
@@ -475,7 +475,7 @@ portBASE_TYPE xMatchFound = pdFALSE;
                                }\r
                                else\r
                                {\r
-                                       mtBRANCH_TEST_INSTRUCTION();\r
+                                       mtCOVERAGE_TEST_MARKER();\r
                                }\r
                        }\r
                        else if( ( uxBitsWaitedFor & pxEventBits->uxEventBits ) == uxBitsWaitedFor )\r
@@ -497,7 +497,7 @@ portBASE_TYPE xMatchFound = pdFALSE;
                                }\r
                                else\r
                                {\r
-                                       mtBRANCH_TEST_INSTRUCTION();\r
+                                       mtCOVERAGE_TEST_MARKER();\r
                                }\r
 \r
                                /* Store the actual event flag value in the task's event list\r
@@ -569,7 +569,7 @@ portBASE_TYPE xWaitConditionMet = pdFALSE;
                }\r
                else\r
                {\r
-                       mtBRANCH_TEST_INSTRUCTION();\r
+                       mtCOVERAGE_TEST_MARKER();\r
                }\r
        }\r
        else\r
@@ -582,7 +582,7 @@ portBASE_TYPE xWaitConditionMet = pdFALSE;
                }\r
                else\r
                {\r
-                       mtBRANCH_TEST_INSTRUCTION();\r
+                       mtCOVERAGE_TEST_MARKER();\r
                }\r
        }\r
 \r
index c53f337b1b8004fb1084bbfae65cf34d905294c2..9e557e0fea9a2fecd7bc13db8199a6f451e26d20 100644 (file)
@@ -689,8 +689,8 @@ typedef portTickType xEventBitsType;
        #define configUSE_TRACE_FACILITY 0\r
 #endif\r
 \r
-#ifndef configBRANCH_TEST_INSTRUCTION\r
-       #define configBRANCH_TEST_INSTRUCTION()\r
+#ifndef mtCOVERAGE_TEST_MARKER\r
+       #define mtCOVERAGE_TEST_MARKER()\r
 #endif\r
 \r
 /* For backward compatability. */\r
index a3e6755d991f96e50e7c8273888ab0684899778a..3c11a88f78bb0c5eb54565a75dcbb435dbeff0d7 100644 (file)
@@ -189,6 +189,10 @@ xList * const pxList = ( xList * ) pxItemToRemove->pvContainer;
        {\r
                pxList->pxIndex = pxItemToRemove->pxPrevious;\r
        }\r
+       else\r
+       {\r
+               mtCOVERAGE_TEST_MARKER();\r
+       }\r
 \r
        pxItemToRemove->pvContainer = NULL;\r
        ( pxList->uxNumberOfItems )--;\r
index 4ed42b8de2d2872ef180b7eff77cd823a808a956..7a2f98ed9dd3af84ccecc193d312e2d6f680d8ef 100644 (file)
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\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
@@ -106,7 +106,7 @@ typedef struct A_BLOCK_LINK
 /*-----------------------------------------------------------*/\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
@@ -136,8 +136,8 @@ fragmentation. */
 static size_t xFreeBytesRemaining = ( ( size_t ) heapADJUSTED_HEAP_SIZE ) & ( ( size_t ) ~portBYTE_ALIGNMENT_MASK );\r
 static size_t xMinimumEverFreeBytesRemaining = ( ( size_t ) heapADJUSTED_HEAP_SIZE ) & ( ( size_t ) ~portBYTE_ALIGNMENT_MASK );\r
 \r
-/* Gets set to the top bit of an size_t type.  When this bit in the xBlockSize \r
-member of an xBlockLink structure is set then the block belongs to the \r
+/* Gets set to the top bit of an size_t type.  When this bit in the xBlockSize\r
+member of an xBlockLink 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
@@ -157,9 +157,13 @@ void *pvReturn = NULL;
                {\r
                        prvHeapInit();\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
 \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 xBlockLink structure \r
+               set.  The top bit of the block size member of the xBlockLink 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
@@ -170,18 +174,26 @@ void *pvReturn = NULL;
                        {\r
                                xWantedSize += heapSTRUCT_SIZE;\r
 \r
-                               /* Ensure that blocks are always aligned to the required number \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
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
+                       }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
                        }\r
 \r
                        if( ( xWantedSize > 0 ) && ( xWantedSize <= xFreeBytesRemaining ) )\r
                        {\r
-                               /* Traverse the list from the start     (lowest address) block until \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
@@ -191,29 +203,29 @@ void *pvReturn = NULL;
                                        pxBlock = pxBlock->pxNextFreeBlock;\r
                                }\r
 \r
-                               /* If the end marker was reached then a block of adequate size \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
+                                       /* Return the memory space pointed to - jumping over the\r
                                        xBlockLink structure 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 \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
+                                       /* 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
+                                               /* 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 * ) ( ( ( unsigned char * ) pxBlock ) + xWantedSize );\r
 \r
-                                               /* Calculate the sizes of two blocks split from the \r
+                                               /* Calculate the sizes of two blocks split from the\r
                                                single block. */\r
                                                pxNewBlockLink->xBlockSize = pxBlock->xBlockSize - xWantedSize;\r
                                                pxBlock->xBlockSize = xWantedSize;\r
@@ -221,6 +233,10 @@ void *pvReturn = NULL;
                                                /* 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
@@ -228,13 +244,29 @@ void *pvReturn = NULL;
                                        {\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
                                }\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
@@ -248,6 +280,10 @@ void *pvReturn = NULL;
                        extern void vApplicationMallocFailedHook( void );\r
                        vApplicationMallocFailedHook();\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
        }\r
        #endif\r
 \r
@@ -272,7 +308,7 @@ xBlockLink *pxLink;
                /* Check the block is actually allocated. */\r
                configASSERT( ( pxLink->xBlockSize & xBlockAllocatedBit ) != 0 );\r
                configASSERT( pxLink->pxNextFreeBlock == NULL );\r
-               \r
+\r
                if( ( pxLink->xBlockSize & xBlockAllocatedBit ) != 0 )\r
                {\r
                        if( pxLink->pxNextFreeBlock == NULL )\r
@@ -290,6 +326,14 @@ xBlockLink *pxLink;
                                }\r
                                xTaskResumeAll();\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
+               }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
                }\r
        }\r
 }\r
@@ -362,13 +406,17 @@ 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
+       make a contiguous block of memory? */\r
        puc = ( unsigned char * ) pxIterator;\r
        if( ( puc + pxIterator->xBlockSize ) == ( unsigned char * ) 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
@@ -388,7 +436,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
@@ -399,5 +447,9 @@ unsigned char *puc;
        {\r
                pxIterator->pxNextFreeBlock = pxBlockToInsert;\r
        }\r
+       else\r
+       {\r
+               mtCOVERAGE_TEST_MARKER();\r
+       }\r
 }\r
 \r
index 83a5b919be3b70c1a67104086488486edf8729bb..d33db5458c267f68337a8c4b0060e0c9ea5ee914 100644 (file)
@@ -271,6 +271,14 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                {\r
                                        queueYIELD_IF_USING_PREEMPTION();\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
+                       }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
                        }\r
                }\r
                else\r
@@ -338,6 +346,14 @@ xQueueHandle xReturn = NULL;
                                vPortFree( pxNewQueue );\r
                        }\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
+       }\r
+       else\r
+       {\r
+               mtCOVERAGE_TEST_MARKER();\r
        }\r
 \r
        configASSERT( xReturn );\r
@@ -474,6 +490,10 @@ xQueueHandle xReturn = NULL;
                                task that might be waiting to access the mutex. */\r
                                ( void ) xQueueGenericSend( pxMutex, NULL, queueMUTEX_GIVE_BLOCK_TIME, queueSEND_TO_BACK );\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
 \r
                        xReturn = pdPASS;\r
                }\r
@@ -604,6 +624,10 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                        unblock. A context switch is required. */\r
                                                        queueYIELD_IF_USING_PREEMPTION();\r
                                                }\r
+                                               else\r
+                                               {\r
+                                                       mtCOVERAGE_TEST_MARKER();\r
+                                               }\r
                                        }\r
                                        else\r
                                        {\r
@@ -619,6 +643,14 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                                kernel takes care of that. */\r
                                                                queueYIELD_IF_USING_PREEMPTION();\r
                                                        }\r
+                                                       else\r
+                                                       {\r
+                                                               mtCOVERAGE_TEST_MARKER();\r
+                                                       }\r
+                                               }\r
+                                               else\r
+                                               {\r
+                                                       mtCOVERAGE_TEST_MARKER();\r
                                                }\r
                                        }\r
                                }\r
@@ -636,6 +668,14 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                        takes care of that. */\r
                                                        queueYIELD_IF_USING_PREEMPTION();\r
                                                }\r
+                                               else\r
+                                               {\r
+                                                       mtCOVERAGE_TEST_MARKER();\r
+                                               }\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
                                        }\r
                                }\r
                                #endif /* configUSE_QUEUE_SETS */\r
@@ -669,6 +709,7 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                else\r
                                {\r
                                        /* Entry time was already set. */\r
+                                       mtCOVERAGE_TEST_MARKER();\r
                                }\r
                        }\r
                }\r
@@ -759,6 +800,14 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                        our own so yield immediately. */\r
                                                        portYIELD_WITHIN_API();\r
                                                }\r
+                                               else\r
+                                               {\r
+                                                       mtCOVERAGE_TEST_MARKER();\r
+                                               }\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
                                        }\r
 \r
                                        taskEXIT_CRITICAL();\r
@@ -790,6 +839,10 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                vTaskPlaceOnEventList( &( pxQueue->xTasksWaitingToSend ), xTicksToWait );\r
                                                portYIELD_WITHIN_API();\r
                                        }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
                                }\r
                                else\r
                                {\r
@@ -843,6 +896,10 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                                priority inheritance should it become necessary. */\r
                                                                pxQueue->pxMutexHolder = ( signed char * ) xTaskGetCurrentTaskHandle();\r
                                                        }\r
+                                                       else\r
+                                                       {\r
+                                                               mtCOVERAGE_TEST_MARKER();\r
+                                                       }\r
                                                }\r
                                                #endif\r
 \r
@@ -852,6 +909,10 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                        {\r
                                                                portYIELD_WITHIN_API();\r
                                                        }\r
+                                                       else\r
+                                                       {\r
+                                                               mtCOVERAGE_TEST_MARKER();\r
+                                                       }\r
                                                }\r
                                        }\r
                                        else\r
@@ -873,8 +934,15 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                                /* The task waiting has a higher priority than this task. */\r
                                                                portYIELD_WITHIN_API();\r
                                                        }\r
+                                                       else\r
+                                                       {\r
+                                                               mtCOVERAGE_TEST_MARKER();\r
+                                                       }\r
+                                               }\r
+                                               else\r
+                                               {\r
+                                                       mtCOVERAGE_TEST_MARKER();\r
                                                }\r
-\r
                                        }\r
 \r
                                        taskEXIT_CRITICAL();\r
@@ -915,12 +983,20 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                                }\r
                                                                taskEXIT_CRITICAL();\r
                                                        }\r
+                                                       else\r
+                                                       {\r
+                                                               mtCOVERAGE_TEST_MARKER();\r
+                                                       }\r
                                                }\r
                                                #endif\r
 \r
                                                vTaskPlaceOnEventList( &( pxQueue->xTasksWaitingToReceive ), xTicksToWait );\r
                                                portYIELD_WITHIN_API();\r
                                        }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
                                }\r
                                else\r
                                {\r
@@ -993,6 +1069,14 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                        {\r
                                                                *pxHigherPriorityTaskWoken = pdTRUE;\r
                                                        }\r
+                                                       else\r
+                                                       {\r
+                                                               mtCOVERAGE_TEST_MARKER();\r
+                                                       }\r
+                                               }\r
+                                               else\r
+                                               {\r
+                                                       mtCOVERAGE_TEST_MARKER();\r
                                                }\r
                                        }\r
                                        else\r
@@ -1007,8 +1091,20 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                                {\r
                                                                        *pxHigherPriorityTaskWoken = pdTRUE;\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
                                }\r
                                #else /* configUSE_QUEUE_SETS */\r
@@ -1023,8 +1119,20 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                        {\r
                                                                *pxHigherPriorityTaskWoken = pdTRUE;\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
                                #endif /* configUSE_QUEUE_SETS */\r
                        }\r
@@ -1063,7 +1171,7 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                configASSERT( !( ( xTaskGetSchedulerState() == taskSCHEDULER_SUSPENDED ) && ( xTicksToWait != 0 ) ) );\r
        }\r
        #endif\r
-       \r
+\r
        /* This function relaxes the coding standard somewhat to allow return\r
        statements within the function itself.  This is done in the interest\r
        of execution time efficiency. */\r
@@ -1097,6 +1205,10 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                        priority inheritance should it become necessary. */\r
                                                        pxQueue->pxMutexHolder = ( signed char * ) xTaskGetCurrentTaskHandle(); /*lint !e961 Cast is not redundant as xTaskHandle is a typedef. */\r
                                                }\r
+                                               else\r
+                                               {\r
+                                                       mtCOVERAGE_TEST_MARKER();\r
+                                               }\r
                                        }\r
                                        #endif\r
 \r
@@ -1106,6 +1218,14 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                {\r
                                                        queueYIELD_IF_USING_PREEMPTION();\r
                                                }\r
+                                               else\r
+                                               {\r
+                                                       mtCOVERAGE_TEST_MARKER();\r
+                                               }\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
                                        }\r
                                }\r
                                else\r
@@ -1127,6 +1247,14 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                        /* The task waiting has a higher priority than this task. */\r
                                                        queueYIELD_IF_USING_PREEMPTION();\r
                                                }\r
+                                               else\r
+                                               {\r
+                                                       mtCOVERAGE_TEST_MARKER();\r
+                                               }\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
                                        }\r
                                }\r
 \r
@@ -1153,6 +1281,7 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                else\r
                                {\r
                                        /* Entry time was already set. */\r
+                                       mtCOVERAGE_TEST_MARKER();\r
                                }\r
                        }\r
                }\r
@@ -1181,6 +1310,10 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                }\r
                                                taskEXIT_CRITICAL();\r
                                        }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
                                }\r
                                #endif\r
 \r
@@ -1190,6 +1323,10 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                {\r
                                        portYIELD_WITHIN_API();\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
                        }\r
                        else\r
                        {\r
@@ -1260,8 +1397,20 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                {\r
                                                        *pxHigherPriorityTaskWoken = pdTRUE;\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
                        else\r
                        {\r
@@ -1344,7 +1493,9 @@ unsigned portBASE_TYPE uxReturn;
        configASSERT( xQueue );\r
 \r
        taskENTER_CRITICAL();\r
+       {\r
                uxReturn = ( ( xQUEUE * ) xQueue )->uxMessagesWaiting;\r
+       }\r
        taskEXIT_CRITICAL();\r
 \r
        return uxReturn;\r
@@ -1360,7 +1511,9 @@ xQUEUE *pxQueue;
        configASSERT( pxQueue );\r
 \r
        taskENTER_CRITICAL();\r
+       {\r
                uxReturn = pxQueue->uxLength - pxQueue->uxMessagesWaiting;\r
+       }\r
        taskEXIT_CRITICAL();\r
 \r
        return uxReturn;\r
@@ -1438,6 +1591,10 @@ static void prvCopyDataToQueue( xQUEUE *pxQueue, const void *pvItemToQueue, port
                                vTaskPriorityDisinherit( ( void * ) pxQueue->pxMutexHolder );\r
                                pxQueue->pxMutexHolder = NULL;\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                }\r
                #endif /* configUSE_MUTEXES */\r
        }\r
@@ -1449,6 +1606,10 @@ static void prvCopyDataToQueue( xQUEUE *pxQueue, const void *pvItemToQueue, port
                {\r
                        pxQueue->pcWriteTo = pxQueue->pcHead;\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
        }\r
        else\r
        {\r
@@ -1458,6 +1619,10 @@ static void prvCopyDataToQueue( xQUEUE *pxQueue, const void *pvItemToQueue, port
                {\r
                        pxQueue->u.pcReadFrom = ( pxQueue->pcTail - pxQueue->uxItemSize );\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
 \r
                if( xPosition == queueOVERWRITE )\r
                {\r
@@ -1469,6 +1634,14 @@ static void prvCopyDataToQueue( xQUEUE *pxQueue, const void *pvItemToQueue, port
                                correct. */\r
                                --( pxQueue->uxMessagesWaiting );\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
+               }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
                }\r
        }\r
 \r
@@ -1485,8 +1658,16 @@ static void prvCopyDataFromQueue( xQUEUE * const pxQueue, void * const pvBuffer
                {\r
                        pxQueue->u.pcReadFrom = pxQueue->pcHead;\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
                ( void ) memcpy( ( void * ) pvBuffer, ( void * ) pxQueue->u.pcReadFrom, ( size_t ) pxQueue->uxItemSize ); /*lint !e961 !e418 MISRA exception as the casts are only redundant for some ports.  Also previous logic ensures a null pointer can only be passed to memcpy() when the count is 0. */\r
        }\r
+       else\r
+       {\r
+               mtCOVERAGE_TEST_MARKER();\r
+       }\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -1516,6 +1697,10 @@ static void prvUnlockQueue( xQUEUE *pxQueue )
                                                A context switch is required. */\r
                                                vTaskMissedYield();\r
                                        }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
                                }\r
                                else\r
                                {\r
@@ -1529,6 +1714,10 @@ static void prvUnlockQueue( xQUEUE *pxQueue )
                                                        context switch is required. */\r
                                                        vTaskMissedYield();\r
                                                }\r
+                                               else\r
+                                               {\r
+                                                       mtCOVERAGE_TEST_MARKER();\r
+                                               }\r
                                        }\r
                                        else\r
                                        {\r
@@ -1548,6 +1737,10 @@ static void prvUnlockQueue( xQUEUE *pxQueue )
                                                context switch is required. */\r
                                                vTaskMissedYield();\r
                                        }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
                                }\r
                                else\r
                                {\r
@@ -1574,6 +1767,10 @@ static void prvUnlockQueue( xQUEUE *pxQueue )
                                {\r
                                        vTaskMissedYield();\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
 \r
                                --( pxQueue->xRxLock );\r
                        }\r
@@ -1721,6 +1918,14 @@ signed portBASE_TYPE xReturn;
                                                that a yield might be appropriate. */\r
                                                xReturn = errQUEUE_YIELD;\r
                                        }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
+                               }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
                                }\r
                        }\r
                        else\r
@@ -1766,6 +1971,10 @@ signed portBASE_TYPE xReturn;
                                        return errQUEUE_FULL;\r
                                }\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                }\r
                portENABLE_INTERRUPTS();\r
 \r
@@ -1779,6 +1988,10 @@ signed portBASE_TYPE xReturn;
                                {\r
                                        pxQueue->u.pcReadFrom = pxQueue->pcHead;\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
                                --( pxQueue->uxMessagesWaiting );\r
                                ( void ) memcpy( ( void * ) pvBuffer, ( void * ) pxQueue->u.pcReadFrom, ( unsigned ) pxQueue->uxItemSize );\r
 \r
@@ -1795,6 +2008,14 @@ signed portBASE_TYPE xReturn;
                                        {\r
                                                xReturn = errQUEUE_YIELD;\r
                                        }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
+                               }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
                                }\r
                        }\r
                        else\r
@@ -1832,8 +2053,24 @@ signed portBASE_TYPE xReturn;
                                        {\r
                                                return pdTRUE;\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
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
                }\r
 \r
                return xCoRoutinePreviouslyWoken;\r
@@ -1859,6 +2096,10 @@ signed portBASE_TYPE xReturn;
                        {\r
                                pxQueue->u.pcReadFrom = pxQueue->pcHead;\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                        --( pxQueue->uxMessagesWaiting );\r
                        ( void ) memcpy( ( void * ) pvBuffer, ( void * ) pxQueue->u.pcReadFrom, ( unsigned ) pxQueue->uxItemSize );\r
 \r
@@ -1870,7 +2111,19 @@ signed portBASE_TYPE xReturn;
                                        {\r
                                                *pxCoRoutineWoken = pdTRUE;\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
                        xReturn = pdPASS;\r
@@ -1903,6 +2156,10 @@ signed portBASE_TYPE xReturn;
                                xQueueRegistry[ ux ].xHandle = xQueue;\r
                                break;\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                }\r
        }\r
 \r
@@ -1925,6 +2182,10 @@ signed portBASE_TYPE xReturn;
                                xQueueRegistry[ ux ].pcQueueName = NULL;\r
                                break;\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                }\r
 \r
        } /*lint !e818 xQueue could not be pointer to const because it is a typedef. */\r
@@ -1958,6 +2219,10 @@ signed portBASE_TYPE xReturn;
                        /* There is nothing in the queue, block for the specified period. */\r
                        vTaskPlaceOnEventListRestricted( &( pxQueue->xTasksWaitingToReceive ), xTicksToWait );\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
                prvUnlockQueue( pxQueue );\r
        }\r
 \r
@@ -2095,7 +2360,19 @@ signed portBASE_TYPE xReturn;
                                        /* The task waiting has a higher priority */\r
                                        xReturn = pdTRUE;\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
                return xReturn;\r
index 1acd887454294032b4d3d6fc9c11b509dff273a2..c966a78c4189ad1722c799890605a79353bff2f3 100644 (file)
@@ -572,6 +572,10 @@ tskTCB * pxNewTCB;
                        required.*/\r
                        *pxCreatedTask = ( xTaskHandle ) pxNewTCB;\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
 \r
                /* Ensure interrupts don't access the task lists while they are being\r
                updated. */\r
@@ -591,6 +595,10 @@ tskTCB * pxNewTCB;
                                        fails, but we will report the failure. */\r
                                        prvInitialiseTaskLists();\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
                        }\r
                        else\r
                        {\r
@@ -603,6 +611,14 @@ tskTCB * pxNewTCB;
                                        {\r
                                                pxCurrentTCB = pxNewTCB;\r
                                        }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
+                               }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
                                }\r
                        }\r
 \r
@@ -639,6 +655,14 @@ tskTCB * pxNewTCB;
                        {\r
                                taskYIELD_IF_USING_PREEMPTION();\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
+               }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
                }\r
        }\r
 \r
@@ -666,12 +690,20 @@ tskTCB * pxNewTCB;
                        {\r
                                taskRESET_READY_PRIORITY( pxTCB->uxPriority );\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
 \r
                        /* Is the task waiting on an event also? */\r
                        if( listLIST_ITEM_CONTAINER( &( pxTCB->xEventListItem ) ) != NULL )\r
                        {\r
                                ( void ) uxListRemove( &( pxTCB->xEventListItem ) );\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
 \r
                        vListInsertEnd( &xTasksWaitingTermination, &( pxTCB->xGenericListItem ) );\r
 \r
@@ -747,6 +779,10 @@ tskTCB * pxNewTCB;
                                {\r
                                        xShouldDelay = pdTRUE;\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
                        }\r
                        else\r
                        {\r
@@ -757,6 +793,10 @@ tskTCB * pxNewTCB;
                                {\r
                                        xShouldDelay = pdTRUE;\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
                        }\r
 \r
                        /* Update the wake time ready for the next call. */\r
@@ -776,9 +816,17 @@ tskTCB * pxNewTCB;
                                        directly. */\r
                                        portRESET_READY_PRIORITY( pxCurrentTCB->uxPriority, uxTopReadyPriority );\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
 \r
                                prvAddCurrentTaskToDelayedList( xTimeToWake );\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                }\r
                xAlreadyYielded = xTaskResumeAll();\r
 \r
@@ -788,6 +836,10 @@ tskTCB * pxNewTCB;
                {\r
                        portYIELD_WITHIN_API();\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
        }\r
 \r
 #endif /* INCLUDE_vTaskDelayUntil */\r
@@ -831,10 +883,18 @@ tskTCB * pxNewTCB;
                                        directly. */\r
                                        portRESET_READY_PRIORITY( pxCurrentTCB->uxPriority, uxTopReadyPriority );\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
                                prvAddCurrentTaskToDelayedList( xTimeToWake );\r
                        }\r
                        xAlreadyYielded = xTaskResumeAll();\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
 \r
                /* Force a reschedule if xTaskResumeAll has not already done so, we may\r
                have put ourselves to sleep. */\r
@@ -842,6 +902,10 @@ tskTCB * pxNewTCB;
                {\r
                        portYIELD_WITHIN_API();\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
        }\r
 \r
 #endif /* INCLUDE_vTaskDelay */\r
@@ -954,6 +1018,10 @@ tskTCB * pxNewTCB;
                {\r
                        uxNewPriority = ( unsigned portBASE_TYPE ) configMAX_PRIORITIES - ( unsigned portBASE_TYPE ) 1U;\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
 \r
                taskENTER_CRITICAL();\r
                {\r
@@ -988,6 +1056,10 @@ tskTCB * pxNewTCB;
                                                {\r
                                                        xYieldRequired = pdTRUE;\r
                                                }\r
+                                               else\r
+                                               {\r
+                                                       mtCOVERAGE_TEST_MARKER();\r
+                                               }\r
                                        }\r
                                        else\r
                                        {\r
@@ -1023,6 +1095,10 @@ tskTCB * pxNewTCB;
                                        {\r
                                                pxTCB->uxPriority = uxNewPriority;\r
                                        }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
 \r
                                        /* The base priority gets set whatever. */\r
                                        pxTCB->uxBasePriority = uxNewPriority;\r
@@ -1039,6 +1115,10 @@ tskTCB * pxNewTCB;
                                {\r
                                        listSET_LIST_ITEM_VALUE( &( pxTCB->xEventListItem ), ( ( portTickType ) configMAX_PRIORITIES - ( portTickType ) uxNewPriority ) ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
 \r
                                /* If the task is in the blocked or suspended list we need do\r
                                nothing more than change it's priority variable. However, if\r
@@ -1056,13 +1136,25 @@ tskTCB * pxNewTCB;
                                                reset macro can be called directly. */\r
                                                portRESET_READY_PRIORITY( uxPriorityUsedOnEntry, uxTopReadyPriority );\r
                                        }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
                                        prvAddTaskToReadyList( pxTCB );\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
 \r
                                if( xYieldRequired == pdTRUE )\r
                                {\r
                                        taskYIELD_IF_USING_PREEMPTION();\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
 \r
                                /* Remove compiler warning about unused variables when the port\r
                                optimised task selection is not being used. */\r
@@ -1095,12 +1187,20 @@ tskTCB * pxNewTCB;
                        {\r
                                taskRESET_READY_PRIORITY( pxTCB->uxPriority );\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
 \r
                        /* Is the task waiting on an event also? */\r
                        if( listLIST_ITEM_CONTAINER( &( pxTCB->xEventListItem ) ) != NULL )\r
                        {\r
                                ( void ) uxListRemove( &( pxTCB->xEventListItem ) );\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
 \r
                        vListInsertEnd( &xSuspendedTaskList, &( pxTCB->xGenericListItem ) );\r
                }\r
@@ -1142,6 +1242,10 @@ tskTCB * pxNewTCB;
                                task that is now in the Suspended state. */\r
                                prvResetNextTaskUnblockTime();\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                }\r
        }\r
 \r
@@ -1173,7 +1277,19 @@ tskTCB * pxNewTCB;
                                {\r
                                        xReturn = pdTRUE;\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
                return xReturn;\r
@@ -1214,10 +1330,22 @@ tskTCB * pxNewTCB;
                                                next yield. */\r
                                                taskYIELD_IF_USING_PREEMPTION();\r
                                        }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
+                               }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
                                }\r
                        }\r
                        taskEXIT_CRITICAL();\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
        }\r
 \r
 #endif /* INCLUDE_vTaskSuspend */\r
@@ -1264,6 +1392,10 @@ tskTCB * pxNewTCB;
                                        {\r
                                                xYieldRequired = pdTRUE;\r
                                        }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
 \r
                                        ( void ) uxListRemove(  &( pxTCB->xGenericListItem ) );\r
                                        prvAddTaskToReadyList( pxTCB );\r
@@ -1276,6 +1408,10 @@ tskTCB * pxNewTCB;
                                        vListInsertEnd( &( xPendingReadyList ), &( pxTCB->xEventListItem ) );\r
                                }\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                }\r
                portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );\r
 \r
@@ -1309,6 +1445,10 @@ portBASE_TYPE xReturn;
                {\r
                        xReturn = xTimerCreateTimerTask();\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
        }\r
        #endif /* configUSE_TIMERS */\r
 \r
@@ -1445,11 +1585,15 @@ portBASE_TYPE xAlreadyYielded = pdFALSE;
                                        {\r
                                                xYieldPending = pdTRUE;\r
                                        }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
                                }\r
 \r
                                /* If any ticks occurred while the scheduler was suspended then\r
-                               they should be processed now.  This ensures the tick count does \r
-                               not     slip, and that any delayed tasks are resumed at the correct \r
+                               they should be processed now.  This ensures the tick count does\r
+                               not     slip, and that any delayed tasks are resumed at the correct\r
                                time. */\r
                                if( uxPendedTicks > ( unsigned portBASE_TYPE ) 0U )\r
                                {\r
@@ -1459,9 +1603,17 @@ portBASE_TYPE xAlreadyYielded = pdFALSE;
                                                {\r
                                                        xYieldPending = pdTRUE;\r
                                                }\r
+                                               else\r
+                                               {\r
+                                                       mtCOVERAGE_TEST_MARKER();\r
+                                               }\r
                                                --uxPendedTicks;\r
                                        }\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
 \r
                                if( xYieldPending == pdTRUE )\r
                                {\r
@@ -1472,8 +1624,16 @@ portBASE_TYPE xAlreadyYielded = pdFALSE;
                                        #endif\r
                                        taskYIELD_IF_USING_PREEMPTION();\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
                        }\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
        }\r
        taskEXIT_CRITICAL();\r
 \r
@@ -1609,6 +1769,10 @@ unsigned portBASE_TYPE uxTaskGetNumberOfTasks( void )
                                }\r
                                #endif\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                }\r
                ( void ) xTaskResumeAll();\r
 \r
@@ -1675,6 +1839,10 @@ portBASE_TYPE xSwitchRequired = pdFALSE;
                        {\r
                                taskSWITCH_DELAYED_LISTS();\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
 \r
                        /* See if this tick has made a timeout expire.  Tasks are stored in\r
                        the     queue in the order of their wake time - meaning once one task\r
@@ -1713,6 +1881,10 @@ portBASE_TYPE xSwitchRequired = pdFALSE;
                                                        xNextTaskUnblockTime = xItemValue;\r
                                                        break;\r
                                                }\r
+                                               else\r
+                                               {\r
+                                                       mtCOVERAGE_TEST_MARKER();\r
+                                               }\r
 \r
                                                /* It is time to remove the item from the Blocked state. */\r
                                                ( void ) uxListRemove( &( pxTCB->xGenericListItem ) );\r
@@ -1723,6 +1895,10 @@ portBASE_TYPE xSwitchRequired = pdFALSE;
                                                {\r
                                                        ( void ) uxListRemove( &( pxTCB->xEventListItem ) );\r
                                                }\r
+                                               else\r
+                                               {\r
+                                                       mtCOVERAGE_TEST_MARKER();\r
+                                               }\r
 \r
                                                /* Place the unblocked task into the appropriate ready\r
                                                list. */\r
@@ -1740,6 +1916,10 @@ portBASE_TYPE xSwitchRequired = pdFALSE;
                                                        {\r
                                                                xSwitchRequired = pdTRUE;\r
                                                        }\r
+                                                       else\r
+                                                       {\r
+                                                               mtCOVERAGE_TEST_MARKER();\r
+                                                       }\r
                                                }\r
                                                #endif /* configUSE_PREEMPTION */\r
                                        }\r
@@ -1756,6 +1936,10 @@ portBASE_TYPE xSwitchRequired = pdFALSE;
                        {\r
                                xSwitchRequired = pdTRUE;\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                }\r
                #endif /* ( ( configUSE_PREEMPTION == 1 ) && ( configUSE_TIME_SLICING == 1 ) ) */\r
 \r
@@ -1767,6 +1951,10 @@ portBASE_TYPE xSwitchRequired = pdFALSE;
                        {\r
                                vApplicationTickHook();\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                }\r
                #endif /* configUSE_TICK_HOOK */\r
        }\r
@@ -1789,6 +1977,10 @@ portBASE_TYPE xSwitchRequired = pdFALSE;
                {\r
                        xSwitchRequired = pdTRUE;\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
        }\r
        #endif /* configUSE_PREEMPTION */\r
 \r
@@ -1843,7 +2035,9 @@ portBASE_TYPE xSwitchRequired = pdFALSE;
                /* Save the hook function in the TCB.  A critical section is required as\r
                the value can be accessed from an interrupt. */\r
                taskENTER_CRITICAL();\r
+               {\r
                        xReturn = xTCB->pxTaskTag;\r
+               }\r
                taskEXIT_CRITICAL();\r
 \r
                return xReturn;\r
@@ -1916,6 +2110,10 @@ void vTaskSwitchContext( void )
                                {\r
                                        pxCurrentTCB->ulRunTimeCounter += ( ulTotalRunTime - ulTaskSwitchedInTime );\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
                                ulTaskSwitchedInTime = ulTotalRunTime;\r
                }\r
                #endif /* configGENERATE_RUN_TIME_STATS */\r
@@ -1961,6 +2159,10 @@ portTickType xTimeToWake;
                check, and the port reset macro can be called directly. */\r
                portRESET_READY_PRIORITY( pxCurrentTCB->uxPriority, uxTopReadyPriority );\r
        }\r
+       else\r
+       {\r
+               mtCOVERAGE_TEST_MARKER();\r
+       }\r
 \r
        #if ( INCLUDE_vTaskSuspend == 1 )\r
        {\r
@@ -2015,6 +2217,10 @@ portTickType xTimeToWake;
                check, and the port reset macro can be called directly. */\r
                portRESET_READY_PRIORITY( pxCurrentTCB->uxPriority, uxTopReadyPriority );\r
        }\r
+       else\r
+       {\r
+               mtCOVERAGE_TEST_MARKER();\r
+       }\r
 \r
        #if ( INCLUDE_vTaskSuspend == 1 )\r
        {\r
@@ -2073,6 +2279,10 @@ portTickType xTimeToWake;
                        check, and the port reset macro can be called directly. */\r
                        portRESET_READY_PRIORITY( pxCurrentTCB->uxPriority, uxTopReadyPriority );\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
 \r
                /* Calculate the time at which the task should be woken if the event does\r
                not occur.  This may overflow but this doesn't matter. */\r
@@ -2337,6 +2547,10 @@ static portTASK_FUNCTION( prvIdleTask, pvParameters )
                        {\r
                                taskYIELD();\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                }\r
                #endif /* ( ( configUSE_PREEMPTION == 1 ) && ( configIDLE_SHOULD_YIELD == 1 ) ) */\r
 \r
@@ -2384,9 +2598,17 @@ static portTASK_FUNCTION( prvIdleTask, pvParameters )
                                                portSUPPRESS_TICKS_AND_SLEEP( xExpectedIdleTime );\r
                                                traceLOW_POWER_IDLE_END();\r
                                        }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
                                }\r
                                ( void ) xTaskResumeAll();\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                }\r
                #endif /* configUSE_TICKLESS_IDLE */\r
        }\r
@@ -2424,6 +2646,10 @@ static portTASK_FUNCTION( prvIdleTask, pvParameters )
                                {\r
                                        eReturn = eNoTasksWaitingTimeout;\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
                        }\r
                        #endif /* configUSE_TIMERS */\r
                }\r
@@ -2449,6 +2675,10 @@ unsigned portBASE_TYPE x;
                {\r
                        break;\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
        }\r
 \r
        /* Ensure the name string is terminated in the case that the string length\r
@@ -2461,6 +2691,10 @@ unsigned portBASE_TYPE x;
        {\r
                uxPriority = ( unsigned portBASE_TYPE ) configMAX_PRIORITIES - ( unsigned portBASE_TYPE ) 1U;\r
        }\r
+       else\r
+       {\r
+               mtCOVERAGE_TEST_MARKER();\r
+       }\r
 \r
        pxTCB->uxPriority = uxPriority;\r
        #if ( configUSE_MUTEXES == 1 )\r
@@ -2594,6 +2828,10 @@ static void prvCheckTasksWaitingTermination( void )
 \r
                                prvDeleteTCB( pxTCB );\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                }\r
        }\r
        #endif /* vTaskDelete */\r
@@ -2622,6 +2860,10 @@ static void prvAddCurrentTaskToDelayedList( portTickType xTimeToWake )
                {\r
                        xNextTaskUnblockTime = xTimeToWake;\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
        }\r
 }\r
 /*-----------------------------------------------------------*/\r
@@ -2722,6 +2964,10 @@ tskTCB *pxNewTCB;
 \r
                        } while( pxNextTCB != pxFirstTCB );\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
 \r
                return uxTask;\r
        }\r
@@ -2884,6 +3130,10 @@ tskTCB *pxTCB;
                                {\r
                                        listSET_LIST_ITEM_VALUE( &( pxTCB->xEventListItem ), ( portTickType ) configMAX_PRIORITIES - ( portTickType ) pxCurrentTCB->uxPriority ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
 \r
                                /* If the task being modified is in the ready state it will need to\r
                                be moved into a new list. */\r
@@ -2893,6 +3143,10 @@ tskTCB *pxTCB;
                                        {\r
                                                taskRESET_READY_PRIORITY( pxTCB->uxPriority );\r
                                        }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
 \r
                                        /* Inherit the priority before being moved into the new list. */\r
                                        pxTCB->uxPriority = pxCurrentTCB->uxPriority;\r
@@ -2906,6 +3160,14 @@ tskTCB *pxTCB;
 \r
                                traceTASK_PRIORITY_INHERIT( pxTCB, pxCurrentTCB->uxPriority );\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
+               }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
                }\r
        }\r
 \r
@@ -2928,6 +3190,10 @@ tskTCB *pxTCB;
                                {\r
                                        taskRESET_READY_PRIORITY( pxTCB->uxPriority );\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
 \r
                                /* Disinherit the priority before adding the task into the new\r
                                ready list. */\r
@@ -2940,8 +3206,20 @@ tskTCB *pxTCB;
                                {\r
                                        listSET_LIST_ITEM_VALUE( &( pxTCB->xEventListItem ), ( portTickType ) configMAX_PRIORITIES - ( portTickType ) pxTCB->uxPriority ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
                                prvAddTaskToReadyList( pxTCB );\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
+               }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
                }\r
        }\r
 \r
@@ -2958,6 +3236,10 @@ tskTCB *pxTCB;
                {\r
                        ( pxCurrentTCB->uxCriticalNesting )++;\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
        }\r
 \r
 #endif /* portCRITICAL_NESTING_IN_TCB */\r
@@ -2977,8 +3259,20 @@ tskTCB *pxTCB;
                                {\r
                                        portENABLE_INTERRUPTS();\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
 \r
 #endif /* portCRITICAL_NESTING_IN_TCB */\r
@@ -3062,6 +3356,10 @@ tskTCB *pxTCB;
                        /* Free the array again. */\r
                        vPortFree( pxTaskStatusArray );\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
        }\r
 \r
 #endif /* ( ( configUSE_TRACE_FACILITY == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS == 1 ) ) */\r
@@ -3163,10 +3461,18 @@ tskTCB *pxTCB;
                                        pcWriteBuffer += strlen( ( char * ) pcWriteBuffer );\r
                                }\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
 \r
                        /* Free the array again. */\r
                        vPortFree( pxTaskStatusArray );\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
        }\r
 \r
 #endif /* ( ( configGENERATE_RUN_TIME_STATS == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS == 1 ) ) */\r
index 08cbe3d3fdc8d79e3ee21b98c5f53663c37b595b..c29bc3c521a472e073c098cec7116c3f2aab7f46 100644 (file)
@@ -251,6 +251,10 @@ portBASE_TYPE xReturn = pdFAIL;
                }\r
                #endif\r
        }\r
+       else\r
+       {\r
+               mtCOVERAGE_TEST_MARKER();\r
+       }\r
 \r
        configASSERT( xReturn );\r
        return xReturn;\r
@@ -330,6 +334,10 @@ xDAEMON_TASK_MESSAGE xMessage;
 \r
                traceTIMER_COMMAND_SEND( xTimer, xCommandID, xOptionalValue, xReturn );\r
        }\r
+       else\r
+       {\r
+               mtCOVERAGE_TEST_MARKER();\r
+       }\r
 \r
        return xReturn;\r
 }\r
@@ -373,6 +381,14 @@ xTIMER * const pxTimer = ( xTIMER * ) listGET_OWNER_OF_HEAD_ENTRY( pxCurrentTime
                        configASSERT( xResult );\r
                        ( void ) xResult;\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
+       }\r
+       else\r
+       {\r
+               mtCOVERAGE_TEST_MARKER();\r
        }\r
 \r
        /* Call the timer callback. */\r
@@ -443,6 +459,10 @@ portBASE_TYPE xTimerListsWereSwitched;
                                        to block. */\r
                                        portYIELD_WITHIN_API();\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
                        }\r
                }\r
                else\r
@@ -565,6 +585,10 @@ portTickType xTimeNow;
                                /* Call the function. */\r
                                pxCallback->pxCallbackFunction( pxCallback->pvParameter1, pxCallback->ulParameter2 );\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                }\r
                #endif /* INCLUDE_xTimerPendCallbackFromISR */\r
 \r
@@ -579,6 +603,10 @@ portTickType xTimeNow;
                                /* The timer is in a list, remove it. */\r
                                ( void ) uxListRemove( &( pxTimer->xTimerListItem ) );\r
                        }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
 \r
                        traceTIMER_COMMAND_RECEIVED( pxTimer, xMessage.xMessageID, xMessage.u.xTimerParameters.xMessageValue );\r
 \r
@@ -607,6 +635,14 @@ portTickType xTimeNow;
                                                        configASSERT( xResult );\r
                                                        ( void ) xResult;\r
                                                }\r
+                                               else\r
+                                               {\r
+                                                       mtCOVERAGE_TEST_MARKER();\r
+                                               }\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
                                        }\r
                                        break;\r
 \r
@@ -690,6 +726,10 @@ portBASE_TYPE xResult;
                                ( void ) xResult;\r
                        }\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
        }\r
 \r
        pxTemp = pxCurrentTimerList;\r
@@ -720,9 +760,17 @@ static void prvCheckForValidListAndQueue( void )
                                {\r
                                        vQueueAddToRegistry( xTimerQueue, ( signed char * ) "TmrQ" );\r
                                }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
                        }\r
                        #endif /* configQUEUE_REGISTRY_SIZE */\r
                }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
        }\r
        taskEXIT_CRITICAL();\r
 }\r