Skip to content

Add taskYIELD_WITHIN_API macro #782

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 14 commits into from
Oct 4, 2023
Merged

Add taskYIELD_WITHIN_API macro #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8e898b7
Add macro taskTASK_IS_RUNNING_OR_YIELDING
chinglee-iot Sep 5, 2023
ea9a44f
Add yield within API macro
chinglee-iot Sep 5, 2023
3884ce6
Revert "Add macro taskTASK_IS_RUNNING_OR_YIELDING"
chinglee-iot Sep 6, 2023
b148776
Merge branch 'main' into add-yield-within-api-macro
chinglee-iot Sep 6, 2023
df3e8a6
Merge branch 'main' into add-yield-within-api-macro
chinglee-iot Sep 6, 2023
8120fef
Merge branch 'main' into add-yield-within-api-macro
chinglee-iot Sep 6, 2023
ae48454
Use taskYIELD_WITHIN_API in all files
chinglee-iot Sep 6, 2023
49504b8
Merge branch 'add-yield-within-api-macro' of https://github.com/ching…
chinglee-iot Sep 6, 2023
115a46f
Merge branch 'main' into add-yield-within-api-macro
chinglee-iot Sep 6, 2023
f22ad28
Merge branch 'main' into add-yield-within-api-macro
chinglee-iot Sep 6, 2023
8918f78
Merge branch 'main' into add-yield-within-api-macro
chinglee-iot Sep 18, 2023
71fc29e
Merge branch 'main' into add-yield-within-api-macro
chinglee-iot Sep 25, 2023
69c37ea
Merge branch 'main' into add-yield-within-api-macro
kar-rahul-aws Sep 26, 2023
1cece70
Merge branch 'main' into add-yield-within-api-macro
aggarg Oct 4, 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
20 changes: 2 additions & 18 deletions event_groups.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,15 +253,7 @@ EventBits_t xEventGroupSync( EventGroupHandle_t xEventGroup,
{
if( xAlreadyYielded == pdFALSE )
{
#if ( configNUMBER_OF_CORES == 1 )
{
portYIELD_WITHIN_API();
}
#else /* #if ( configNUMBER_OF_CORES == 1 ) */
{
vTaskYieldWithinAPI();
}
#endif /* #if ( configNUMBER_OF_CORES == 1 ) */
taskYIELD_WITHIN_API();
}
else
{
Expand Down Expand Up @@ -417,15 +409,7 @@ EventBits_t xEventGroupWaitBits( EventGroupHandle_t xEventGroup,
{
if( xAlreadyYielded == pdFALSE )
{
#if ( configNUMBER_OF_CORES == 1 )
{
portYIELD_WITHIN_API();
}
#else /* #if ( configNUMBER_OF_CORES == 1 ) */
{
vTaskYieldWithinAPI();
}
#endif /* #if ( configNUMBER_OF_CORES == 1 ) */
taskYIELD_WITHIN_API();
}
else
{
Expand Down
6 changes: 6 additions & 0 deletions include/task.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3330,6 +3330,12 @@ BaseType_t xTaskCatchUpTicks( TickType_t xTicksToCatchUp ) PRIVILEGED_FUNCTION;
* SCHEDULER INTERNALS AVAILABLE FOR PORTING PURPOSES
*----------------------------------------------------------*/

#if ( configNUMBER_OF_CORES == 1 )
#define taskYIELD_WITHIN_API() portYIELD_WITHIN_API()
#else /* #if ( configNUMBER_OF_CORES == 1 ) */
#define taskYIELD_WITHIN_API() vTaskYieldWithinAPI()
#endif /* #if ( configNUMBER_OF_CORES == 1 ) */

/*
* THIS FUNCTION MUST NOT BE USED FROM APPLICATION CODE. IT IS ONLY
* INTENDED FOR USE WHEN IMPLEMENTING A PORT OF THE SCHEDULER AND IS
Expand Down
40 changes: 4 additions & 36 deletions queue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,15 +1129,7 @@ BaseType_t xQueueGenericSend( QueueHandle_t xQueue,
* is also a higher priority task in the pending ready list. */
if( xTaskResumeAll() == pdFALSE )
{
#if ( configNUMBER_OF_CORES == 1 )
{
portYIELD_WITHIN_API();
}
#else /* #if ( configNUMBER_OF_CORES == 1 ) */
{
vTaskYieldWithinAPI();
}
#endif /* #if ( configNUMBER_OF_CORES == 1 ) */
taskYIELD_WITHIN_API();
}
}
else
Expand Down Expand Up @@ -1616,15 +1608,7 @@ BaseType_t xQueueReceive( QueueHandle_t xQueue,

if( xTaskResumeAll() == pdFALSE )
{
#if ( configNUMBER_OF_CORES == 1 )
{
portYIELD_WITHIN_API();
}
#else /* #if ( configNUMBER_OF_CORES == 1 ) */
{
vTaskYieldWithinAPI();
}
#endif /* #if ( configNUMBER_OF_CORES == 1 ) */
taskYIELD_WITHIN_API();
}
else
{
Expand Down Expand Up @@ -1817,15 +1801,7 @@ BaseType_t xQueueSemaphoreTake( QueueHandle_t xQueue,

if( xTaskResumeAll() == pdFALSE )
{
#if ( configNUMBER_OF_CORES == 1 )
{
portYIELD_WITHIN_API();
}
#else /* #if ( configNUMBER_OF_CORES == 1 ) */
{
vTaskYieldWithinAPI();
}
#endif /* #if ( configNUMBER_OF_CORES == 1 ) */
taskYIELD_WITHIN_API();
}
else
{
Expand Down Expand Up @@ -2013,15 +1989,7 @@ BaseType_t xQueuePeek( QueueHandle_t xQueue,

if( xTaskResumeAll() == pdFALSE )
{
#if ( configNUMBER_OF_CORES == 1 )
{
portYIELD_WITHIN_API();
}
#else /* #if ( configNUMBER_OF_CORES == 1 ) */
{
vTaskYieldWithinAPI();
}
#endif /* #if ( configNUMBER_OF_CORES == 1 ) */
taskYIELD_WITHIN_API();
}
else
{
Expand Down
32 changes: 4 additions & 28 deletions tasks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2195,11 +2195,7 @@ static void prvInitialiseNewTask( TaskFunction_t pxTaskCode,
* have put ourselves to sleep. */
if( xAlreadyYielded == pdFALSE )
{
#if ( configNUMBER_OF_CORES == 1 )
portYIELD_WITHIN_API();
#else
vTaskYieldWithinAPI();
#endif
taskYIELD_WITHIN_API();
}
else
{
Expand Down Expand Up @@ -2251,11 +2247,7 @@ static void prvInitialiseNewTask( TaskFunction_t pxTaskCode,
* have put ourselves to sleep. */
if( xAlreadyYielded == pdFALSE )
{
#if ( configNUMBER_OF_CORES == 1 )
portYIELD_WITHIN_API();
#else
vTaskYieldWithinAPI();
#endif
taskYIELD_WITHIN_API();
}
else
{
Expand Down Expand Up @@ -7253,15 +7245,7 @@ TickType_t uxTaskResetEventItemValue( void )
* section (some will yield immediately, others wait until the
* critical section exits) - but it is not something that
* application code should ever do. */
#if ( configNUMBER_OF_CORES == 1 )
{
portYIELD_WITHIN_API();
}
#else
{
vTaskYieldWithinAPI();
}
#endif
taskYIELD_WITHIN_API();
}
else
{
Expand Down Expand Up @@ -7344,15 +7328,7 @@ TickType_t uxTaskResetEventItemValue( void )
* section (some will yield immediately, others wait until the
* critical section exits) - but it is not something that
* application code should ever do. */
#if ( configNUMBER_OF_CORES == 1 )
{
portYIELD_WITHIN_API();
}
#else
{
vTaskYieldWithinAPI();
}
#endif
taskYIELD_WITHIN_API();
}
else
{
Expand Down
10 changes: 1 addition & 9 deletions timers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,15 +771,7 @@
* block time to expire. If a command arrived between the
* critical section being exited and this yield then the yield
* will not cause the task to block. */
#if ( configNUMBER_OF_CORES == 1 )
{
portYIELD_WITHIN_API();
}
#else /* #if ( configNUMBER_OF_CORES == 1 ) */
{
vTaskYieldWithinAPI();
}
#endif /* #if ( configNUMBER_OF_CORES == 1 ) */
taskYIELD_WITHIN_API();
}
else
{
Expand Down