{\r
uint32_t ulReceived;\r
QueueHandle_t xActivatedQueue;\r
+TickType_t xBlockTime;\r
\r
/* Remove compiler warnings. */\r
( void ) pvParameters;\r
\r
for( ;; )\r
{\r
+ /* For test coverage reasons, the block time is dependent on the\r
+ priority of this task - which changes during the test. When the task\r
+ is at the idle priority it polls the queue set. */\r
+ if( uxTaskPriorityGet( NULL ) == tskIDLE_PRIORITY )\r
+ {\r
+ xBlockTime = 0;\r
+ }\r
+ else\r
+ {\r
+ xBlockTime = portMAX_DELAY;\r
+ }\r
+\r
/* Wait for a message to arrive on one of the queues in the set. */\r
- xActivatedQueue = xQueueSelectFromSet( xQueueSet, portMAX_DELAY );\r
- configASSERT( xActivatedQueue );\r
+ xActivatedQueue = xQueueSelectFromSet( xQueueSet, portMAX_DELAY ); \r
\r
if( xActivatedQueue == NULL )\r
{\r
- /* This should not happen as an infinite delay was used. */\r
- xQueueSetTasksStatus = pdFAIL;\r
+ if( xBlockTime != 0 )\r
+ {\r
+ /* This should not happen as an infinite delay was used. */\r
+ xQueueSetTasksStatus = pdFAIL;\r
+ }\r
}\r
else\r
{\r
prvCheckReceivedValue( ulReceived );\r
}\r
taskEXIT_CRITICAL();\r
- }\r
\r
- if( xQueueSetTasksStatus == pdPASS )\r
- {\r
- ulCycleCounter++;\r
+ if( xQueueSetTasksStatus == pdPASS )\r
+ {\r
+ ulCycleCounter++;\r
+ }\r
}\r
}\r
}\r
{\r
ulISRTxValue++;\r
\r
- /* If the Tx value has wrapped then set it back to its\r
- initial value. */\r
+ /* If the Tx value has wrapped then set it back to its initial value. */\r
if( ulISRTxValue == 0UL )\r
{\r
ulISRTxValue = queuesetINITIAL_ISR_TX_VALUE;\r
--- /dev/null
+/*\r
+ FreeRTOS V8.2.0 - Copyright (C) 2015 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
+ This file is part of the FreeRTOS distribution.\r
+\r
+ FreeRTOS is free software; you can redistribute it and/or modify it under\r
+ the terms of the GNU General Public License (version 2) as published by the\r
+ Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
+\r
+ ***************************************************************************\r
+ >>! NOTE: The modification to the GPL is included to allow you to !<<\r
+ >>! distribute a combined work that includes FreeRTOS without being !<<\r
+ >>! obliged to provide the source code for proprietary components !<<\r
+ >>! outside of the FreeRTOS kernel. !<<\r
+ ***************************************************************************\r
+\r
+ FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
+ FOR A PARTICULAR PURPOSE. Full license text is available on the following\r
+ link: http://www.freertos.org/a00114.html\r
+\r
+ ***************************************************************************\r
+ * *\r
+ * FreeRTOS provides completely free yet professionally developed, *\r
+ * robust, strictly quality controlled, supported, and cross *\r
+ * platform software that is more than just the market leader, it *\r
+ * is the industry's de facto standard. *\r
+ * *\r
+ * Help yourself get started quickly while simultaneously helping *\r
+ * to support the FreeRTOS project by purchasing a FreeRTOS *\r
+ * tutorial book, reference manual, or both: *\r
+ * http://www.FreeRTOS.org/Documentation *\r
+ * *\r
+ ***************************************************************************\r
+\r
+ http://www.FreeRTOS.org/FAQHelp.html - Having a problem? Start by reading\r
+ the FAQ page "My application does not run, what could be wrong?". Have you\r
+ defined configASSERT()?\r
+\r
+ http://www.FreeRTOS.org/support - In return for receiving this top quality\r
+ embedded software for free we request you assist our global community by\r
+ participating in the support forum.\r
+\r
+ http://www.FreeRTOS.org/training - Investing in training allows your team to\r
+ be as productive as possible as early as possible. Now you can receive\r
+ FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers\r
+ Ltd, and the world's leading authority on the world's leading RTOS.\r
+\r
+ http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
+ including FreeRTOS+Trace - an indispensable productivity tool, a DOS\r
+ compatible FAT file system, and our tiny thread aware UDP/IP stack.\r
+\r
+ http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.\r
+ Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.\r
+\r
+ http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High\r
+ Integrity Systems ltd. to sell under the OpenRTOS brand. Low cost OpenRTOS\r
+ licenses offer ticketed support, indemnification and commercial middleware.\r
+\r
+ http://www.SafeRTOS.com - High Integrity Systems also provide a safety\r
+ engineered and independently SIL3 certified version for use in safety and\r
+ mission critical applications that require provable dependability.\r
+\r
+ 1 tab == 4 spaces!\r
+*/\r
+\r
+/*\r
+ * Tests the use of queue sets.\r
+ *\r
+ * A receive task creates a number of queues and adds them to a queue set before\r
+ * blocking on the queue set receive. A transmit task and (optionally) an\r
+ * interrupt repeatedly unblocks the receive task by sending messages to the\r
+ * queues in a pseudo random order. The receive task removes the messages from\r
+ * the queues and flags an error if the received message does not match that\r
+ * expected. The task sends values in the range 0 to\r
+ * queuesetINITIAL_ISR_TX_VALUE, and the ISR sends value in the range\r
+ * queuesetINITIAL_ISR_TX_VALUE to ULONG_MAX.\r
+ */\r
+\r
+\r
+/* Standard includes. */\r
+#include <stdlib.h>\r
+#include <limits.h>\r
+\r
+/* Kernel includes. */\r
+#include "FreeRTOS.h"\r
+#include "task.h"\r
+#include "queue.h"\r
+\r
+/* Demo includes. */\r
+#include "QueueSetPolling.h"\r
+\r
+/* The length of each created queue. */\r
+#define setpollQUEUE_LENGTH 10\r
+\r
+/* Block times used in this demo. A block time or 0 means "don't block". */\r
+#define setpollDONT_BLOCK 0\r
+\r
+/* The ISR sends to the queue every setpollISR_TX_PERIOD ticks. */\r
+#define queuesetISR_TX_PERIOD ( 50UL )\r
+\r
+/*\r
+ * The task that reads from the queue set.\r
+ */\r
+static void prvQueueSetReceivingTask( void *pvParameters );\r
+\r
+/*-----------------------------------------------------------*/\r
+\r
+/* The queue that is added to the set. */\r
+static QueueHandle_t xQueue = NULL;\r
+\r
+/* The handle of the queue set to which the queue is added. */\r
+static QueueSetHandle_t xQueueSet = NULL;\r
+\r
+/* Set to pdFAIL if an error is detected by any queue set task.\r
+ulCycleCounter will only be incremented if xQueueSetTasksSatus equals pdPASS. */\r
+static volatile BaseType_t xQueueSetPollStatus = pdPASS;\r
+\r
+/* Counter used to ensure the task is still running. */\r
+static uint32_t ulCycleCounter = 0;\r
+\r
+/*-----------------------------------------------------------*/\r
+\r
+void vStartQueueSetPollingTask( void )\r
+{\r
+ /* Create the queue that is added to the set, the set, and add the queue to\r
+ the set. */\r
+ xQueue = xQueueCreate( setpollQUEUE_LENGTH, sizeof( uint32_t ) );\r
+ xQueueSet = xQueueCreateSet( setpollQUEUE_LENGTH );\r
+ xQueueAddToSet( xQueue, xQueueSet );\r
+\r
+ /* Create the task. */\r
+ xTaskCreate( prvQueueSetReceivingTask, "SetPoll", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+static void prvQueueSetReceivingTask( void *pvParameters )\r
+{\r
+uint32_t ulReceived, ulExpected = 0;\r
+QueueHandle_t xActivatedQueue;\r
+\r
+ /* Remove compiler warnings. */\r
+ ( void ) pvParameters;\r
+\r
+ for( ;; )\r
+ {\r
+ /* Is a message waiting? A block time is not used to ensure the queue\r
+ set is polled while it is being written to from an interrupt. */\r
+ xActivatedQueue = xQueueSelectFromSet( xQueueSet, setpollDONT_BLOCK );\r
+\r
+ if( xActivatedQueue != NULL )\r
+ {\r
+ /* Reading from the queue should pass with a zero block time as\r
+ this task will only run when something has been posted to a task\r
+ in the queue set. */\r
+ if( xQueueReceive( xActivatedQueue, &ulReceived, setpollDONT_BLOCK ) != pdPASS )\r
+ {\r
+ xQueueSetPollStatus = pdFAIL;\r
+ }\r
+\r
+ if( ulReceived == ulExpected )\r
+ {\r
+ ulExpected++;\r
+ }\r
+ else\r
+ {\r
+ xQueueSetPollStatus = pdFAIL;\r
+ }\r
+\r
+ if( xQueueSetPollStatus == pdPASS )\r
+ {\r
+ ulCycleCounter++;\r
+ }\r
+ }\r
+ }\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+void vQueueSetPollingInterruptAccess( void )\r
+{\r
+static uint32_t ulCallCount = 0, ulValueToSend = 0;\r
+\r
+ /* It is intended that this function is called from the tick hook\r
+ function, so each call is one tick period apart. */\r
+ ulCallCount++;\r
+ if( ulCallCount > queuesetISR_TX_PERIOD )\r
+ {\r
+ ulCallCount = 0;\r
+\r
+ if( xQueueSendFromISR( xQueue, ( void * ) &ulValueToSend, NULL ) == pdPASS )\r
+ {\r
+ /* Send the next value next time. */\r
+ ulValueToSend++;\r
+ }\r
+ }\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+BaseType_t xAreQueueSetPollTasksStillRunning( void )\r
+{\r
+static uint32_t ulLastCycleCounter = 0;\r
+\r
+ if( ulLastCycleCounter == ulCycleCounter )\r
+ {\r
+ xQueueSetPollStatus = pdFAIL;\r
+ }\r
+\r
+ ulLastCycleCounter = ulCycleCounter;\r
+\r
+ return xQueueSetPollStatus;\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+\r
--- /dev/null
+/*\r
+ FreeRTOS V8.2.0 - Copyright (C) 2015 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
+ This file is part of the FreeRTOS distribution.\r
+\r
+ FreeRTOS is free software; you can redistribute it and/or modify it under\r
+ the terms of the GNU General Public License (version 2) as published by the\r
+ Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
+\r
+ ***************************************************************************\r
+ >>! NOTE: The modification to the GPL is included to allow you to !<<\r
+ >>! distribute a combined work that includes FreeRTOS without being !<<\r
+ >>! obliged to provide the source code for proprietary components !<<\r
+ >>! outside of the FreeRTOS kernel. !<<\r
+ ***************************************************************************\r
+\r
+ FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
+ FOR A PARTICULAR PURPOSE. Full license text is available on the following\r
+ link: http://www.freertos.org/a00114.html\r
+\r
+ ***************************************************************************\r
+ * *\r
+ * FreeRTOS provides completely free yet professionally developed, *\r
+ * robust, strictly quality controlled, supported, and cross *\r
+ * platform software that is more than just the market leader, it *\r
+ * is the industry's de facto standard. *\r
+ * *\r
+ * Help yourself get started quickly while simultaneously helping *\r
+ * to support the FreeRTOS project by purchasing a FreeRTOS *\r
+ * tutorial book, reference manual, or both: *\r
+ * http://www.FreeRTOS.org/Documentation *\r
+ * *\r
+ ***************************************************************************\r
+\r
+ http://www.FreeRTOS.org/FAQHelp.html - Having a problem? Start by reading\r
+ the FAQ page "My application does not run, what could be wrong?". Have you\r
+ defined configASSERT()?\r
+\r
+ http://www.FreeRTOS.org/support - In return for receiving this top quality\r
+ embedded software for free we request you assist our global community by\r
+ participating in the support forum.\r
+\r
+ http://www.FreeRTOS.org/training - Investing in training allows your team to\r
+ be as productive as possible as early as possible. Now you can receive\r
+ FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers\r
+ Ltd, and the world's leading authority on the world's leading RTOS.\r
+\r
+ http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
+ including FreeRTOS+Trace - an indispensable productivity tool, a DOS\r
+ compatible FAT file system, and our tiny thread aware UDP/IP stack.\r
+\r
+ http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.\r
+ Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.\r
+\r
+ http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High\r
+ Integrity Systems ltd. to sell under the OpenRTOS brand. Low cost OpenRTOS\r
+ licenses offer ticketed support, indemnification and commercial middleware.\r
+\r
+ http://www.SafeRTOS.com - High Integrity Systems also provide a safety\r
+ engineered and independently SIL3 certified version for use in safety and\r
+ mission critical applications that require provable dependability.\r
+\r
+ 1 tab == 4 spaces!\r
+*/\r
+\r
+#ifndef QUEUE_SET_POLLING_H\r
+#define QUEUE_SET_POLLING_H\r
+\r
+void vStartQueueSetPollingTask( void );\r
+BaseType_t xAreQueueSetPollTasksStillRunning( void );\r
+void vQueueSetPollingInterruptAccess( void );\r
+\r
+#endif /* QUEUE_SET_POLLING_H */\r
+\r
+\r
<ClCompile Include="..\Common\Minimal\QPeek.c" />\r
<ClCompile Include="..\Common\Minimal\QueueOverwrite.c" />\r
<ClCompile Include="..\Common\Minimal\QueueSet.c" />\r
+ <ClCompile Include="..\Common\Minimal\QueueSetPolling.c" />\r
<ClCompile Include="..\Common\Minimal\semtest.c" />\r
<ClCompile Include="..\Common\Minimal\TaskNotify.c" />\r
<ClCompile Include="..\Common\Minimal\timerdemo.c" />\r
<ClCompile Include="..\Common\Minimal\TaskNotify.c">\r
<Filter>Demo App Source\Common Demo Tasks</Filter>\r
</ClCompile>\r
+ <ClCompile Include="..\Common\Minimal\QueueSetPolling.c">\r
+ <Filter>Demo App Source\Common Demo Tasks</Filter>\r
+ </ClCompile>\r
</ItemGroup>\r
<ItemGroup>\r
<ClInclude Include="FreeRTOSConfig.h">\r
#include "EventGroupsDemo.h"\r
#include "IntSemTest.h"\r
#include "TaskNotify.h"\r
+#include "QueueSetPolling.h"\r
\r
/* Priorities at which the tasks are created. */\r
#define mainCHECK_TASK_PRIORITY ( configMAX_PRIORITIES - 2 )\r
vStartDynamicPriorityTasks();\r
vStartQueueSetTasks();\r
vStartQueueOverwriteTask( mainQUEUE_OVERWRITE_PRIORITY );\r
- xTaskCreate( prvDemoQueueSpaceFunctions, "QSpace", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );\r
vStartEventGroupTasks();\r
vStartInterruptSemaphoreTasks();\r
+ vStartQueueSetPollingTask();\r
+ xTaskCreate( prvDemoQueueSpaceFunctions, "QSpace", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );\r
\r
#if( configUSE_PREEMPTION != 0 )\r
{\r
{\r
pcStatusMessage = "Error: Queue overwrite";\r
}\r
+ else if( xAreQueueSetPollTasksStillRunning() != pdPASS )\r
+ {\r
+ pcStatusMessage = "Error: Queue set polling";\r
+ }\r
\r
/* This is the only task that uses stdout so its ok to call printf()\r
directly. */\r
/* Write to a queue that is in use as part of the queue set demo to\r
demonstrate using queue sets from an ISR. */\r
vQueueSetAccessQueueSetFromISR();\r
+ vQueueSetPollingInterruptAccess();\r
\r
/* Exercise event groups from interrupts. */\r
vPeriodicEventGroupsProcessing();\r
{\r
EventGroup_t *pxEventBits;\r
\r
- pxEventBits = pvPortMalloc( sizeof( EventGroup_t ) );\r
+ pxEventBits = ( EventGroup_t * ) pvPortMalloc( sizeof( EventGroup_t ) );\r
if( pxEventBits != NULL )\r
{\r
pxEventBits->uxEventBits = 0;\r
#define mtCOVERAGE_TEST_MARKER()\r
#endif\r
\r
+#ifndef mtCOVERAGE_TEST_DELAY\r
+ #define mtCOVERAGE_TEST_DELAY()\r
+#endif\r
+\r
#ifndef portASSERT_IF_IN_ISR\r
#define portASSERT_IF_IN_ISR()\r
#endif\r
listGET_OWNER_OF_NEXT_ENTRY(). */\r
pxNewListItem->pxNext = pxIndex;\r
pxNewListItem->pxPrevious = pxIndex->pxPrevious;\r
+\r
+ /* Only used during decision coverage testing. */\r
+ mtCOVERAGE_TEST_DELAY();\r
+\r
pxIndex->pxPrevious->pxNext = pxNewListItem;\r
pxIndex->pxPrevious = pxNewListItem;\r
\r
pxItemToRemove->pxNext->pxPrevious = pxItemToRemove->pxPrevious;\r
pxItemToRemove->pxPrevious->pxNext = pxItemToRemove->pxNext;\r
\r
+ /* Only used during decision coverage testing. */\r
+ mtCOVERAGE_TEST_DELAY();\r
+\r
/* Make sure the index is left pointing to a valid item. */\r
if( pxList->pxIndex == pxItemToRemove )\r
{\r
\r
#define portYIELD() vPortGenerateSimulatedInterrupt( portINTERRUPT_YIELD )\r
\r
+/* Simulated interrupts return pdFALSE if no context switch should be performed,\r
+or a non-zero number if a context switch should be performed. */\r
+#define portYIELD_FROM_ISR( x ) return x\r
+\r
void vPortCloseRunningThread( void *pvTaskToDelete, volatile BaseType_t *pxPendYield );\r
void vPortDeleteThread( void *pvThreadToDelete );\r
#define portCLEAN_UP_TCB( pxTCB ) vPortDeleteThread( pxTCB )\r
/* The data copied is the handle of the queue that contains data. */\r
xReturn = prvCopyDataToQueue( pxQueueSetContainer, &pxQueue, xCopyPosition );\r
\r
- if( listLIST_IS_EMPTY( &( pxQueueSetContainer->xTasksWaitingToReceive ) ) == pdFALSE )\r
+ if( pxQueueSetContainer->xTxLock == queueUNLOCKED )\r
{\r
- if( xTaskRemoveFromEventList( &( pxQueueSetContainer->xTasksWaitingToReceive ) ) != pdFALSE )\r
+ if( listLIST_IS_EMPTY( &( pxQueueSetContainer->xTasksWaitingToReceive ) ) == pdFALSE )\r
{\r
- /* The task waiting has a higher priority */\r
- xReturn = pdTRUE;\r
+ if( xTaskRemoveFromEventList( &( pxQueueSetContainer->xTasksWaitingToReceive ) ) != pdFALSE )\r
+ {\r
+ /* The task waiting has a higher priority. */\r
+ xReturn = pdTRUE;\r
+ }\r
+ else\r
+ {\r
+ mtCOVERAGE_TEST_MARKER();\r
+ }\r
}\r
else\r
{\r
}\r
else\r
{\r
- mtCOVERAGE_TEST_MARKER();\r
+ ( pxQueueSetContainer->xTxLock )++;\r
}\r
}\r
else\r
\r
if( listLIST_IS_EMPTY( pxDelayedTaskList ) != pdFALSE )\r
{\r
- /* The new current delayed list is empty. Set\r
- xNextTaskUnblockTime to the maximum possible value so it is\r
- extremely unlikely that the\r
+ /* The new current delayed list is empty. Set xNextTaskUnblockTime to\r
+ the maximum possible value so it is extremely unlikely that the\r
if( xTickCount >= xNextTaskUnblockTime ) test will pass until\r
there is an item in the delayed list. */\r
xNextTaskUnblockTime = portMAX_DELAY;\r
projects / freertos / commitdiff