/*\r
- FreeRTOS V9.0.0rc1 - Copyright (C) 2016 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
+ * FreeRTOS Kernel V10.2.1\r
+ * Copyright (C) 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.\r
+ *\r
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of\r
+ * this software and associated documentation files (the "Software"), to deal in\r
+ * the Software without restriction, including without limitation the rights to\r
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of\r
+ * the Software, and to permit persons to whom the Software is furnished to do so,\r
+ * subject to the following conditions:\r
+ *\r
+ * The above copyright notice and this permission notice shall be included in all\r
+ * copies or substantial portions of the Software.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\r
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\r
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\r
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+ *\r
+ * http://www.FreeRTOS.org\r
+ * http://aws.amazon.com/freertos\r
+ *\r
+ * 1 tab == 4 spaces!\r
+ */\r
\r
/*\r
* This file contains some test scenarios that ensure tasks respond correctly\r
- * to xTaskAbortDelay() calls.\r
+ * to xTaskAbortDelay() calls. It also ensures tasks return the correct state\r
+ * of eBlocked when blocked indefinitely in both the case where a task is\r
+ * blocked on an object and when a task is blocked on a notification.\r
*/\r
\r
/* Standard includes. */\r
#include "queue.h"\r
#include "semphr.h"\r
#include "event_groups.h"\r
+#include "stream_buffer.h"\r
\r
/* Demo includes. */\r
#include "AbortDelay.h"\r
build. Remove the whole file if this is not the case. */\r
#if( INCLUDE_xTaskAbortDelay == 1 )\r
\r
-#if( INCLUDE_xTaskGetTaskHandle != 1 )\r
- #error This test file uses the xTaskGetTaskHandle() API function so INCLUDE_xTaskGetTaskHandle must be set to 1 in FreeRTOSConfig.h.\r
+#if( INCLUDE_xTaskGetHandle != 1 )\r
+ #error This test file uses the xTaskGetHandle() API function so INCLUDE_xTaskGetHandle must be set to 1 in FreeRTOSConfig.h.\r
#endif\r
\r
/* Task priorities. Allow these to be overridden. */\r
#define abtSEMAPHORE_TAKE_ABORTS 4\r
#define abtEVENT_GROUP_ABORTS 5\r
#define abtQUEUE_SEND_ABORTS 6\r
-#define abtMAX_TESTS 7\r
+#define abtSTREAM_BUFFER_RECEIVE 7\r
+#define abtMAX_TESTS 8\r
\r
/*-----------------------------------------------------------*/\r
\r
static void prvTestAbortingSemaphoreTake( void );\r
static void prvTestAbortingEventGroupWait( void );\r
static void prvTestAbortingQueueSend( void );\r
+static void prvTestAbortingStreamBufferReceive( void );\r
\r
/*\r
* Checks the amount of time a task spent in the Blocked state is within the\r
/* Just to remove compiler warnings. */\r
( void ) pvParameters;\r
\r
- xBlockingTask = xTaskGetTaskHandle( pcBlockingTaskName );\r
+ xBlockingTask = xTaskGetHandle( pcBlockingTaskName );\r
configASSERT( xBlockingTask );\r
\r
for( ;; )\r
task to minimise discrepancies. */\r
vTaskPrioritySet( NULL, abtBLOCKING_PRIORITY );\r
vTaskDelay( xMaxBlockTime + xHalfMaxBlockTime + xStartMargin );\r
- xTaskAbortDelay( xBlockingTask );\r
+ if( xTaskAbortDelay( xBlockingTask ) != pdPASS )\r
+ {\r
+ xErrorOccurred = pdTRUE;\r
+ }\r
\r
/* Reset the priority to the normal controlling priority. */\r
vTaskPrioritySet( NULL, abtCONTROLLING_PRIORITY );\r
{\r
TaskHandle_t xControllingTask;\r
uint32_t ulNotificationValue;\r
+const uint32_t ulMax = 0xffffffffUL;\r
\r
/* Just to remove compiler warnings. */\r
( void ) pvParameters;\r
\r
- xControllingTask = xTaskGetTaskHandle( pcControllingTaskName );\r
+ xControllingTask = xTaskGetHandle( pcControllingTaskName );\r
configASSERT( xControllingTask );\r
\r
for( ;; )\r
{\r
/* Wait to be notified of the test that is to be performed next. */\r
- xTaskNotifyWait( 0, ULONG_MAX, &ulNotificationValue, portMAX_DELAY );\r
+ xTaskNotifyWait( 0, ulMax, &ulNotificationValue, portMAX_DELAY );\r
\r
switch( ulNotificationValue )\r
{\r
prvTestAbortingQueueSend();\r
break;\r
\r
+ case abtSTREAM_BUFFER_RECEIVE:\r
+ prvTestAbortingStreamBufferReceive();\r
+ break;\r
+\r
default:\r
/* Should not get here. */\r
break;\r
}\r
/*-----------------------------------------------------------*/\r
\r
+static void prvTestAbortingStreamBufferReceive( void )\r
+{\r
+TickType_t xTimeAtStart;\r
+StreamBufferHandle_t xStreamBuffer;\r
+EventBits_t xReturn;\r
+const size_t xTriggerLevelBytes = ( size_t ) 1;\r
+uint8_t uxRxData;\r
+\r
+ #if( configSUPPORT_STATIC_ALLOCATION == 1 )\r
+ {\r
+ /* Defines the memory that will actually hold the streams within the\r
+ stream buffer. */\r
+ static uint8_t ucStorageBuffer[ sizeof( configMESSAGE_BUFFER_LENGTH_TYPE ) + 1 ];\r
+\r
+ /* The variable used to hold the stream buffer structure. */\r
+ StaticStreamBuffer_t xStreamBufferStruct;\r
+\r
+\r
+ xStreamBuffer = xStreamBufferCreateStatic( sizeof( ucStorageBuffer ),\r
+ xTriggerLevelBytes,\r
+ ucStorageBuffer,\r
+ &xStreamBufferStruct );\r
+ }\r
+ #else\r
+ {\r
+ xStreamBuffer = xStreamBufferCreate( sizeof( uint8_t ), xTriggerLevelBytes );\r
+ configASSERT( xStreamBuffer );\r
+ }\r
+ #endif\r
+\r
+ /* Note the time before the delay so the length of the delay is known. */\r
+ xTimeAtStart = xTaskGetTickCount();\r
+\r
+ /* This first delay should just time out. */\r
+ xReturn = xStreamBufferReceive( xStreamBuffer, &uxRxData, sizeof( uxRxData ), xMaxBlockTime );\r
+ if( xReturn != 0x00 )\r
+ {\r
+ xErrorOccurred = pdTRUE;\r
+ }\r
+ prvCheckExpectedTimeIsWithinAnAcceptableMargin( xTimeAtStart, xMaxBlockTime );\r
+\r
+ /* Note the time before the delay so the length of the delay is known. */\r
+ xTimeAtStart = xTaskGetTickCount();\r
+\r
+ /* This second delay should be aborted by the primary task half way\r
+ through xMaxBlockTime. */\r
+ xReturn = xStreamBufferReceive( xStreamBuffer, &uxRxData, sizeof( uxRxData ), xMaxBlockTime );\r
+ if( xReturn != 0x00 )\r
+ {\r
+ xErrorOccurred = pdTRUE;\r
+ }\r
+ prvCheckExpectedTimeIsWithinAnAcceptableMargin( xTimeAtStart, xHalfMaxBlockTime );\r
+\r
+ /* Note the time before the delay so the length of the delay is known. */\r
+ xTimeAtStart = xTaskGetTickCount();\r
+\r
+ /* This third delay should just time out again. */\r
+ xReturn = xStreamBufferReceive( xStreamBuffer, &uxRxData, sizeof( uxRxData ), xMaxBlockTime );\r
+ if( xReturn != 0x00 )\r
+ {\r
+ xErrorOccurred = pdTRUE;\r
+ }\r
+ prvCheckExpectedTimeIsWithinAnAcceptableMargin( xTimeAtStart, xMaxBlockTime );\r
+\r
+ /* Not really necessary in this case, but for completeness. */\r
+ vStreamBufferDelete( xStreamBuffer );\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
static void prvTestAbortingQueueSend( void )\r
{\r
TickType_t xTimeAtStart;\r
xTimeAtStart = xTaskGetTickCount();\r
\r
/* This second delay should be aborted by the primary task half way\r
- through. */\r
- xReturn = xSemaphoreTake( xSemaphore, xMaxBlockTime );\r
+ through xMaxBlockTime. */\r
+ xReturn = xSemaphoreTake( xSemaphore, portMAX_DELAY );\r
if( xReturn != pdFALSE )\r
{\r
xErrorOccurred = pdTRUE;\r
xTimeAtStart = xTaskGetTickCount();\r
\r
/* This second delay should be aborted by the primary task half way\r
- through. */\r
- xReturn = xTaskNotifyWait( 0, 0, NULL, xMaxBlockTime );\r
+ through xMaxBlockTime. */\r
+ xReturn = xTaskNotifyWait( 0, 0, NULL, portMAX_DELAY );\r
if( xReturn != pdFALSE )\r
{\r
xErrorOccurred = pdTRUE;\r
projects / freertos / blobdiff