Update unpaired critical section in vTaskDelete for readability (#958)
* Modify unpaired critical section for readability
* Move prvDeleteTCB out of critical section for SMP
---------
Signed-off-by: Gaurav Aggarwal <aggarg@amazon.com>
Co-authored-by: Gaurav Aggarwal <aggarg@amazon.com>
diff --git a/tasks.c b/tasks.c
index d00e966..4a640d6 100644
--- a/tasks.c
+++ b/tasks.c
@@ -2190,6 +2190,7 @@
void vTaskDelete( TaskHandle_t xTaskToDelete )
{
TCB_t * pxTCB;
+ BaseType_t xDeleteTCBInIdleTask = pdFALSE;
traceENTER_vTaskDelete( xTaskToDelete );
@@ -2247,6 +2248,9 @@
* portPRE_TASK_DELETE_HOOK() does not return in the Win32 port. */
traceTASK_DELETE( pxTCB );
+ /* Delete the task TCB in idle task. */
+ xDeleteTCBInIdleTask = pdTRUE;
+
/* The pre-delete hook is primarily for the Windows simulator,
* in which Windows specific clean up operations are performed,
* after which it is not possible to yield away from this task -
@@ -2268,61 +2272,56 @@
prvResetNextTaskUnblockTime();
}
}
+ taskEXIT_CRITICAL();
- #if ( configNUMBER_OF_CORES == 1 )
+ /* If the task is not deleting itself, call prvDeleteTCB from outside of
+ * critical section. If a task deletes itself, prvDeleteTCB is called
+ * from prvCheckTasksWaitingTermination which is called from Idle task. */
+ if( xDeleteTCBInIdleTask != pdTRUE )
{
- taskEXIT_CRITICAL();
+ prvDeleteTCB( pxTCB );
+ }
- /* If the task is not deleting itself, call prvDeleteTCB from outside of
- * critical section. If a task deletes itself, prvDeleteTCB is called
- * from prvCheckTasksWaitingTermination which is called from Idle task. */
- if( pxTCB != pxCurrentTCB )
- {
- prvDeleteTCB( pxTCB );
- }
-
- /* Force a reschedule if it is the currently running task that has just
- * been deleted. */
- if( xSchedulerRunning != pdFALSE )
+ /* Force a reschedule if it is the currently running task that has just
+ * been deleted. */
+ if( xSchedulerRunning != pdFALSE )
+ {
+ #if ( configNUMBER_OF_CORES == 1 )
{
if( pxTCB == pxCurrentTCB )
{
configASSERT( uxSchedulerSuspended == 0 );
- portYIELD_WITHIN_API();
+ taskYIELD_WITHIN_API();
}
else
{
mtCOVERAGE_TEST_MARKER();
}
}
- }
- #else /* #if ( configNUMBER_OF_CORES == 1 ) */
- {
- /* If a running task is not deleting itself, call prvDeleteTCB. If a running
- * task deletes itself, prvDeleteTCB is called from prvCheckTasksWaitingTermination
- * which is called from Idle task. */
- if( pxTCB->xTaskRunState == taskTASK_NOT_RUNNING )
+ #else /* #if ( configNUMBER_OF_CORES == 1 ) */
{
- prvDeleteTCB( pxTCB );
- }
-
- /* Force a reschedule if the task that has just been deleted was running. */
- if( ( xSchedulerRunning != pdFALSE ) && ( taskTASK_IS_RUNNING( pxTCB ) == pdTRUE ) )
- {
- if( pxTCB->xTaskRunState == ( BaseType_t ) portGET_CORE_ID() )
+ /* It is important to use critical section here because
+ * checking run state of a task must be done inside a
+ * critical section. */
+ taskENTER_CRITICAL();
{
- configASSERT( uxSchedulerSuspended == 0 );
- vTaskYieldWithinAPI();
+ if( taskTASK_IS_RUNNING( pxTCB ) == pdTRUE )
+ {
+ if( pxTCB->xTaskRunState == ( BaseType_t ) portGET_CORE_ID() )
+ {
+ configASSERT( uxSchedulerSuspended == 0 );
+ taskYIELD_WITHIN_API();
+ }
+ else
+ {
+ prvYieldCore( pxTCB->xTaskRunState );
+ }
+ }
}
- else
- {
- prvYieldCore( pxTCB->xTaskRunState );
- }
+ taskEXIT_CRITICAL();
}
-
- taskEXIT_CRITICAL();
+ #endif /* #if ( configNUMBER_OF_CORES == 1 ) */
}
- #endif /* #if ( configNUMBER_OF_CORES == 1 ) */
traceRETURN_vTaskDelete();
}
