Kernel changes:

Minor change to xQueueGenericReceive() to catch the extreme case of data being placed into a queue between a task timing out and leaving the xQueueGenericReceive() function.
Added xSemaphoreGetCount() macro.

Demo app changes:
Updated countsem.c to test the new xSemaphoreGetCount() macro.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2401 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Demo/Common/Minimal/countsem.c b/FreeRTOS/Demo/Common/Minimal/countsem.c
index bbf797d1c26cbc57234e70c6d0388b7525971fcf..bf6f2bbb803ffd133993f527e24335a53b82de22 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/countsem.c
+++ b/FreeRTOS/Demo/Common/Minimal/countsem.c
@@ -68,7 +68,7 @@
 */\r
 \r
 \r
-/* \r
+/*\r
  * Simple demonstration of the usage of counting semaphore.\r
  */\r
 \r
@@ -84,7 +84,7 @@
 #define countMAX_COUNT_VALUE   ( 200 )\r
 \r
 /* Constants used to indicate whether or not the semaphore should have been\r
-created with its maximum count value, or its minimum count value.  These \r
+created with its maximum count value, or its minimum count value.  These\r
 numbers are used to ensure that the pointers passed in as the task parameters\r
 are valid. */\r
 #define countSTART_AT_MAX_COUNT        ( 0xaa )\r
@@ -118,7 +118,7 @@ static void prvCountingSemaphoreTask( void *pvParameters );
 static void prvIncrementSemaphoreCount( SemaphoreHandle_t xSemaphore, UBaseType_t *puxLoopCounter );\r
 \r
 /*\r
- * Utility function to decrement the semaphore count value up from \r
+ * Utility function to decrement the semaphore count value up from\r
  * countMAX_COUNT_VALUE to zero.\r
  */\r
 static void prvDecrementSemaphoreCount( SemaphoreHandle_t xSemaphore, UBaseType_t *puxLoopCounter );\r
@@ -134,11 +134,11 @@ typedef struct COUNT_SEM_STRUCT
        /* Set to countSTART_AT_MAX_COUNT if the semaphore should be created with\r
        its count value set to its max count value, or countSTART_AT_ZERO if it\r
        should have been created with its count value set to 0. */\r
-       UBaseType_t uxExpectedStartCount;       \r
+       UBaseType_t uxExpectedStartCount;\r
 \r
        /* Incremented on each cycle of the demo task.  Used to detect a stalled\r
        task. */\r
-       UBaseType_t uxLoopCounter;                      \r
+       UBaseType_t uxLoopCounter;\r
 } xCountSemStruct;\r
 \r
 /* Two structures are defined, one is passed to each test task. */\r
@@ -160,10 +160,10 @@ void vStartCountingSemaphoreTasks( void )
        xParameters[ 1 ].uxLoopCounter = 0;\r
 \r
        /* vQueueAddToRegistry() adds the semaphore to the registry, if one is\r
-       in use.  The registry is provided as a means for kernel aware \r
+       in use.  The registry is provided as a means for kernel aware\r
        debuggers to locate semaphores and has no purpose if a kernel aware debugger\r
        is not being used.  The call to vQueueAddToRegistry() will be removed\r
-       by the pre-processor if configQUEUE_REGISTRY_SIZE is not defined or is \r
+       by the pre-processor if configQUEUE_REGISTRY_SIZE is not defined or is\r
        defined to be less than 1. */\r
        vQueueAddToRegistry( ( QueueHandle_t ) xParameters[ 0 ].xSemaphore, "Counting_Sem_1" );\r
        vQueueAddToRegistry( ( QueueHandle_t ) xParameters[ 1 ].xSemaphore, "Counting_Sem_2" );\r
@@ -174,7 +174,7 @@ void vStartCountingSemaphoreTasks( void )
        {\r
                /* Create the demo tasks, passing in the semaphore to use as the parameter. */\r
                xTaskCreate( prvCountingSemaphoreTask, "CNT1", configMINIMAL_STACK_SIZE, ( void * ) &( xParameters[ 0 ] ), tskIDLE_PRIORITY, NULL );\r
-               xTaskCreate( prvCountingSemaphoreTask, "CNT2", configMINIMAL_STACK_SIZE, ( void * ) &( xParameters[ 1 ] ), tskIDLE_PRIORITY, NULL );            \r
+               xTaskCreate( prvCountingSemaphoreTask, "CNT2", configMINIMAL_STACK_SIZE, ( void * ) &( xParameters[ 1 ] ), tskIDLE_PRIORITY, NULL );\r
        }\r
 }\r
 /*-----------------------------------------------------------*/\r
