Skip to content

Add pxCurrentTCBs for multiple cores #3

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

Closed
wants to merge 5 commits into from
Closed

Add pxCurrentTCBs for multiple cores #3

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c4513f
Add pxCurrentTCBs for multiple cores
chinglee-iot Jun 1, 2022
8eb6a93
Add un-supported compile error for SMP
chinglee-iot Jun 1, 2022
b53c762
Revert back single core macro
chinglee-iot Jun 2, 2022
c59cabd
Update the prvSelectHighestPriorityTask temporary implementation
chinglee-iot Jun 2, 2022
72b11dd
Merge branch 'smp-xTaskRunState' into smp-pxCurrentTCBs
chinglee-iot Sep 21, 2022
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
130 changes: 100 additions & 30 deletions tasks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,22 +137,26 @@

/*-----------------------------------------------------------*/

#define taskSELECT_HIGHEST_PRIORITY_TASK() \
{ \
UBaseType_t uxTopPriority = uxTopReadyPriority; \
\
/* Find the highest priority queue that contains ready tasks. */ \
while( listLIST_IS_EMPTY( &( pxReadyTasksLists[ uxTopPriority ] ) ) ) \
{ \
configASSERT( uxTopPriority ); \
--uxTopPriority; \
} \
\
/* listGET_OWNER_OF_NEXT_ENTRY indexes through the list, so the tasks of \
* the same priority get an equal share of the processor time. */ \
listGET_OWNER_OF_NEXT_ENTRY( pxCurrentTCB, &( pxReadyTasksLists[ uxTopPriority ] ) ); \
uxTopReadyPriority = uxTopPriority; \
} /* taskSELECT_HIGHEST_PRIORITY_TASK */
#if ( configNUM_CORES == 1 )
#define taskSELECT_HIGHEST_PRIORITY_TASK() \
{ \
UBaseType_t uxTopPriority = uxTopReadyPriority; \
\
/* Find the highest priority queue that contains ready tasks. */ \
while( listLIST_IS_EMPTY( &( pxReadyTasksLists[ uxTopPriority ] ) ) ) \
{ \
configASSERT( uxTopPriority ); \
--uxTopPriority; \
} \
\
/* listGET_OWNER_OF_NEXT_ENTRY indexes through the list, so the tasks of \
* the same priority get an equal share of the processor time. */ \
listGET_OWNER_OF_NEXT_ENTRY( pxCurrentTCB, &( pxReadyTasksLists[ uxTopPriority ] ) ); \
uxTopReadyPriority = uxTopPriority; \
} /* taskSELECT_HIGHEST_PRIORITY_TASK */
#else
#define taskSELECT_HIGHEST_PRIORITY_TASK prvSelectHighestPriorityTask
#endif

/*-----------------------------------------------------------*/

Expand All @@ -164,6 +168,10 @@

#else /* configUSE_PORT_OPTIMISED_TASK_SELECTION */

#if ( configNUM_CORES > 1 )
#error configUSE_PORT_OPTIMISED_TASK_SELECTION not yet supported in SMP
#endif

/* If configUSE_PORT_OPTIMISED_TASK_SELECTION is 1 then task selection is
* performed in a way that is tailored to the particular microcontroller
* architecture being used. */
Expand Down Expand Up @@ -359,7 +367,12 @@ typedef tskTCB TCB_t;

/*lint -save -e956 A manual analysis and inspection has been used to determine
* which static variables must be declared volatile. */
PRIVILEGED_DATA TCB_t * volatile pxCurrentTCB = NULL;
#if ( configNUM_CORES == 1 )
PRIVILEGED_DATA TCB_t * volatile pxCurrentTCB = NULL;
#else
PRIVILEGED_DATA TCB_t * volatile pxCurrentTCBs[ configNUM_CORES ] = { NULL };
#define pxCurrentTCB xTaskGetCurrentTaskHandle()
#endif

/* Lists for ready and blocked tasks. --------------------
* xDelayedTaskList1 and xDelayedTaskList2 could be moved to function scope but
Expand Down Expand Up @@ -433,6 +446,11 @@ PRIVILEGED_DATA static volatile UBaseType_t uxSchedulerSuspended = ( UBaseType_t

/* File private functions. --------------------------------*/

/*
* Selects the highest priority available task
*/
static BaseType_t prvSelectHighestPriorityTask( void );

