mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-11-04 11:09:01 +01:00
Not using pxIndex to iterate ready list in trace utility (#1000)
* pxIndex should only be used when selecting next task. Altering pxIndex of a ready list will cause the scheduler to be unable to select the right task to run. Using a for loop if traversing the list for trace utility is required. * Not defining listGET_OWNER_OF_NEXT_ENTRY when using SMP scheduler --------- Co-authored-by: Gaurav-Aggarwal-AWS <33462878+aggarg@users.noreply.github.com>
This commit is contained in:
chinglee-iot
GitHub
parent
cff947acd0
commit
30f6061f48
@ -282,7 +282,8 @@ typedef struct xLIST
|
|||||||
* \page listGET_OWNER_OF_NEXT_ENTRY listGET_OWNER_OF_NEXT_ENTRY
|
* \page listGET_OWNER_OF_NEXT_ENTRY listGET_OWNER_OF_NEXT_ENTRY
|
||||||
* \ingroup LinkedList
|
* \ingroup LinkedList
|
||||||
*/
|
*/
|
||||||
#define listGET_OWNER_OF_NEXT_ENTRY( pxTCB, pxList ) \
|
#if ( configNUMBER_OF_CORES == 1 )
|
||||||
|
#define listGET_OWNER_OF_NEXT_ENTRY( pxTCB, pxList ) \
|
||||||
do { \
|
do { \
|
||||||
List_t * const pxConstList = ( pxList ); \
|
List_t * const pxConstList = ( pxList ); \
|
||||||
/* Increment the index to the next item and return the item, ensuring */ \
|
/* Increment the index to the next item and return the item, ensuring */ \
|
||||||
@ -294,6 +295,13 @@ typedef struct xLIST
|
|||||||
} \
|
} \
|
||||||
( pxTCB ) = ( pxConstList )->pxIndex->pvOwner; \
|
( pxTCB ) = ( pxConstList )->pxIndex->pvOwner; \
|
||||||
} while( 0 )
|
} while( 0 )
|
||||||
|
#else /* #if ( configNUMBER_OF_CORES == 1 ) */
|
||||||
|
|
||||||
|
/* This function is not required in SMP. FreeRTOS SMP scheduler doesn't use
|
||||||
|
* pxIndex and it should always point to the xListEnd. Not defining this macro
|
||||||
|
* here to prevent updating pxIndex.
|
||||||
|
*/
|
||||||
|
#endif /* #if ( configNUMBER_OF_CORES == 1 ) */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Version of uxListRemove() that does not return a value. Provided as a slight
|
* Version of uxListRemove() that does not return a value. Provided as a slight
|
||||||
|
|||||||
190
tasks.c
190
tasks.c
@ -4177,147 +4177,72 @@ char * pcTaskGetName( TaskHandle_t xTaskToQuery )
|
|||||||
/*-----------------------------------------------------------*/
|
/*-----------------------------------------------------------*/
|
||||||
|
|
||||||
#if ( INCLUDE_xTaskGetHandle == 1 )
|
#if ( INCLUDE_xTaskGetHandle == 1 )
|
||||||
|
static TCB_t * prvSearchForNameWithinSingleList( List_t * pxList,
|
||||||
|
const char pcNameToQuery[] )
|
||||||
|
{
|
||||||
|
TCB_t * pxReturn = NULL;
|
||||||
|
UBaseType_t x;
|
||||||
|
char cNextChar;
|
||||||
|
BaseType_t xBreakLoop;
|
||||||
|
const ListItem_t * pxEndMarker = listGET_END_MARKER( pxList );
|
||||||
|
ListItem_t * pxIterator;
|
||||||
|
|
||||||
#if ( configNUMBER_OF_CORES == 1 )
|
/* This function is called with the scheduler suspended. */
|
||||||
static TCB_t * prvSearchForNameWithinSingleList( List_t * pxList,
|
|
||||||
const char pcNameToQuery[] )
|
if( listCURRENT_LIST_LENGTH( pxList ) > ( UBaseType_t ) 0 )
|
||||||
{
|
{
|
||||||
TCB_t * pxNextTCB;
|
for( pxIterator = listGET_HEAD_ENTRY( pxList ); pxIterator != pxEndMarker; pxIterator = listGET_NEXT( pxIterator ) )
|
||||||
TCB_t * pxFirstTCB;
|
|
||||||
TCB_t * pxReturn = NULL;
|
|
||||||
UBaseType_t x;
|
|
||||||
char cNextChar;
|
|
||||||
BaseType_t xBreakLoop;
|
|
||||||
|
|
||||||
/* This function is called with the scheduler suspended. */
|
|
||||||
|
|
||||||
if( listCURRENT_LIST_LENGTH( pxList ) > ( UBaseType_t ) 0 )
|
|
||||||
{
|
{
|
||||||
/* MISRA Ref 11.5.3 [Void pointer assignment] */
|
/* MISRA Ref 11.5.3 [Void pointer assignment] */
|
||||||
/* More details at: https://github.com/FreeRTOS/FreeRTOS-Kernel/blob/main/MISRA.md#rule-115 */
|
/* More details at: https://github.com/FreeRTOS/FreeRTOS-Kernel/blob/main/MISRA.md#rule-115 */
|
||||||
/* coverity[misra_c_2012_rule_11_5_violation] */
|
/* coverity[misra_c_2012_rule_11_5_violation] */
|
||||||
listGET_OWNER_OF_NEXT_ENTRY( pxFirstTCB, pxList );
|
TCB_t * pxTCB = listGET_LIST_ITEM_OWNER( pxIterator );
|
||||||
|
|
||||||
do
|
/* Check each character in the name looking for a match or
|
||||||
|
* mismatch. */
|
||||||
|
xBreakLoop = pdFALSE;
|
||||||
|
|
||||||
|
for( x = ( UBaseType_t ) 0; x < ( UBaseType_t ) configMAX_TASK_NAME_LEN; x++ )
|
||||||
{
|
{
|
||||||
/* MISRA Ref 11.5.3 [Void pointer assignment] */
|
cNextChar = pxTCB->pcTaskName[ x ];
|
||||||
/* More details at: https://github.com/FreeRTOS/FreeRTOS-Kernel/blob/main/MISRA.md#rule-115 */
|
|
||||||
/* coverity[misra_c_2012_rule_11_5_violation] */
|
|
||||||
listGET_OWNER_OF_NEXT_ENTRY( pxNextTCB, pxList );
|
|
||||||
|
|
||||||
/* Check each character in the name looking for a match or
|
if( cNextChar != pcNameToQuery[ x ] )
|
||||||
* mismatch. */
|
|
||||||
xBreakLoop = pdFALSE;
|
|
||||||
|
|
||||||
for( x = ( UBaseType_t ) 0; x < ( UBaseType_t ) configMAX_TASK_NAME_LEN; x++ )
|
|
||||||
{
|
{
|
||||||
cNextChar = pxNextTCB->pcTaskName[ x ];
|
/* Characters didn't match. */
|
||||||
|
xBreakLoop = pdTRUE;
|
||||||
if( cNextChar != pcNameToQuery[ x ] )
|
}
|
||||||
{
|
else if( cNextChar == ( char ) 0x00 )
|
||||||
/* Characters didn't match. */
|
{
|
||||||
xBreakLoop = pdTRUE;
|
/* Both strings terminated, a match must have been
|
||||||
}
|
* found. */
|
||||||
else if( cNextChar == ( char ) 0x00 )
|
pxReturn = pxTCB;
|
||||||
{
|
xBreakLoop = pdTRUE;
|
||||||
/* Both strings terminated, a match must have been
|
}
|
||||||
* found. */
|
else
|
||||||
pxReturn = pxNextTCB;
|
{
|
||||||
xBreakLoop = pdTRUE;
|
mtCOVERAGE_TEST_MARKER();
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mtCOVERAGE_TEST_MARKER();
|
|
||||||
}
|
|
||||||
|
|
||||||
if( xBreakLoop != pdFALSE )
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if( pxReturn != NULL )
|
if( xBreakLoop != pdFALSE )
|
||||||
{
|
{
|
||||||
/* The handle has been found. */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
} while( pxNextTCB != pxFirstTCB );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mtCOVERAGE_TEST_MARKER();
|
|
||||||
}
|
|
||||||
|
|
||||||
return pxReturn;
|
|
||||||
}
|
|
||||||
#else /* if ( configNUMBER_OF_CORES == 1 ) */
|
|
||||||
static TCB_t * prvSearchForNameWithinSingleList( List_t * pxList,
|
|
||||||
const char pcNameToQuery[] )
|
|
||||||
{
|
|
||||||
TCB_t * pxReturn = NULL;
|
|
||||||
UBaseType_t x;
|
|
||||||
char cNextChar;
|
|
||||||
BaseType_t xBreakLoop;
|
|
||||||
const ListItem_t * pxEndMarker = listGET_END_MARKER( pxList );
|
|
||||||
ListItem_t * pxIterator;
|
|
||||||
|
|
||||||
/* This function is called with the scheduler suspended. */
|
|
||||||
|
|
||||||
if( listCURRENT_LIST_LENGTH( pxList ) > ( UBaseType_t ) 0 )
|
|
||||||
{
|
|
||||||
for( pxIterator = listGET_HEAD_ENTRY( pxList ); pxIterator != pxEndMarker; pxIterator = listGET_NEXT( pxIterator ) )
|
|
||||||
{
|
|
||||||
/* MISRA Ref 11.5.3 [Void pointer assignment] */
|
|
||||||
/* More details at: https://github.com/FreeRTOS/FreeRTOS-Kernel/blob/main/MISRA.md#rule-115 */
|
|
||||||
/* coverity[misra_c_2012_rule_11_5_violation] */
|
|
||||||
TCB_t * pxTCB = listGET_LIST_ITEM_OWNER( pxIterator );
|
|
||||||
|
|
||||||
/* Check each character in the name looking for a match or
|
|
||||||
* mismatch. */
|
|
||||||
xBreakLoop = pdFALSE;
|
|
||||||
|
|
||||||
for( x = ( UBaseType_t ) 0; x < ( UBaseType_t ) configMAX_TASK_NAME_LEN; x++ )
|
|
||||||
{
|
|
||||||
cNextChar = pxTCB->pcTaskName[ x ];
|
|
||||||
|
|
||||||
if( cNextChar != pcNameToQuery[ x ] )
|
|
||||||
{
|
|
||||||
/* Characters didn't match. */
|
|
||||||
xBreakLoop = pdTRUE;
|
|
||||||
}
|
|
||||||
else if( cNextChar == ( char ) 0x00 )
|
|
||||||
{
|
|
||||||
/* Both strings terminated, a match must have been
|
|
||||||
* found. */
|
|
||||||
pxReturn = pxTCB;
|
|
||||||
xBreakLoop = pdTRUE;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mtCOVERAGE_TEST_MARKER();
|
|
||||||
}
|
|
||||||
|
|
||||||
if( xBreakLoop != pdFALSE )
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if( pxReturn != NULL )
|
|
||||||
{
|
|
||||||
/* The handle has been found. */
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mtCOVERAGE_TEST_MARKER();
|
|
||||||
}
|
|
||||||
|
|
||||||
return pxReturn;
|
if( pxReturn != NULL )
|
||||||
|
{
|
||||||
|
/* The handle has been found. */
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif /* #if ( configNUMBER_OF_CORES == 1 ) */
|
else
|
||||||
|
{
|
||||||
|
mtCOVERAGE_TEST_MARKER();
|
||||||
|
}
|
||||||
|
|
||||||
|
return pxReturn;
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* INCLUDE_xTaskGetHandle */
|
#endif /* INCLUDE_xTaskGetHandle */
|
||||||
/*-----------------------------------------------------------*/
|
/*-----------------------------------------------------------*/
|
||||||
@ -6330,30 +6255,27 @@ static void prvCheckTasksWaitingTermination( void )
|
|||||||
List_t * pxList,
|
List_t * pxList,
|
||||||
eTaskState eState )
|
eTaskState eState )
|
||||||
{
|
{
|
||||||
configLIST_VOLATILE TCB_t * pxNextTCB;
|
configLIST_VOLATILE TCB_t * pxTCB;
|
||||||
configLIST_VOLATILE TCB_t * pxFirstTCB;
|
|
||||||
UBaseType_t uxTask = 0;
|
UBaseType_t uxTask = 0;
|
||||||
|
const ListItem_t * pxEndMarker = listGET_END_MARKER( pxList );
|
||||||
|
ListItem_t * pxIterator;
|
||||||
|
|
||||||
if( listCURRENT_LIST_LENGTH( pxList ) > ( UBaseType_t ) 0 )
|
if( listCURRENT_LIST_LENGTH( pxList ) > ( UBaseType_t ) 0 )
|
||||||
{
|
{
|
||||||
/* MISRA Ref 11.5.3 [Void pointer assignment] */
|
|
||||||
/* More details at: https://github.com/FreeRTOS/FreeRTOS-Kernel/blob/main/MISRA.md#rule-115 */
|
|
||||||
/* coverity[misra_c_2012_rule_11_5_violation] */
|
|
||||||
listGET_OWNER_OF_NEXT_ENTRY( pxFirstTCB, pxList );
|
|
||||||
|
|
||||||
/* Populate an TaskStatus_t structure within the
|
/* Populate an TaskStatus_t structure within the
|
||||||
* pxTaskStatusArray array for each task that is referenced from
|
* pxTaskStatusArray array for each task that is referenced from
|
||||||
* pxList. See the definition of TaskStatus_t in task.h for the
|
* pxList. See the definition of TaskStatus_t in task.h for the
|
||||||
* meaning of each TaskStatus_t structure member. */
|
* meaning of each TaskStatus_t structure member. */
|
||||||
do
|
for( pxIterator = listGET_HEAD_ENTRY( pxList ); pxIterator != pxEndMarker; pxIterator = listGET_NEXT( pxIterator ) )
|
||||||
{
|
{
|
||||||
/* MISRA Ref 11.5.3 [Void pointer assignment] */
|
/* MISRA Ref 11.5.3 [Void pointer assignment] */
|
||||||
/* More details at: https://github.com/FreeRTOS/FreeRTOS-Kernel/blob/main/MISRA.md#rule-115 */
|
/* More details at: https://github.com/FreeRTOS/FreeRTOS-Kernel/blob/main/MISRA.md#rule-115 */
|
||||||
/* coverity[misra_c_2012_rule_11_5_violation] */
|
/* coverity[misra_c_2012_rule_11_5_violation] */
|
||||||
listGET_OWNER_OF_NEXT_ENTRY( pxNextTCB, pxList );
|
pxTCB = listGET_LIST_ITEM_OWNER( pxIterator );
|
||||||
vTaskGetInfo( ( TaskHandle_t ) pxNextTCB, &( pxTaskStatusArray[ uxTask ] ), pdTRUE, eState );
|
|
||||||
|
vTaskGetInfo( ( TaskHandle_t ) pxTCB, &( pxTaskStatusArray[ uxTask ] ), pdTRUE, eState );
|
||||||
uxTask++;
|
uxTask++;
|
||||||
} while( pxNextTCB != pxFirstTCB );
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user