@@ -193,6 +193,8 @@ UBaseType_t ux;
        /* We should be able to 'take' the semaphore countMAX_COUNT_VALUE times. */\r
        for( ux = 0; ux < countMAX_COUNT_VALUE; ux++ )\r
        {\r
+               configASSERT( xSemaphoreGetCount( xSemaphore ) == ( countMAX_COUNT_VALUE - ux ) );\r
+\r
                if( xSemaphoreTake( xSemaphore, countDONT_BLOCK ) != pdPASS )\r
                {\r
                        /* We expected to be able to take the semaphore. */\r
@@ -206,8 +208,9 @@ UBaseType_t ux;
                taskYIELD();\r
        #endif\r
 \r
-       /* If the semaphore count is zero then we should not be able to 'take' \r
+       /* If the semaphore count is zero then we should not be able to 'take'\r
        the semaphore. */\r
+       configASSERT( xSemaphoreGetCount( xSemaphore ) == 0 );\r
        if( xSemaphoreTake( xSemaphore, countDONT_BLOCK ) == pdPASS )\r
        {\r
                xErrorDetected = pdTRUE;\r
@@ -219,7 +222,7 @@ static void prvIncrementSemaphoreCount( SemaphoreHandle_t xSemaphore, UBaseType_
 {\r
 UBaseType_t ux;\r
 \r
-       /* If the semaphore count is zero then we should not be able to 'take' \r
+       /* If the semaphore count is zero then we should not be able to 'take'\r
        the semaphore. */\r
        if( xSemaphoreTake( xSemaphore, countDONT_BLOCK ) == pdPASS )\r
        {\r
@@ -229,6 +232,8 @@ UBaseType_t ux;
        /* We should be able to 'give' the semaphore countMAX_COUNT_VALUE times. */\r
        for( ux = 0; ux < countMAX_COUNT_VALUE; ux++ )\r
        {\r
+               configASSERT( xSemaphoreGetCount( xSemaphore ) == ux );\r
+\r
                if( xSemaphoreGive( xSemaphore ) != pdPASS )\r
                {\r
                        /* We expected to be able to take the semaphore. */\r
@@ -257,7 +262,7 @@ xCountSemStruct *pxParameter;
 \r
        #ifdef USE_STDIO\r
        void vPrintDisplayMessage( const char * const * ppcMessageToSend );\r
-       \r
+\r
                const char * const pcTaskStartMsg = "Counting semaphore demo started.\r\n";\r
 \r
                /* Queue a message for printing to say the task has started. */\r

diff --git a/FreeRTOS/Source/include/FreeRTOS.h b/FreeRTOS/Source/include/FreeRTOS.h
index a0e55e6d8f0b4ab88d26267811f6367bcf80e343..9d7a3f332f38f86087d16fb3e65b8f2691ffa207 100644 (file)
--- a/FreeRTOS/Source/include/FreeRTOS.h
+++ b/FreeRTOS/Source/include/FreeRTOS.h
@@ -776,6 +776,10 @@ extern "C" {
        #define configSUPPORT_STATIC_ALLOCATION 0\r
 #endif\r
 \r
+#if( ( configUSE_RECURSIVE_MUTEXES == 1 ) && ( configUSE_MUTEXES != 1 ) )\r
+    #error configUSE_MUTEXES must be set to 1 to use recursive mutexes\r
+#endif \r
+\r
 #if( portTICK_TYPE_IS_ATOMIC == 0 )\r
        /* Either variables of tick type cannot be read atomically, or\r
        portTICK_TYPE_IS_ATOMIC was not set - map the critical sections used when\r

diff --git a/FreeRTOS/Source/include/semphr.h b/FreeRTOS/Source/include/semphr.h
index ab00d09d76ce0debee162e1770de2c11b5031572..4a1e72969caeaebdec0d42c97937271d76c10057 100644 (file)
--- a/FreeRTOS/Source/include/semphr.h
+++ b/FreeRTOS/Source/include/semphr.h
@@ -839,6 +839,18 @@ typedef QueueHandle_t SemaphoreHandle_t;
  */\r
 #define xSemaphoreGetMutexHolder( xSemaphore ) xQueueGetMutexHolder( ( xSemaphore ) )\r
 \r
+/**\r
+ * semphr.h\r
+ * <pre>TaskHandle_t xSemaphoreGetCount( SemaphoreHandle_t xMutex );</pre>\r
+ *\r
+ * If the semaphore is a counting semaphore then xSemaphoreGetCount() returns\r
+ * its current count value.  If the semaphore is a binary semaphore then\r
+ * xSemaphoreGetCount() returns 1 if the semaphore is available, and 0 if the\r
+ * semaphore is not available.\r
+ *\r
+ */\r
+#define xSemaphoreGetCount( xSemaphore ) uxQueueMessagesWaiting( ( QueueHandle_t ) ( xSemaphore ) )\r
+\r
 #endif /* SEMAPHORE_H */\r
 \r
 \r

diff --git a/FreeRTOS/Source/queue.c b/FreeRTOS/Source/queue.c
index b74b4efa132ca8448eb07c839f6ecebbe4b82e18..0404b881af403a48f7d419d8af0a87454a189df6 100644 (file)
--- a/FreeRTOS/Source/queue.c
+++ b/FreeRTOS/Source/queue.c
@@ -797,8 +797,6 @@ Queue_t * const pxQueue = ( Queue_t * ) xQueue;
                        prvUnlockQueue( pxQueue );\r
                        ( void ) xTaskResumeAll();\r
 \r
-                       /* Return to the original privilege level before exiting the\r
-                       function. */\r
                        traceQUEUE_SEND_FAILED( pxQueue );\r
                        return errQUEUE_FULL;\r
                }\r
@@ -1385,7 +1383,7 @@ Queue_t * const pxQueue = ( Queue_t * ) xQueue;
                taskENTER_CRITICAL();\r
                {\r
                        /* Is there data in the queue now?  To be running the calling task\r
-                       must be the highest priority task wanting to access the queue. */\r
+                       must be the highest priority task wanting to access the queue. */\r
                        if( pxQueue->uxMessagesWaiting > ( UBaseType_t ) 0 )\r
                        {\r
                                /* Remember the read position in case the queue is only being\r
@@ -1541,8 +1539,16 @@ Queue_t * const pxQueue = ( Queue_t * ) xQueue;
                {\r
                        prvUnlockQueue( pxQueue );\r
                        ( void ) xTaskResumeAll();\r
-                       traceQUEUE_RECEIVE_FAILED( pxQueue );\r
-                       return errQUEUE_EMPTY;\r
+\r
+                       if( prvIsQueueEmpty( pxQueue ) != pdFALSE )\r
+                       {\r
+                               traceQUEUE_RECEIVE_FAILED( pxQueue );\r
+                               return errQUEUE_EMPTY;\r
+                       }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                }\r
        }\r
 }\r

diff --git a/FreeRTOS/Source/tasks.c b/FreeRTOS/Source/tasks.c
index 04208ca4a9fc4cae3b2ac7424e695d743d165cac..c3c343ab43bf4142b92c13a9b00ac9ae2bbbafa4 100644 (file)
--- a/FreeRTOS/Source/tasks.c
+++ b/FreeRTOS/Source/tasks.c
@@ -1618,7 +1618,7 @@ uint16_t usIdleTaskStackSize = tskIDLE_STACK_SIZE;
                configASSERT( xReturn );\r
        }\r
 \r
-       /* Prevent compiler warnings if INCLUDE_xTaskGetIdleTaskHandle is set to 0, \r
+       /* Prevent compiler warnings if INCLUDE_xTaskGetIdleTaskHandle is set to 0,\r
        meaning xIdleTaskHandle is not used anywhere else. */\r
        ( void ) xIdleTaskHandle;\r
 }\r
@@ -2732,9 +2732,13 @@ static portTASK_FUNCTION( prvIdleTask, pvParameters )
        /* Stop warnings. */\r
        ( void ) pvParameters;\r
 \r
+       /** THIS IS THE RTOS IDLE TASK - WHICH IS CREATED AUTOMATICALLY WHEN THE\r
+       SCHEDULER IS STARTED. **/\r
+\r
        for( ;; )\r
        {\r
-               /* See if any tasks have been deleted. */\r
+               /* See if any tasks have deleted themselves - if so then the idle task\r
+               is responsible for freeing the deleted task's TCB and stack. */\r
                prvCheckTasksWaitingTermination();\r
 \r
                #if ( configUSE_PREEMPTION == 0 )\r
@@ -3029,7 +3033,7 @@ UBaseType_t x;
                the calling task. */\r
                pxTCB = prvGetTCBFromHandle( xTaskToModify );\r
 \r
-        vPortStoreTaskMPUSettings( &( pxTCB->xMPUSettings ), xRegions, NULL, 0 );\r
+               vPortStoreTaskMPUSettings( &( pxTCB->xMPUSettings ), xRegions, NULL, 0 );\r
        }\r
 \r
 #endif /* portUSING_MPU_WRAPPERS */\r
@@ -3069,6 +3073,9 @@ UBaseType_t uxPriority;
 \r
 static void prvCheckTasksWaitingTermination( void )\r
 {\r
+\r
+       /** THIS FUNCTION IS CALLED FROM  THE RTOS IDLE TASK **/\r
+\r
        #if ( INCLUDE_vTaskDelete == 1 )\r
        {\r
                BaseType_t xListIsEmpty;\r