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

Jump to bottom

Duplicate #625 : Fix xTaskNotifyWait & ulTaskNotifyTake determinism #719

Closed
wants to merge 7 commits into from
Closed

Duplicate #625 : Fix xTaskNotifyWait & ulTaskNotifyTake determinism #719

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
883b0eb
update task notification as PR#625
kar-rahul-aws Jul 24, 2023
391bfe2
Merge branch 'main' into pr_625
kar-rahul-aws Jul 24, 2023
f25364d
Fix build errors
kar-rahul-aws Jul 24, 2023
0e8c657
Merge branch 'main' into pr_625
kar-rahul-aws Jul 26, 2023
117cc21
Merge branch 'main' into pr_625
kar-rahul-aws Jul 27, 2023
afdad43
Merge branch 'main' into pr_625
kar-rahul-aws Aug 7, 2023
8ea0208
Merge branch 'main' into pr_625
kar-rahul-aws Sep 25, 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
100 changes: 48 additions & 52 deletions tasks.c
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4890,8 +4890,8 @@ void vTaskPlaceOnEventList( List_t * const pxEventList,

configASSERT( pxEventList );

/* THIS FUNCTION MUST BE CALLED WITH EITHER INTERRUPTS DISABLED OR THE
* SCHEDULER SUSPENDED AND THE QUEUE BEING ACCESSED LOCKED. */
/* THIS FUNCTION MUST BE CALLED WITH THE SCHEDULER SUSPENDED AND THE QUEUE
* BEING ACCESSED LOCKED. */

/* Place the event list item of the TCB in the appropriate event list.
* This is placed in the list in priority order so the highest priority task
Expand Down Expand Up @@ -7101,31 +7101,26 @@ TickType_t uxTaskResetEventItemValue( void )
configASSERT( uxIndexToWaitOn < configTASK_NOTIFICATION_ARRAY_ENTRIES );

taskENTER_CRITICAL();

/* Only block if the notification count is not already non-zero. */
if( pxCurrentTCB->ulNotifiedValue[ uxIndexToWaitOn ] == 0UL )
{
/* Only block if the notification count is not already non-zero. */
if( pxCurrentTCB->ulNotifiedValue[ uxIndexToWaitOn ] == 0UL )
/* Mark this task as waiting for a notification. */
pxCurrentTCB->ucNotifyState[ uxIndexToWaitOn ] = taskWAITING_NOTIFICATION;

if( xTicksToWait > ( TickType_t ) 0 )
{
/* Mark this task as waiting for a notification. */
pxCurrentTCB->ucNotifyState[ uxIndexToWaitOn ] = taskWAITING_NOTIFICATION;
traceTASK_NOTIFY_TAKE_BLOCK( uxIndexToWaitOn );

if( xTicksToWait > ( TickType_t ) 0 )
{
prvAddCurrentTaskToDelayedList( xTicksToWait, pdTRUE );
traceTASK_NOTIFY_TAKE_BLOCK( uxIndexToWaitOn );
/* Suspend the scheduler before enabling interrupts. */
vTaskSuspendAll();
taskEXIT_CRITICAL();

/* All ports are written to allow a yield in a critical
* 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
prvAddCurrentTaskToDelayedList( xTicksToWait, pdTRUE );

if( xTaskResumeAll() == pdFALSE )
{
portYIELD_WITHIN_API();
}
else
{
Expand All @@ -7134,10 +7129,13 @@ TickType_t uxTaskResetEventItemValue( void )
}
else
{
mtCOVERAGE_TEST_MARKER();
taskEXIT_CRITICAL();
}
}
taskEXIT_CRITICAL();
else
{
taskEXIT_CRITICAL();
}

taskENTER_CRITICAL();
{
Expand Down Expand Up @@ -7187,36 +7185,31 @@ TickType_t uxTaskResetEventItemValue( void )
configASSERT( uxIndexToWaitOn < configTASK_NOTIFICATION_ARRAY_ENTRIES );

taskENTER_CRITICAL();

/* Only block if a notification is not already pending. */
if( pxCurrentTCB->ucNotifyState[ uxIndexToWaitOn ] != taskNOTIFICATION_RECEIVED )
{
/* Only block if a notification is not already pending. */
if( pxCurrentTCB->ucNotifyState[ uxIndexToWaitOn ] != taskNOTIFICATION_RECEIVED )
/* Clear bits in the task's notification value as bits may get
* set by the notifying task or interrupt. This can be used to
* clear the value to zero. */
pxCurrentTCB->ulNotifiedValue[ uxIndexToWaitOn ] &= ~ulBitsToClearOnEntry;

/* Mark this task as waiting for a notification. */
pxCurrentTCB->ucNotifyState[ uxIndexToWaitOn ] = taskWAITING_NOTIFICATION;

if( xTicksToWait > ( TickType_t ) 0 )
{
/* Clear bits in the task's notification value as bits may get
* set by the notifying task or interrupt. This can be used to
* clear the value to zero. */
pxCurrentTCB->ulNotifiedValue[ uxIndexToWaitOn ] &= ~ulBitsToClearOnEntry;
traceTASK_NOTIFY_WAIT_BLOCK( uxIndexToWaitOn );

/* Mark this task as waiting for a notification. */
pxCurrentTCB->ucNotifyState[ uxIndexToWaitOn ] = taskWAITING_NOTIFICATION;
/* Suspend the scheduler before enabling interrupts. */
vTaskSuspendAll();
taskEXIT_CRITICAL();

if( xTicksToWait > ( TickType_t ) 0 )
{
prvAddCurrentTaskToDelayedList( xTicksToWait, pdTRUE );
traceTASK_NOTIFY_WAIT_BLOCK( uxIndexToWaitOn );
prvAddCurrentTaskToDelayedList( xTicksToWait, pdTRUE );

/* All ports are written to allow a yield in a critical
* 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
if( xTaskResumeAll() == pdFALSE )
{
portYIELD_WITHIN_API();
}
else
{
Expand All @@ -7225,10 +7218,13 @@ TickType_t uxTaskResetEventItemValue( void )
}
else
{
mtCOVERAGE_TEST_MARKER();
taskEXIT_CRITICAL();
}
}
taskEXIT_CRITICAL();
else
{
taskEXIT_CRITICAL();
}

taskENTER_CRITICAL();
{
Expand Down
Loading