RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

score: Fix EDF SMP scheduler

Browse Source 
Fix a special case: block a one-to-one scheduled thread while having a
non-empty affine ready queue on the same processor.
This commit is contained in:
Sebastian Huber
2018-09-03 08:12:35 +02:00
parent 3aad9d9b08
commit e0a9336bf9
2 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cpukit/score/src/scheduleredfsmp.c
View File

@@ -276,6 +276,29 @@ static inline void _Scheduler_EDF_SMP_Insert_ready(
}
}
static inline void _Scheduler_EDF_SMP_Extract_from_scheduled(
Scheduler_Context *context,
Scheduler_Node *node_to_extract
)
{
Scheduler_EDF_SMP_Context *self;
Scheduler_EDF_SMP_Node *node;
uint8_t rqi;
Scheduler_EDF_SMP_Ready_queue *ready_queue;
self = _Scheduler_EDF_SMP_Get_self( context );
node = _Scheduler_EDF_SMP_Node_downcast( node_to_extract );
_Scheduler_SMP_Extract_from_scheduled( &self->Base.Base, &node->Base.Base );
rqi = node->ready_queue_index;
ready_queue = &self->Ready[ rqi ];
if ( rqi != 0 && !_RBTree_Is_empty( &ready_queue->Queue ) ) {
_Chain_Append_unprotected( &self->Affine_queues, &ready_queue->Node );
}
}
static inline void _Scheduler_EDF_SMP_Extract_from_ready(
Scheduler_Context *context,
Scheduler_Node *node_to_extract
@@ -403,7 +426,7 @@ void _Scheduler_EDF_SMP_Block(
context,
thread,
node,
_Scheduler_SMP_Extract_from_scheduled,
_Scheduler_EDF_SMP_Extract_from_scheduled,
_Scheduler_EDF_SMP_Extract_from_ready,
_Scheduler_EDF_SMP_Get_highest_ready,
_Scheduler_EDF_SMP_Move_from_ready_to_scheduled,

24
testsuites/smptests/smpschededf02/init.c
View File

@@ -156,6 +156,30 @@ static const test_action test_actions[] = {
UNBLOCK( 0, 0, IDLE),
SET_AFFINITY( 1, A(1, 0), 0, IDLE),
UNBLOCK( 1, 1, 0),
/*
* Block a one-to-one thread while having a non-empty affine ready queue on
* the same processor.
*/
RESET,
SET_AFFINITY( 1, A(1, 0), IDLE, IDLE),
SET_AFFINITY( 3, A(1, 0), IDLE, IDLE),
UNBLOCK( 0, 0, IDLE),
UNBLOCK( 1, 1, 0),
UNBLOCK( 2, 1, 0),
UNBLOCK( 3, 1, 0),
BLOCK( 1, 2, 0),
BLOCK( 0, 3, 2),
/*
* Make sure that a one-to-one thread does not get the wrong processor
* allocated after selecting the highest ready thread.
*/
RESET,
SET_AFFINITY( 1, A(1, 0), IDLE, IDLE),
SET_AFFINITY( 2, A(1, 0), IDLE, IDLE),
UNBLOCK( 0, 0, IDLE),
UNBLOCK( 1, 1, 0),
UNBLOCK( 2, 1, 0),
BLOCK( 0, 1, IDLE),
RESET
};