len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-08-19 17:48:33 -04:00
Code Issues Projects Releases Packages Wiki Activity

Make the QueueSet.c standard demo task a little friendlier to lower priority tasks.

Browse source 
Allow the priority of the controlling task in the recmutex.c standard demo tasks to be overridden by a setting in FreeRTOSConfig.h.
This commit is contained in:
Richard Barry 2013-09-02 16:37:56 +00:00
parent a8c2c6b3b6
commit 18c4f8e622
2 changed files with 88 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

23
FreeRTOS/Demo/Common/Minimal/recmutex.c
View file

@ -106,8 +106,11 @@
/* Demo app include files. */
#include "recmutex.h"
/* Priorities assigned to the three tasks. */
#define recmuCONTROLLING_TASK_PRIORITY ( tskIDLE_PRIORITY + 2 )
/* Priorities assigned to the three tasks. recmuCONTROLLING_TASK_PRIORITY can
be overridden by a definition in FreeRTOSConfig.h. */
#ifndef recmuCONTROLLING_TASK_PRIORITY
#define recmuCONTROLLING_TASK_PRIORITY ( tskIDLE_PRIORITY + 2 )
#endif
#define recmuBLOCKING_TASK_PRIORITY ( tskIDLE_PRIORITY + 1 )
#define recmuPOLLING_TASK_PRIORITY ( tskIDLE_PRIORITY + 0 )
@ -117,7 +120,7 @@
/* Misc. */
#define recmuSHORT_DELAY ( 20 / portTICK_RATE_MS )
#define recmuNO_DELAY ( ( portTickType ) 0 )
#define recmuTHREE_TICK_DELAY ( ( portTickType ) 3 )
#define recmuFIVE_TICK_DELAY ( ( portTickType ) 5 )
/* The three tasks as described at the top of this file. */
static void prvRecursiveMutexControllingTask( void *pvParameters );
@ -191,7 +194,7 @@ unsigned portBASE_TYPE ux;
long enough to ensure the polling task will execute again before the
block time expires. If the block time does expire then the error
flag will be set here. */
if( xSemaphoreTakeRecursive( xMutex, recmuTHREE_TICK_DELAY ) != pdPASS )
if( xSemaphoreTakeRecursive( xMutex, recmuFIVE_TICK_DELAY ) != pdPASS )
{
xErrorOccurred = pdTRUE;
}
@ -222,7 +225,7 @@ unsigned portBASE_TYPE ux;
}
/* Having given it back the same number of times as it was taken, we
should no longer be the mutex owner, so the next give sh ould fail. */
should no longer be the mutex owner, so the next give should fail. */
if( xSemaphoreGiveRecursive( xMutex ) == pdPASS )
{
xErrorOccurred = pdTRUE;
@ -232,7 +235,7 @@ unsigned portBASE_TYPE ux;
stall can be detected. */
uxControllingCycles++;
/* Suspend ourselves to the blocking task can execute. */
/* Suspend ourselves so the blocking task can execute. */
xControllingIsSuspended = pdTRUE;
vTaskSuspend( NULL );
xControllingIsSuspended = pdFALSE;
@ -347,6 +350,7 @@ static void prvRecursiveMutexPollingTask( void *pvParameters )
#if( INCLUDE_uxTaskPriorityGet == 1 )
{
/* Check priority inherited. */
configASSERT( uxTaskPriorityGet( NULL ) == recmuCONTROLLING_TASK_PRIORITY );
}
#endif /* INCLUDE_uxTaskPriorityGet */
@ -363,6 +367,13 @@ static void prvRecursiveMutexPollingTask( void *pvParameters )
{
xErrorOccurred = pdTRUE;
}
#if( INCLUDE_uxTaskPriorityGet == 1 )
{
/* Check priority disinherited. */
configASSERT( uxTaskPriorityGet( NULL ) == recmuPOLLING_TASK_PRIORITY );
}
#endif /* INCLUDE_uxTaskPriorityGet */
}
}