Skip to content

Commit

Permalink
Pend a yield in portPRE_TASK_DELETE_HOOK (#1132)
Browse files Browse the repository at this point in the history
When a task deletes itself, it calls portPRE_TASK_DELETE_HOOK which
translates to vPortCloseRunningThread on the Windows port.
vPortCloseRunningThread never returns and as a result,
taskYIELD_WITHIN_API in vTaskDelete does not get called. As a result,
the next task is not scheduled when configUSE_PREEMPTION is set to 0.

This change records that a yield is pending so that the next tick
interrupt switches out the task that was deleted.

Signed-off-by: Gaurav Aggarwal <aggarg@amazon.com>
  • Loading branch information
aggarg committed Aug 29, 2024
1 parent e6d8308 commit 6dab25a
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions portable/MSVC-MingW/port.c
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,20 @@ void vPortCloseRunningThread( void * pvTaskToDelete,
/* This is called from a critical section, which must be exited before the
* thread stops. */
taskEXIT_CRITICAL();

/* Record that a yield is pending so that the next tick interrupt switches
* out this thread regardless of the value of configUSE_PREEMPTION. This is
* needed when a task deletes itself - the taskYIELD_WITHIN_API within
* vTaskDelete does not get called because this function never returns. If
* we do not pend portINTERRUPT_YIELD here, the next task is not scheduled
* when configUSE_PREEMPTION is set to 0. */
if( pvInterruptEventMutex != NULL )
{
WaitForSingleObject( pvInterruptEventMutex, INFINITE );
ulPendingInterrupts |= ( 1 << portINTERRUPT_YIELD );
ReleaseMutex( pvInterruptEventMutex );
}

CloseHandle( pxThreadState->pvYieldEvent );
ExitThread( 0 );
}
Expand Down

0 comments on commit 6dab25a

Please sign in to comment.