Skip to content

Add configUSE_CORE_AFFINITY bits check #776

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

Merged
merged 11 commits into from
Sep 6, 2023
Merged

Add configUSE_CORE_AFFINITY bits check #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
39bdd2a
Add core affinity bits check
chinglee-iot Sep 4, 2023
3281799
Merge branch 'main' into add-core-affinity-bits-check
chinglee-iot Sep 4, 2023
02f05f3
Add taskBITS_PER_BYTES
chinglee-iot Sep 6, 2023
e4c1306
Merge branch 'add-core-affinity-bits-check' of https://github.com/chi…
chinglee-iot Sep 6, 2023
692d238
Update comment
chinglee-iot Sep 6, 2023
499dee2
Reverse condition order
chinglee-iot Sep 6, 2023
eb9ec69
Add number of cores check
chinglee-iot Sep 6, 2023
60f7acd
Fix typo
chinglee-iot Sep 6, 2023
ed4d1b3
Merge branch 'main' into add-core-affinity-bits-check
chinglee-iot Sep 6, 2023
cf47de4
Merge branch 'main' into add-core-affinity-bits-check
chinglee-iot Sep 6, 2023
f6826c8
Merge branch 'main' into add-core-affinity-bits-check
chinglee-iot Sep 6, 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
4 changes: 4 additions & 0 deletions include/FreeRTOS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1165,6 +1165,10 @@
#error configUSE_TASK_PREEMPTION_DISABLE is not supported in single core FreeRTOS
#endif

#if ( ( configNUMBER_OF_CORES == 1 ) && ( configUSE_CORE_AFFINITY != 0 ) )
#error configUSE_CORE_AFFINITY is not supported in single core FreeRTOS
#endif

#if ( ( configNUMBER_OF_CORES > 1 ) && ( configUSE_PORT_OPTIMISED_TASK_SELECTION != 0 ) )
#error configUSE_PORT_OPTIMISED_TASK_SELECTION is not supported in SMP FreeRTOS
#endif
Expand Down
12 changes: 11 additions & 1 deletion tasks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,8 @@
#define INFINITE_LOOP() 1
#endif

#define taskBITS_PER_BYTE ( ( size_t ) 8 )

/*
* Task control block. A task control block (TCB) is allocated for each task,
* and stores task state information, including a pointer to the task's context
Expand All @@ -302,7 +304,7 @@ typedef struct tskTaskControlBlock /* The old naming convention is used to
#endif

#if ( configUSE_CORE_AFFINITY == 1 ) && ( configNUMBER_OF_CORES > 1 )
UBaseType_t uxCoreAffinityMask; /*< Used to link the task to certain cores. UBaseType_t must have greater than or equal to the number of bits as confNUM_CORES. */
UBaseType_t uxCoreAffinityMask; /**< Used to link the task to certain cores. UBaseType_t must have greater than or equal to the number of bits as configNUMBER_OF_CORES. */
#endif

ListItem_t xStateListItem; /**< The list that the state list item of a task is reference from denotes the state of that task (Ready, Blocked, Suspended ). */
Expand Down Expand Up @@ -3249,6 +3251,14 @@ void vTaskStartScheduler( void )
{
BaseType_t xReturn;

#if ( configUSE_CORE_AFFINITY == 1 ) && ( configNUMBER_OF_CORES > 1 )
{
/* Sanity check that the UBaseType_t must have greater than or equal to
* the number of bits as confNUMBER_OF_CORES. */
configASSERT( ( sizeof( UBaseType_t ) * taskBITS_PER_BYTE ) >= configNUMBER_OF_CORES );
}
#endif /* #if ( configUSE_CORE_AFFINITY == 1 ) && ( configNUMBER_OF_CORES > 1 ) */

xReturn = prvCreateIdleTasks();

#if ( configUSE_TIMERS == 1 )
Expand Down