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

Update the uxSchedulerSuspended after prvCheckForRunStateChange #62

Merged
merged 2 commits into from
Apr 24, 2023
Merged

Update the uxSchedulerSuspended after prvCheckForRunStateChange #62

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88674cb
Update the uxSchedulerSuspended after prvCheckForRunStateChange
chinglee-iot Jan 30, 2023
6cbb783
Merge branch 'smp-dev-complete-merge-candidate-history' into update-i…
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
34 changes: 15 additions & 19 deletions tasks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,6 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB ) PRIVILEGED_FUNCTION;
static void prvCheckForRunStateChange( void )
{
UBaseType_t uxPrevCriticalNesting;
UBaseType_t uxPrevSchedulerSuspended;
TCB_t * pxThisTCB;

/* This should be skipped if called from an ISR. If the task on the current
Expand All @@ -705,24 +704,19 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB ) PRIVILEGED_FUNCTION;
* and reacquire the correct locks. And then, do it all over again
* if our state changed again during the reacquisition. */
uxPrevCriticalNesting = portGET_CRITICAL_NESTING_COUNT();
uxPrevSchedulerSuspended = uxSchedulerSuspended;

/* This must only be called the first time we enter into a critical
* section, otherwise it could context switch in the middle of a
* critical section. */
configASSERT( ( uxPrevCriticalNesting + uxPrevSchedulerSuspended ) == 1U );

if( uxPrevCriticalNesting > 0U )
{
portSET_CRITICAL_NESTING_COUNT( 0U );
portRELEASE_ISR_LOCK();
}
else
{
portGET_ISR_LOCK();
uxSchedulerSuspended = 0U;
/* The scheduler is suspended. uxSchedulerSuspended is updated
* only when the task is not requested to yield. */
mtCOVERAGE_TEST_MARKER();
}

portRELEASE_ISR_LOCK();
portRELEASE_TASK_LOCK();

portMEMORY_BARRIER();
Expand All @@ -740,11 +734,9 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB ) PRIVILEGED_FUNCTION;
portGET_ISR_LOCK();

portSET_CRITICAL_NESTING_COUNT( uxPrevCriticalNesting );
uxSchedulerSuspended = uxPrevSchedulerSuspended;

if( uxPrevCriticalNesting == 0U )
{
/* uxPrevSchedulerSuspended must be 1. */
portRELEASE_ISR_LOCK();
}
}
Expand Down Expand Up @@ -3370,14 +3362,11 @@ void vTaskSuspendAll( void )
portSOFTWARE_BARRIER();

portGET_TASK_LOCK();
portGET_ISR_LOCK();

/* The scheduler is suspended if uxSchedulerSuspended is non-zero. An increment
* is used to allow calls to vTaskSuspendAll() to nest. */
++uxSchedulerSuspended;
portRELEASE_ISR_LOCK();

if( uxSchedulerSuspended == 1U )
/* uxSchedulerSuspended is increased after prvCheckForRunStateChange. The
* purpose is to prevent altering the variable when fromISR APIs are readying
* it. */
if( uxSchedulerSuspended == 0U )
{
if( portGET_CRITICAL_NESTING_COUNT() == 0U )
{
Expand All @@ -3393,6 +3382,13 @@ void vTaskSuspendAll( void )
mtCOVERAGE_TEST_MARKER();
}

portGET_ISR_LOCK();

/* The scheduler is suspended if uxSchedulerSuspended is non-zero. An increment
* is used to allow calls to vTaskSuspendAll() to nest. */
++uxSchedulerSuspended;
portRELEASE_ISR_LOCK();

portCLEAR_INTERRUPT_MASK( ulState );
}
else
Expand Down