Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unreachable code in prvSelectHighestPriorityTask #70

Merged
merged 2 commits into from
Apr 20, 2023
Merged

Remove unreachable code in prvSelectHighestPriorityTask #70

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1c07cc
Remove unreachable code in prvSelectHighestPriorityTask
chinglee-iot Apr 10, 2023
a148e6b
Update comment
chinglee-iot Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 63 additions & 69 deletions tasks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,105 +1013,99 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB ) PRIVILEGED_FUNCTION;
/* There are configNUMBER_OF_CORES Idle tasks created when scheduler started.
* The scheduler should be able to select a task to run when uxCurrentPriority
* is tskIDLE_PRIORITY. */
configASSERT( ( uxCurrentPriority > tskIDLE_PRIORITY ) || ( xTaskScheduled == pdTRUE ) );
uxCurrentPriority--;
chinglee-iot marked this conversation as resolved.
Show resolved Hide resolved
}

if( xTaskScheduled == pdTRUE )
#if ( configRUN_MULTIPLE_PRIORITIES == 0 )
{
configASSERT( taskTASK_IS_RUNNING( pxCurrentTCBs[ xCoreID ] ) == pdTRUE );

#if ( configRUN_MULTIPLE_PRIORITIES == 0 )
if( xPriorityDropped != pdFALSE )
{
if( xPriorityDropped != pdFALSE )
{
/* There may be several ready tasks that were being prevented from running because there was
* a higher priority task running. Now that the last of the higher priority tasks is no longer
* running, make sure all the other idle tasks yield. */
BaseType_t x;
/* There may be several ready tasks that were being prevented from running because there was
* a higher priority task running. Now that the last of the higher priority tasks is no longer
* running, make sure all the other idle tasks yield. */
BaseType_t x;

for( x = ( BaseType_t ) 0; x < ( BaseType_t ) configNUMBER_OF_CORES; x++ )
for( x = ( BaseType_t ) 0; x < ( BaseType_t ) configNUMBER_OF_CORES; x++ )
{
if( ( pxCurrentTCBs[ x ]->uxTaskAttributes & taskATTRIBUTE_IS_IDLE ) != 0 )
{
if( ( pxCurrentTCBs[ x ]->uxTaskAttributes & taskATTRIBUTE_IS_IDLE ) != 0 )
{
prvYieldCore( x );
}
prvYieldCore( x );
}
}
}
#endif /* #if ( configRUN_MULTIPLE_PRIORITIES == 0 ) */
}
#endif /* #if ( configRUN_MULTIPLE_PRIORITIES == 0 ) */

#if ( configUSE_CORE_AFFINITY == 1 )
#if ( configUSE_CORE_AFFINITY == 1 )
{
if( ( pxPreviousTCB != NULL ) && ( listIS_CONTAINED_WITHIN( &( pxReadyTasksLists[ pxPreviousTCB->uxPriority ] ), &( pxPreviousTCB->xStateListItem ) ) != pdFALSE ) )
{
if( ( pxPreviousTCB != NULL ) && ( listIS_CONTAINED_WITHIN( &( pxReadyTasksLists[ pxPreviousTCB->uxPriority ] ), &( pxPreviousTCB->xStateListItem ) ) != pdFALSE ) )
/* A ready task was just evicted from this core. See if it can be
* scheduled on any other core. */
UBaseType_t uxCoreMap = pxPreviousTCB->uxCoreAffinityMask;
BaseType_t xLowestPriority = pxPreviousTCB->uxPriority;
BaseType_t xLowestPriorityCore = -1;
BaseType_t x;

if( ( pxPreviousTCB->uxTaskAttributes & taskATTRIBUTE_IS_IDLE ) != 0 )
{
/* A ready task was just evicted from this core. See if it can be
* scheduled on any other core. */
UBaseType_t uxCoreMap = pxPreviousTCB->uxCoreAffinityMask;
BaseType_t xLowestPriority = pxPreviousTCB->uxPriority;
BaseType_t xLowestPriorityCore = -1;
BaseType_t x;
xLowestPriority = xLowestPriority - 1;
}

if( ( pxPreviousTCB->uxTaskAttributes & taskATTRIBUTE_IS_IDLE ) != 0 )
{
xLowestPriority = xLowestPriority - 1;
}
if( ( uxCoreMap & ( 1 << xCoreID ) ) != 0 )
{
/* The ready task that was removed from this core is not excluded from it.
* Only look at the intersection of the cores the removed task is allowed to run
* on with the cores that the new task is excluded from. It is possible that the
* new task was only placed onto this core because it is excluded from another.
* Check to see if the previous task could run on one of those cores. */
uxCoreMap &= ~( pxCurrentTCBs[ xCoreID ]->uxCoreAffinityMask );
}
else
{
/* The ready task that was removed from this core is excluded from it. */
}

if( ( uxCoreMap & ( 1 << xCoreID ) ) != 0 )
{
/* The ready task that was removed from this core is not excluded from it.
* Only look at the intersection of the cores the removed task is allowed to run
* on with the cores that the new task is excluded from. It is possible that the
* new task was only placed onto this core because it is excluded from another.
* Check to see if the previous task could run on one of those cores. */
uxCoreMap &= ~( pxCurrentTCBs[ xCoreID ]->uxCoreAffinityMask );
}
else
{
/* The ready task that was removed from this core is excluded from it. */
}
uxCoreMap &= ( ( 1 << configNUMBER_OF_CORES ) - 1 );

uxCoreMap &= ( ( 1 << configNUMBER_OF_CORES ) - 1 );
for( x = ( configNUMBER_OF_CORES - 1 ); x >= 0; x-- )
{
UBaseType_t uxCore = ( UBaseType_t ) x;
BaseType_t xTaskPriority;

for( x = ( configNUMBER_OF_CORES - 1 ); x >= 0; x-- )
if( ( uxCoreMap & ( 1 << uxCore ) ) != 0 )
{
UBaseType_t uxCore = ( UBaseType_t ) x;
BaseType_t xTaskPriority;
xTaskPriority = ( BaseType_t ) pxCurrentTCBs[ uxCore ]->uxPriority;

if( ( uxCoreMap & ( 1 << uxCore ) ) != 0 )
if( ( pxCurrentTCBs[ uxCore ]->uxTaskAttributes & taskATTRIBUTE_IS_IDLE ) != 0 )
{
xTaskPriority = ( BaseType_t ) pxCurrentTCBs[ uxCore ]->uxPriority;

if( ( pxCurrentTCBs[ uxCore ]->uxTaskAttributes & taskATTRIBUTE_IS_IDLE ) != 0 )
{
xTaskPriority = xTaskPriority - ( BaseType_t ) 1;
}
xTaskPriority = xTaskPriority - ( BaseType_t ) 1;
}

uxCoreMap &= ~( 1 << uxCore );
uxCoreMap &= ~( 1 << uxCore );

if( ( xTaskPriority < xLowestPriority ) &&
( taskTASK_IS_RUNNING( pxCurrentTCBs[ uxCore ] ) != pdFALSE ) &&
( xYieldPendings[ uxCore ] == pdFALSE ) )
if( ( xTaskPriority < xLowestPriority ) &&
( taskTASK_IS_RUNNING( pxCurrentTCBs[ uxCore ] ) != pdFALSE ) &&
( xYieldPendings[ uxCore ] == pdFALSE ) )
{
#if ( configUSE_TASK_PREEMPTION_DISABLE == 1 )
if( pxCurrentTCBs[ uxCore ]->xPreemptionDisable == pdFALSE )
#endif
{
#if ( configUSE_TASK_PREEMPTION_DISABLE == 1 )
if( pxCurrentTCBs[ uxCore ]->xPreemptionDisable == pdFALSE )
#endif
{
xLowestPriority = xTaskPriority;
xLowestPriorityCore = uxCore;
}
xLowestPriority = xTaskPriority;
xLowestPriorityCore = uxCore;
}
}
}
}

if( taskVALID_CORE_ID( xLowestPriorityCore ) == pdTRUE )
{
prvYieldCore( xLowestPriorityCore );
}
if( xLowestPriorityCore >= 0 )
{
prvYieldCore( xLowestPriorityCore );
}
}
#endif /* #if ( configUSE_CORE_AFFINITY == 1 ) */
}
#endif /* #if ( configUSE_CORE_AFFINITY == 1 ) */
}

#endif /* ( configNUMBER_OF_CORES > 1 ) */
Expand Down