len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-06-07 04:49:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(freertos/smp): Move critical sections inside xTaskPriorityInherit()

Browse source 
xTaskPriorityInherit() is called inside a critical section from queue.c. This
commit moves the critical section into xTaskPriorityInherit().

Co-authored-by: Sudeep Mohanty <sudeep.mohanty@espressif.com>
This commit is contained in:
Darian Leung 2024-06-16 00:31:09 +08:00 committed by Sudeep Mohanty
parent 0030d609a4
commit a6d6d1220f
2 changed files with 67 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
queue.c
View file

@ -1792,13 +1792,9 @@ BaseType_t xQueueSemaphoreTake( QueueHandle_t xQueue,
#if ( configUSE_MUTEXES == 1 ) #if ( configUSE_MUTEXES == 1 )
{ {
if( pxQueue->uxQueueType == queueQUEUE_IS_MUTEX ) if( pxQueue->uxQueueType == queueQUEUE_IS_MUTEX )
{
taskENTER_CRITICAL();
{ {
xInheritanceOccurred = xTaskPriorityInherit( pxQueue->u.xSemaphore.xMutexHolder ); xInheritanceOccurred = xTaskPriorityInherit( pxQueue->u.xSemaphore.xMutexHolder );
} }
taskEXIT_CRITICAL();
}
else else
{ {
mtCOVERAGE_TEST_MARKER(); mtCOVERAGE_TEST_MARKER();

4
tasks.c
View file

@ -6643,6 +6643,8 @@ static void prvResetNextTaskUnblockTime( void )
traceENTER_xTaskPriorityInherit( pxMutexHolder ); traceENTER_xTaskPriorityInherit( pxMutexHolder );
taskENTER_CRITICAL();
{
/* If the mutex is taken by an interrupt, the mutex holder is NULL. Priority /* If the mutex is taken by an interrupt, the mutex holder is NULL. Priority
* inheritance is not applied in this scenario. */ * inheritance is not applied in this scenario. */
if( pxMutexHolder != NULL ) if( pxMutexHolder != NULL )
@ -6728,6 +6730,8 @@ static void prvResetNextTaskUnblockTime( void )
{ {
mtCOVERAGE_TEST_MARKER(); mtCOVERAGE_TEST_MARKER();
} }
}
taskEXIT_CRITICAL();
traceRETURN_xTaskPriorityInherit( xReturn ); traceRETURN_xTaskPriorityInherit( xReturn );