len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-12-11 14:15:12 -05:00
Code Issues Projects Releases Packages Wiki Activity

Added states list to lock invariant.

Browse source
This commit is contained in:
Tobias Reinhard 2022-12-03 10:04:04 -05:00
parent e4db1f8aba
commit dda2dbda6f
3 changed files with 37 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tasks.c
View file

@ -988,7 +988,7 @@ static void prvYieldForTask( TCB_t * pxTCB,
#endif
//@ open taskISRLockInv_p();
//@ assert( exists_in_taskISRLockInv_p(?gTasks) );
//@ assert( exists_in_taskISRLockInv_p(?gTasks, ?gStates) );
//@ open readyLists_p(?gCellLists, ?gOwnerLists);
//@ List_array_p_index_within_limits(&pxReadyTasksLists, uxCurrentPriority);
@ -1052,10 +1052,14 @@ static void prvYieldForTask( TCB_t * pxTCB,
xLIST(gReadyList, gSize, gIndex, gEnd, gCells, gVals, gOwners) &*&
gSize > 0 &*&
// Read permissions for every task
foreach(gTasks, readOnly_sharedSeg_TCB_p)
foreach(gTasks, readOnly_sharedSeg_TCB_p(gTasks, gStates))
&*&
// Write permission for task scheduled on this core
[1/2]sharedSeg_TCB_p(gCurrentTCB)
[1/2]sharedSeg_TCB_p(gCurrentTCB, ?gCurrentTCB_state)
&*&
// TODO:
// Write permissions for unscheduled tasks
true
&*&
subset(gOwners, gTasks) == true;
@ -1107,7 +1111,6 @@ static void prvYieldForTask( TCB_t * pxTCB,
//@ assert( subset(gOwners, gTasks) == true );
//@ mem_subset(pxTCB, gOwners, gTasks);
//@ foreach_remove(pxTCB, gTasks);
//@ open sharedSeg_TCB_p(pxTCB);
/*debug_printf("Attempting to schedule %s on core %d\n", pxTCB->pcTaskName, portGET_CORE_ID() ); */
@ -1134,7 +1137,7 @@ static void prvYieldForTask( TCB_t * pxTCB,
#endif
#endif
{
//@ assert( foreach(remove(pxTCB, gTasks), readOnly_sharedSeg_TCB_p) );
//@ assert( foreach(remove(pxTCB, gTasks), readOnly_sharedSeg_TCB_p(gTasks, gStates)) );
//@ assert( gCurrentTCB == pxCurrentTCBs[ xCoreID ] );
/*@
if( gCurrentTCB == pxTCB ) {
@ -1168,7 +1171,7 @@ static void prvYieldForTask( TCB_t * pxTCB,
// Ensure we restored the collection as it was
// at the beginning of the block.
//@ assert( foreach(remove(pxTCB, gTasks), readOnly_sharedSeg_TCB_p) );
//@ assert( foreach(remove(pxTCB, gTasks), readOnly_sharedSeg_TCB_p(gTasks, gStates)) );
}
}
else if( pxTCB == pxCurrentTCBs[ xCoreID ] )