/**
* Utility task that simply returns pdTRUE if the task referenced by xTask is
* currently in the Suspended state, or pdFALSE if the task referenced by xTask
Expand Down Expand Up @@ -594,6 +612,29 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB ) PRIVILEGED_FUNCTION;

/*-----------------------------------------------------------*/

/* SMP_TODO : This is a temporay implementation for compilation.
* Update this function in another commit. */
#if ( configUSE_PORT_OPTIMISED_TASK_SELECTION == 0 ) && ( configNUM_CORES > 1 )
static BaseType_t prvSelectHighestPriorityTask( void )
{
UBaseType_t uxTopPriority = uxTopReadyPriority;

/* Find the highest priority queue that contains ready tasks. */
while( listLIST_IS_EMPTY( &( pxReadyTasksLists[ uxTopPriority ] ) ) )
{
configASSERT( uxTopPriority );
--uxTopPriority;
}

/* listGET_OWNER_OF_NEXT_ENTRY indexes through the list, so the tasks of
* the same priority get an equal share of the processor time. */
listGET_OWNER_OF_NEXT_ENTRY( pxCurrentTCBs[ portGET_CORE_ID() ], &( pxReadyTasksLists[ uxTopPriority ] ) );
uxTopReadyPriority = uxTopPriority;
}
#endif

/*-----------------------------------------------------------*/

#if ( configSUPPORT_STATIC_ALLOCATION == 1 )

TaskHandle_t xTaskCreateStatic( TaskFunction_t pxTaskCode,
Expand Down Expand Up @@ -1087,7 +1128,12 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB )
{
/* There are no other tasks, or all the other tasks are in
* the suspended state - make this the current task. */
pxCurrentTCB = pxNewTCB;
/* SMP_TODO : fix this in other PR. */
#if ( configNUM_CORES == 1 )
pxCurrentTCB = pxNewTCB;
#else
pxCurrentTCBs[ portGET_CORE_ID() ] = pxNewTCB;
#endif

if( uxCurrentNumberOfTasks == ( UBaseType_t ) 1 )
{
Expand All @@ -1110,7 +1156,12 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB )
{
if( pxCurrentTCB->uxPriority <= pxNewTCB->uxPriority )
{
pxCurrentTCB = pxNewTCB;
/* SMP_TODO : fix this in other PR. */
#if ( configNUM_CORES == 1 )
pxCurrentTCB = pxNewTCB;
#else
pxCurrentTCBs[ portGET_CORE_ID() ] = pxNewTCB;
#endif
}
else
{
Expand Down Expand Up @@ -1809,7 +1860,12 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB )
* NULL so when the next task is created pxCurrentTCB will
* be set to point to it no matter what its relative priority
* is. */
pxCurrentTCB = NULL;
/* SMP_TODO : fix this in other PR. */
#if ( configNUM_CORES == 1 )
pxCurrentTCB = NULL;
#else
pxCurrentTCBs[ portGET_CORE_ID() ] = NULL;
#endif
}
else
{
Expand Down Expand Up @@ -4079,19 +4135,33 @@ static void prvResetNextTaskUnblockTime( void )
}
/*-----------------------------------------------------------*/

#if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_MUTEXES == 1 ) )
#if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_MUTEXES == 1 ) ) || ( configNUM_CORES > 1 )

TaskHandle_t xTaskGetCurrentTaskHandle( void )
{
TaskHandle_t xReturn;
#if ( configNUM_CORES == 1 )
TaskHandle_t xTaskGetCurrentTaskHandle( void )
{
TaskHandle_t xReturn;

/* A critical section is not required as this is not called from
* an interrupt and the current TCB will always be the same for any
* individual execution thread. */
xReturn = pxCurrentTCB;
/* A critical section is not required as this is not called from
* an interrupt and the current TCB will always be the same for any
* individual execution thread. */
xReturn = pxCurrentTCB;

return xReturn;
}
return xReturn;
}
#else
/* SMP_TODO : Fix the interrupt macro in another commit. */
TaskHandle_t xTaskGetCurrentTaskHandle( void )
{
TaskHandle_t xReturn;

portDISABLE_INTERRUPTS();
xReturn = pxCurrentTCBs[ portGET_CORE_ID() ];
portENABLE_INTERRUPTS();

return xReturn;
}
#endif

#endif /* ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_MUTEXES == 1 ) ) */
/*-----------------------------------------------------------*/
Expand Down