mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-09-08 15:17:50 -04:00
Pass core ID to CRITICAL_NESTING_COUNT macros
This commit is contained in:
Felix van Oost
parent
974351fe4a
commit
d77a3709d2
1 changed files with 43 additions and 31 deletions
74
tasks.c
74
tasks.c
|
|
@ -317,10 +317,10 @@
|
|||
#define taskATTRIBUTE_IS_IDLE ( UBaseType_t ) ( 1U << 0U )
|
||||
|
||||
#if ( ( configNUMBER_OF_CORES > 1 ) && ( portCRITICAL_NESTING_IN_TCB == 1 ) )
|
||||
#define portGET_CRITICAL_NESTING_COUNT() ( pxCurrentTCBs[ portGET_CORE_ID() ]->uxCriticalNesting )
|
||||
#define portSET_CRITICAL_NESTING_COUNT( x ) ( pxCurrentTCBs[ portGET_CORE_ID() ]->uxCriticalNesting = ( x ) )
|
||||
#define portINCREMENT_CRITICAL_NESTING_COUNT() ( pxCurrentTCBs[ portGET_CORE_ID() ]->uxCriticalNesting++ )
|
||||
#define portDECREMENT_CRITICAL_NESTING_COUNT() ( pxCurrentTCBs[ portGET_CORE_ID() ]->uxCriticalNesting-- )
|
||||
#define portGET_CRITICAL_NESTING_COUNT( xCoreID ) ( pxCurrentTCBs[ xCoreID ]->uxCriticalNesting )
|
||||
#define portSET_CRITICAL_NESTING_COUNT( xCoreID, x ) ( pxCurrentTCBs[ xCoreID ]->uxCriticalNesting = ( x ) )
|
||||
#define portINCREMENT_CRITICAL_NESTING_COUNT( xCoreID ) ( pxCurrentTCBs[ xCoreID ]->uxCriticalNesting++ )
|
||||
#define portDECREMENT_CRITICAL_NESTING_COUNT( xCoreID ) ( pxCurrentTCBs[ xCoreID ]->uxCriticalNesting-- )
|
||||
#endif /* #if ( ( configNUMBER_OF_CORES > 1 ) && ( portCRITICAL_NESTING_IN_TCB == 1 ) ) */
|
||||
|
||||
#define taskBITS_PER_BYTE ( ( size_t ) 8 )
|
||||
|
|
@ -807,13 +807,14 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB ) PRIVILEGED_FUNCTION;
|
|||
{
|
||||
UBaseType_t uxPrevCriticalNesting;
|
||||
const TCB_t * pxThisTCB;
|
||||
const UBaseType_t xCoreID = portGET_CORE_ID();
|
||||
|
||||
/* This must only be called from within a task. */
|
||||
portASSERT_IF_IN_ISR();
|
||||
|
||||
/* This function is always called with interrupts disabled
|
||||
* so this is safe. */
|
||||
pxThisTCB = pxCurrentTCBs[ portGET_CORE_ID() ];
|
||||
pxThisTCB = pxCurrentTCBs[ xCoreID ];
|
||||
|
||||
while( pxThisTCB->xTaskRunState == taskTASK_SCHEDULED_TO_YIELD )
|
||||
{
|
||||
|
|
@ -825,11 +826,11 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB ) PRIVILEGED_FUNCTION;
|
|||
* the suspension and critical nesting counts, as well as release
|
||||
* and reacquire the correct locks. And then, do it all over again
|
||||
* if our state changed again during the reacquisition. */
|
||||
uxPrevCriticalNesting = portGET_CRITICAL_NESTING_COUNT();
|
||||
uxPrevCriticalNesting = portGET_CRITICAL_NESTING_COUNT( xCoreID );
|
||||
|
||||
if( uxPrevCriticalNesting > 0U )
|
||||
{
|
||||
portSET_CRITICAL_NESTING_COUNT( 0U );
|
||||
portSET_CRITICAL_NESTING_COUNT( xCoreID, 0U );
|
||||
portRELEASE_ISR_LOCK();
|
||||
}
|
||||
else
|
||||
|
|
@ -855,7 +856,7 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB ) PRIVILEGED_FUNCTION;
|
|||
portGET_TASK_LOCK();
|
||||
portGET_ISR_LOCK();
|
||||
|
||||
portSET_CRITICAL_NESTING_COUNT( uxPrevCriticalNesting );
|
||||
portSET_CRITICAL_NESTING_COUNT( xCoreID, uxPrevCriticalNesting );
|
||||
|
||||
if( uxPrevCriticalNesting == 0U )
|
||||
{
|
||||
|
|
@ -874,13 +875,14 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB ) PRIVILEGED_FUNCTION;
|
|||
BaseType_t xCurrentCoreTaskPriority;
|
||||
BaseType_t xLowestPriorityCore = ( BaseType_t ) -1;
|
||||
BaseType_t xCoreID;
|
||||
const BaseType_t xCurrentCoreID = portGET_CORE_ID();
|
||||
|
||||
#if ( configRUN_MULTIPLE_PRIORITIES == 0 )
|
||||
BaseType_t xYieldCount = 0;
|
||||
#endif /* #if ( configRUN_MULTIPLE_PRIORITIES == 0 ) */
|
||||
|
||||
/* This must be called from a critical section. */
|
||||
configASSERT( portGET_CRITICAL_NESTING_COUNT() > 0U );
|
||||
configASSERT( portGET_CRITICAL_NESTING_COUNT( xCurrentCoreID ) > 0U );
|
||||
|
||||
#if ( configRUN_MULTIPLE_PRIORITIES == 0 )
|
||||
|
||||
|
|
@ -969,11 +971,11 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB ) PRIVILEGED_FUNCTION;
|
|||
|
||||
#if ( configRUN_MULTIPLE_PRIORITIES == 0 )
|
||||
/* Verify that the calling core always yields to higher priority tasks. */
|
||||
if( ( ( pxCurrentTCBs[ portGET_CORE_ID() ]->uxTaskAttributes & taskATTRIBUTE_IS_IDLE ) == 0U ) &&
|
||||
( pxTCB->uxPriority > pxCurrentTCBs[ portGET_CORE_ID() ]->uxPriority ) )
|
||||
if( ( ( pxCurrentTCBs[ xCurrentCoreID ]->uxTaskAttributes & taskATTRIBUTE_IS_IDLE ) == 0U ) &&
|
||||
( pxTCB->uxPriority > pxCurrentTCBs[ xCurrentCoreID ]->uxPriority ) )
|
||||
{
|
||||
configASSERT( ( xYieldPendings[ portGET_CORE_ID() ] == pdTRUE ) ||
|
||||
( taskTASK_IS_RUNNING( pxCurrentTCBs[ portGET_CORE_ID() ] ) == pdFALSE ) );
|
||||
configASSERT( ( xYieldPendings[ xCurrentCoreID ] == pdTRUE ) ||
|
||||
( taskTASK_IS_RUNNING( pxCurrentTCBs[ xCurrentCoreID ] ) == pdFALSE ) );
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -3866,6 +3868,7 @@ void vTaskSuspendAll( void )
|
|||
#else /* #if ( configNUMBER_OF_CORES == 1 ) */
|
||||
{
|
||||
UBaseType_t ulState;
|
||||
const UBaseType_t xCoreID = portGET_CORE_ID();
|
||||
|
||||
/* This must only be called from within a task. */
|
||||
portASSERT_IF_IN_ISR();
|
||||
|
|
@ -3880,7 +3883,7 @@ void vTaskSuspendAll( void )
|
|||
ulState = portSET_INTERRUPT_MASK();
|
||||
|
||||
/* This must never be called from inside a critical section. */
|
||||
configASSERT( portGET_CRITICAL_NESTING_COUNT() == 0 );
|
||||
configASSERT( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0 );
|
||||
|
||||
/* portSOFTWARE_BARRIER() is only implemented for emulated/simulated ports that
|
||||
* do not otherwise exhibit real time behaviour. */
|
||||
|
|
@ -5187,7 +5190,7 @@ BaseType_t xTaskIncrementTick( void )
|
|||
/* vTaskSwitchContext() must never be called from within a critical section.
|
||||
* This is not necessarily true for single core FreeRTOS, but it is for this
|
||||
* SMP port. */
|
||||
configASSERT( portGET_CRITICAL_NESTING_COUNT() == 0 );
|
||||
configASSERT( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0 );
|
||||
|
||||
if( uxSchedulerSuspended != ( UBaseType_t ) 0U )
|
||||
{
|
||||
|
|
@ -6937,15 +6940,17 @@ static void prvResetNextTaskUnblockTime( void )
|
|||
*/
|
||||
void vTaskYieldWithinAPI( void )
|
||||
{
|
||||
const UBaseType_t xCoreID = portGET_CORE_ID();
|
||||
|
||||
traceENTER_vTaskYieldWithinAPI();
|
||||
|
||||
if( portGET_CRITICAL_NESTING_COUNT() == 0U )
|
||||
if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0U )
|
||||
{
|
||||
portYIELD();
|
||||
}
|
||||
else
|
||||
{
|
||||
xYieldPendings[ portGET_CORE_ID() ] = pdTRUE;
|
||||
xYieldPendings[ xCoreID ] = pdTRUE;
|
||||
}
|
||||
|
||||
traceRETURN_vTaskYieldWithinAPI();
|
||||
|
|
@ -6992,19 +6997,21 @@ static void prvResetNextTaskUnblockTime( void )
|
|||
|
||||
void vTaskEnterCritical( void )
|
||||
{
|
||||
const UBaseType_t xCoreID = portGET_CORE_ID();
|
||||
|
||||
traceENTER_vTaskEnterCritical();
|
||||
|
||||
portDISABLE_INTERRUPTS();
|
||||
|
||||
if( xSchedulerRunning != pdFALSE )
|
||||
{
|
||||
if( portGET_CRITICAL_NESTING_COUNT() == 0U )
|
||||
if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0U )
|
||||
{
|
||||
portGET_TASK_LOCK();
|
||||
portGET_ISR_LOCK();
|
||||
}
|
||||
|
||||
portINCREMENT_CRITICAL_NESTING_COUNT();
|
||||
portINCREMENT_CRITICAL_NESTING_COUNT( xCoreID );
|
||||
|
||||
/* This is not the interrupt safe version of the enter critical
|
||||
* function so assert() if it is being called from an interrupt
|
||||
|
|
@ -7012,7 +7019,7 @@ static void prvResetNextTaskUnblockTime( void )
|
|||
* interrupt. Only assert if the critical nesting count is 1 to
|
||||
* protect against recursive calls if the assert function also uses a
|
||||
* critical section. */
|
||||
if( portGET_CRITICAL_NESTING_COUNT() == 1U )
|
||||
if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 1U )
|
||||
{
|
||||
portASSERT_IF_IN_ISR();
|
||||
|
||||
|
|
@ -7043,6 +7050,7 @@ static void prvResetNextTaskUnblockTime( void )
|
|||
UBaseType_t vTaskEnterCriticalFromISR( void )
|
||||
{
|
||||
UBaseType_t uxSavedInterruptStatus = 0;
|
||||
const UBaseType_t xCoreID = portGET_CORE_ID();
|
||||
|
||||
traceENTER_vTaskEnterCriticalFromISR();
|
||||
|
||||
|
|
@ -7050,12 +7058,12 @@ static void prvResetNextTaskUnblockTime( void )
|
|||
{
|
||||
uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
|
||||
|
||||
if( portGET_CRITICAL_NESTING_COUNT() == 0U )
|
||||
if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0U )
|
||||
{
|
||||
portGET_ISR_LOCK();
|
||||
}
|
||||
|
||||
portINCREMENT_CRITICAL_NESTING_COUNT();
|
||||
portINCREMENT_CRITICAL_NESTING_COUNT( xCoreID );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -7119,28 +7127,30 @@ static void prvResetNextTaskUnblockTime( void )
|
|||
|
||||
void vTaskExitCritical( void )
|
||||
{
|
||||
const UBaseType_t xCoreID = portGET_CORE_ID();
|
||||
|
||||
traceENTER_vTaskExitCritical();
|
||||
|
||||
if( xSchedulerRunning != pdFALSE )
|
||||
{
|
||||
/* If critical nesting count is zero then this function
|
||||
* does not match a previous call to vTaskEnterCritical(). */
|
||||
configASSERT( portGET_CRITICAL_NESTING_COUNT() > 0U );
|
||||
configASSERT( portGET_CRITICAL_NESTING_COUNT( xCoreID ) > 0U );
|
||||
|
||||
/* This function should not be called in ISR. Use vTaskExitCriticalFromISR
|
||||
* to exit critical section from ISR. */
|
||||
portASSERT_IF_IN_ISR();
|
||||
|
||||
if( portGET_CRITICAL_NESTING_COUNT() > 0U )
|
||||
if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) > 0U )
|
||||
{
|
||||
portDECREMENT_CRITICAL_NESTING_COUNT();
|
||||
portDECREMENT_CRITICAL_NESTING_COUNT( xCoreID );
|
||||
|
||||
if( portGET_CRITICAL_NESTING_COUNT() == 0U )
|
||||
if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0U )
|
||||
{
|
||||
BaseType_t xYieldCurrentTask;
|
||||
|
||||
/* Get the xYieldPending stats inside the critical section. */
|
||||
xYieldCurrentTask = xYieldPendings[ portGET_CORE_ID() ];
|
||||
xYieldCurrentTask = xYieldPendings[ xCoreID ];
|
||||
|
||||
portRELEASE_ISR_LOCK();
|
||||
portRELEASE_TASK_LOCK();
|
||||
|
|
@ -7180,19 +7190,21 @@ static void prvResetNextTaskUnblockTime( void )
|
|||
|
||||
void vTaskExitCriticalFromISR( UBaseType_t uxSavedInterruptStatus )
|
||||
{
|
||||
const UBaseType_t xCoreID = portGET_CORE_ID();
|
||||
|
||||
traceENTER_vTaskExitCriticalFromISR( uxSavedInterruptStatus );
|
||||
|
||||
if( xSchedulerRunning != pdFALSE )
|
||||
{
|
||||
/* If critical nesting count is zero then this function
|
||||
* does not match a previous call to vTaskEnterCritical(). */
|
||||
configASSERT( portGET_CRITICAL_NESTING_COUNT() > 0U );
|
||||
configASSERT( portGET_CRITICAL_NESTING_COUNT( xCoreID ) > 0U );
|
||||
|
||||
if( portGET_CRITICAL_NESTING_COUNT() > 0U )
|
||||
if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) > 0U )
|
||||
{
|
||||
portDECREMENT_CRITICAL_NESTING_COUNT();
|
||||
portDECREMENT_CRITICAL_NESTING_COUNT( xCoreID );
|
||||
|
||||
if( portGET_CRITICAL_NESTING_COUNT() == 0U )
|
||||
if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0U )
|
||||
{
|
||||
portRELEASE_ISR_LOCK();
|
||||
portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue