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

score: Add red-black tree node to Scheduler_Node

Browse Source 
In SMP configurations, add a red-black tree node to Scheduler_Node to
enable an EDF scheduler implementation.

Update #3056.
This commit is contained in:
Sebastian Huber
2017-06-29 09:44:16 +02:00
parent 1dbce41bb8
commit 15dbc710b6
7 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cpukit/score/include/rtems/score/schedulernode.h
View File

@@ -67,14 +67,16 @@ struct Scheduler_Node {
/** /**
* @brief Chain node for usage in various scheduler data structures. * @brief Chain node for usage in various scheduler data structures.
* *
* Strictly this is the wrong place for this field since the data structures * Strictly, this is the wrong place for this field since the data structures
* to manage scheduler nodes belong to the particular scheduler * to manage scheduler nodes belong to the particular scheduler
* implementation. Currently all SMP scheduler implementations use chains. * implementation. Currently, all SMP scheduler implementations use chains
* The node is here to simplify things, just like the object node in the * or red-black trees. The node is here to simplify things, just like the
* thread control block. It may be replaced with a union to add a red-black * object node in the thread control block.
* tree node in the future.
*/ */
Chain_Node Node; union {
Chain_Node Chain;
RBTree_Node RBTree;
} Node;
/** /**
* @brief The sticky level determines if this scheduler node should use an * @brief The sticky level determines if this scheduler node should use an

14
cpukit/score/include/rtems/score/schedulerprioritysmpimpl.h
View File

@@ -75,9 +75,9 @@ static inline void _Scheduler_priority_SMP_Move_from_scheduled_to_ready(
Scheduler_priority_SMP_Node *node = Scheduler_priority_SMP_Node *node =
_Scheduler_priority_SMP_Node_downcast( scheduled_to_ready ); _Scheduler_priority_SMP_Node_downcast( scheduled_to_ready );
_Chain_Extract_unprotected( &node->Base.Base.Node ); _Chain_Extract_unprotected( &node->Base.Base.Node.Chain );
_Scheduler_priority_Ready_queue_enqueue_first( _Scheduler_priority_Ready_queue_enqueue_first(
&node->Base.Base.Node, &node->Base.Base.Node.Chain,
&node->Ready_queue, &node->Ready_queue,
&self->Bit_map &self->Bit_map
); );
@@ -94,13 +94,13 @@ static inline void _Scheduler_priority_SMP_Move_from_ready_to_scheduled(
_Scheduler_priority_SMP_Node_downcast( ready_to_scheduled ); _Scheduler_priority_SMP_Node_downcast( ready_to_scheduled );
_Scheduler_priority_Ready_queue_extract( _Scheduler_priority_Ready_queue_extract(
&node->Base.Base.Node, &node->Base.Base.Node.Chain,
&node->Ready_queue, &node->Ready_queue,
&self->Bit_map &self->Bit_map
); );
_Chain_Insert_ordered_unprotected( _Chain_Insert_ordered_unprotected(
&self->Base.Scheduled, &self->Base.Scheduled,
&node->Base.Base.Node, &node->Base.Base.Node.Chain,
_Scheduler_SMP_Insert_priority_fifo_order _Scheduler_SMP_Insert_priority_fifo_order
); );
} }
@@ -116,7 +116,7 @@ static inline void _Scheduler_priority_SMP_Insert_ready_lifo(
_Scheduler_priority_SMP_Node_downcast( thread ); _Scheduler_priority_SMP_Node_downcast( thread );
_Scheduler_priority_Ready_queue_enqueue( _Scheduler_priority_Ready_queue_enqueue(
&node->Base.Base.Node, &node->Base.Base.Node.Chain,
&node->Ready_queue, &node->Ready_queue,
&self->Bit_map &self->Bit_map
); );
@@ -133,7 +133,7 @@ static inline void _Scheduler_priority_SMP_Insert_ready_fifo(
_Scheduler_priority_SMP_Node_downcast( thread ); _Scheduler_priority_SMP_Node_downcast( thread );
_Scheduler_priority_Ready_queue_enqueue_first( _Scheduler_priority_Ready_queue_enqueue_first(
&node->Base.Base.Node, &node->Base.Base.Node.Chain,
&node->Ready_queue, &node->Ready_queue,
&self->Bit_map &self->Bit_map
); );
@@ -150,7 +150,7 @@ static inline void _Scheduler_priority_SMP_Extract_from_ready(
_Scheduler_priority_SMP_Node_downcast( thread ); _Scheduler_priority_SMP_Node_downcast( thread );
_Scheduler_priority_Ready_queue_extract( _Scheduler_priority_Ready_queue_extract(
&node->Base.Base.Node, &node->Base.Base.Node.Chain,
&node->Ready_queue, &node->Ready_queue,
&self->Bit_map &self->Bit_map
); );

18
cpukit/score/include/rtems/score/schedulersmpimpl.h
View File

@@ -608,9 +608,9 @@ static inline Scheduler_Node *_Scheduler_SMP_Get_lowest_scheduled(
(void) filter; (void) filter;
(void) order; (void) order;
_Assert( &lowest_scheduled->Node != _Chain_Tail( scheduled ) ); _Assert( &lowest_scheduled->Node.Chain != _Chain_Tail( scheduled ) );
_Assert( _Assert(
_Chain_Next( &lowest_scheduled->Node ) == _Chain_Tail( scheduled ) _Chain_Next( &lowest_scheduled->Node.Chain ) == _Chain_Tail( scheduled )
); );
return lowest_scheduled; return lowest_scheduled;
@@ -708,7 +708,7 @@ static inline bool _Scheduler_SMP_Enqueue_ordered(
lowest_scheduled = ( *get_lowest_scheduled )( context, node, order ); lowest_scheduled = ( *get_lowest_scheduled )( context, node, order );
if ( ( *order )( &node->Node, &lowest_scheduled->Node ) ) { if ( ( *order )( &node->Node.Chain, &lowest_scheduled->Node.Chain ) ) {
_Scheduler_SMP_Enqueue_to_scheduled( _Scheduler_SMP_Enqueue_to_scheduled(
context, context,
node, node,
@@ -769,7 +769,7 @@ static inline bool _Scheduler_SMP_Enqueue_scheduled_ordered(
*/ */
if ( if (
node->sticky_level > 0 node->sticky_level > 0
&& ( *order )( &node->Node, &highest_ready->Node ) && ( *order )( &node->Node.Chain, &highest_ready->Node.Chain )
) { ) {
( *insert_scheduled )( context, node ); ( *insert_scheduled )( context, node );
@@ -859,7 +859,7 @@ static inline void _Scheduler_SMP_Extract_from_scheduled(
Scheduler_Node *node Scheduler_Node *node
) )
{ {
_Chain_Extract_unprotected( &node->Node ); _Chain_Extract_unprotected( &node->Node.Chain );
} }
static inline void _Scheduler_SMP_Schedule_highest_ready( static inline void _Scheduler_SMP_Schedule_highest_ready(
@@ -1109,7 +1109,7 @@ static inline void _Scheduler_SMP_Insert_scheduled_lifo(
_Chain_Insert_ordered_unprotected( _Chain_Insert_ordered_unprotected(
&self->Scheduled, &self->Scheduled,
&node_to_insert->Node, &node_to_insert->Node.Chain,
_Scheduler_SMP_Insert_priority_lifo_order _Scheduler_SMP_Insert_priority_lifo_order
); );
} }
@@ -1123,7 +1123,7 @@ static inline void _Scheduler_SMP_Insert_scheduled_fifo(
_Chain_Insert_ordered_unprotected( _Chain_Insert_ordered_unprotected(
&self->Scheduled, &self->Scheduled,
&node_to_insert->Node, &node_to_insert->Node.Chain,
_Scheduler_SMP_Insert_priority_fifo_order _Scheduler_SMP_Insert_priority_fifo_order
); );
} }
@@ -1154,7 +1154,7 @@ static inline bool _Scheduler_SMP_Ask_for_help(
node_state = _Scheduler_SMP_Node_state( node ); node_state = _Scheduler_SMP_Node_state( node );
if ( node_state == SCHEDULER_SMP_NODE_BLOCKED ) { if ( node_state == SCHEDULER_SMP_NODE_BLOCKED ) {
if ( ( *order )( &node->Node, &lowest_scheduled->Node ) ) { if ( ( *order )( &node->Node.Chain, &lowest_scheduled->Node.Chain ) ) {
_Thread_Scheduler_cancel_need_for_help( _Thread_Scheduler_cancel_need_for_help(
thread, thread,
_Thread_Get_CPU( thread ) _Thread_Get_CPU( thread )
@@ -1297,7 +1297,7 @@ static inline void _Scheduler_SMP_Add_processor(
if ( ( *has_ready )( &self->Base ) ) { if ( ( *has_ready )( &self->Base ) ) {
( *enqueue_scheduled_fifo )( &self->Base, node ); ( *enqueue_scheduled_fifo )( &self->Base, node );
} else { } else {
_Chain_Append_unprotected( &self->Scheduled, &node->Node ); _Chain_Append_unprotected( &self->Scheduled, &node->Node.Chain );
} }
} }

8
cpukit/score/src/schedulerpriorityaffinitysmp.c
View File

@@ -248,8 +248,14 @@ static Scheduler_Node * _Scheduler_priority_affinity_SMP_Get_lowest_scheduled(
* than filter thread is, then we can't schedule the filter thread * than filter thread is, then we can't schedule the filter thread
* to execute. * to execute.
*/ */
if ( (*order)( &node->Base.Base.Base.Node, &filter->Base.Base.Base.Node ) ) if (
(*order)(
&node->Base.Base.Base.Node.Chain,
&filter->Base.Base.Base.Node.Chain
)
) {
break; break;
}
/* cpu_index is the processor number thread is executing on */ /* cpu_index is the processor number thread is executing on */
thread = _Scheduler_Node_get_owner( &node->Base.Base.Base ); thread = _Scheduler_Node_get_owner( &node->Base.Base.Base );

16
cpukit/score/src/schedulersimplesmp.c
View File

@@ -88,7 +88,7 @@ static Scheduler_Node *_Scheduler_simple_SMP_Get_highest_ready(
(void) node; (void) node;
_Assert( &first->Node != _Chain_Tail( &self->Ready ) ); _Assert( &first->Node.Chain != _Chain_Tail( &self->Ready ) );
return first; return first;
} }
@@ -101,10 +101,10 @@ static void _Scheduler_simple_SMP_Move_from_scheduled_to_ready(
Scheduler_simple_SMP_Context *self = Scheduler_simple_SMP_Context *self =
_Scheduler_simple_SMP_Get_self( context ); _Scheduler_simple_SMP_Get_self( context );
_Chain_Extract_unprotected( &scheduled_to_ready->Node ); _Chain_Extract_unprotected( &scheduled_to_ready->Node.Chain );
_Chain_Insert_ordered_unprotected( _Chain_Insert_ordered_unprotected(
&self->Ready, &self->Ready,
&scheduled_to_ready->Node, &scheduled_to_ready->Node.Chain,
_Scheduler_SMP_Insert_priority_lifo_order _Scheduler_SMP_Insert_priority_lifo_order
); );
} }
@@ -117,10 +117,10 @@ static void _Scheduler_simple_SMP_Move_from_ready_to_scheduled(
Scheduler_simple_SMP_Context *self = Scheduler_simple_SMP_Context *self =
_Scheduler_simple_SMP_Get_self( context ); _Scheduler_simple_SMP_Get_self( context );
_Chain_Extract_unprotected( &ready_to_scheduled->Node ); _Chain_Extract_unprotected( &ready_to_scheduled->Node.Chain );
_Chain_Insert_ordered_unprotected( _Chain_Insert_ordered_unprotected(
&self->Base.Scheduled, &self->Base.Scheduled,
&ready_to_scheduled->Node, &ready_to_scheduled->Node.Chain,
_Scheduler_SMP_Insert_priority_fifo_order _Scheduler_SMP_Insert_priority_fifo_order
); );
} }
@@ -135,7 +135,7 @@ static void _Scheduler_simple_SMP_Insert_ready_lifo(
_Chain_Insert_ordered_unprotected( _Chain_Insert_ordered_unprotected(
&self->Ready, &self->Ready,
&node_to_insert->Node, &node_to_insert->Node.Chain,
_Scheduler_SMP_Insert_priority_lifo_order _Scheduler_SMP_Insert_priority_lifo_order
); );
} }
@@ -150,7 +150,7 @@ static void _Scheduler_simple_SMP_Insert_ready_fifo(
_Chain_Insert_ordered_unprotected( _Chain_Insert_ordered_unprotected(
&self->Ready, &self->Ready,
&node_to_insert->Node, &node_to_insert->Node.Chain,
_Scheduler_SMP_Insert_priority_fifo_order _Scheduler_SMP_Insert_priority_fifo_order
); );
} }
@@ -162,7 +162,7 @@ static void _Scheduler_simple_SMP_Extract_from_ready(
{ {
(void) context; (void) context;
_Chain_Extract_unprotected( &node_to_extract->Node ); _Chain_Extract_unprotected( &node_to_extract->Node.Chain );
} }
void _Scheduler_simple_SMP_Block( void _Scheduler_simple_SMP_Block(

2
cpukit/score/src/schedulersmpstartidle.c
View File

@@ -30,6 +30,6 @@ void _Scheduler_SMP_Start_idle(
node->state = SCHEDULER_SMP_NODE_SCHEDULED; node->state = SCHEDULER_SMP_NODE_SCHEDULED;
_Thread_Set_CPU( idle, cpu ); _Thread_Set_CPU( idle, cpu );
_Chain_Append_unprotected( &self->Scheduled, &node->Base.Node ); _Chain_Append_unprotected( &self->Scheduled, &node->Base.Node.Chain );
_Scheduler_SMP_Release_idle_thread( &self->Base, idle ); _Scheduler_SMP_Release_idle_thread( &self->Base, idle );
} }

14
cpukit/score/src/schedulerstrongapa.c
View File

@@ -51,9 +51,9 @@ static void _Scheduler_strong_APA_Move_from_scheduled_to_ready(
Scheduler_strong_APA_Node *node = Scheduler_strong_APA_Node *node =
_Scheduler_strong_APA_Node_downcast( scheduled_to_ready ); _Scheduler_strong_APA_Node_downcast( scheduled_to_ready );
_Chain_Extract_unprotected( &node->Base.Base.Node ); _Chain_Extract_unprotected( &node->Base.Base.Node.Chain );
_Scheduler_priority_Ready_queue_enqueue_first( _Scheduler_priority_Ready_queue_enqueue_first(
&node->Base.Base.Node, &node->Base.Base.Node.Chain,
&node->Ready_queue, &node->Ready_queue,
&self->Bit_map &self->Bit_map
); );
@@ -70,13 +70,13 @@ static void _Scheduler_strong_APA_Move_from_ready_to_scheduled(
_Scheduler_strong_APA_Node_downcast( ready_to_scheduled ); _Scheduler_strong_APA_Node_downcast( ready_to_scheduled );
_Scheduler_priority_Ready_queue_extract( _Scheduler_priority_Ready_queue_extract(
&node->Base.Base.Node, &node->Base.Base.Node.Chain,
&node->Ready_queue, &node->Ready_queue,
&self->Bit_map &self->Bit_map
); );
_Chain_Insert_ordered_unprotected( _Chain_Insert_ordered_unprotected(
&self->Base.Scheduled, &self->Base.Scheduled,
&node->Base.Base.Node, &node->Base.Base.Node.Chain,
_Scheduler_SMP_Insert_priority_fifo_order _Scheduler_SMP_Insert_priority_fifo_order
); );
} }
@@ -92,7 +92,7 @@ static void _Scheduler_strong_APA_Insert_ready_lifo(
_Scheduler_strong_APA_Node_downcast( the_thread ); _Scheduler_strong_APA_Node_downcast( the_thread );
_Scheduler_priority_Ready_queue_enqueue( _Scheduler_priority_Ready_queue_enqueue(
&node->Base.Base.Node, &node->Base.Base.Node.Chain,
&node->Ready_queue, &node->Ready_queue,
&self->Bit_map &self->Bit_map
); );
@@ -109,7 +109,7 @@ static void _Scheduler_strong_APA_Insert_ready_fifo(
_Scheduler_strong_APA_Node_downcast( the_thread ); _Scheduler_strong_APA_Node_downcast( the_thread );
_Scheduler_priority_Ready_queue_enqueue_first( _Scheduler_priority_Ready_queue_enqueue_first(
&node->Base.Base.Node, &node->Base.Base.Node.Chain,
&node->Ready_queue, &node->Ready_queue,
&self->Bit_map &self->Bit_map
); );
@@ -126,7 +126,7 @@ static void _Scheduler_strong_APA_Extract_from_ready(
_Scheduler_strong_APA_Node_downcast( the_thread ); _Scheduler_strong_APA_Node_downcast( the_thread );
_Scheduler_priority_Ready_queue_extract( _Scheduler_priority_Ready_queue_extract(
&node->Base.Base.Node, &node->Base.Base.Node.Chain,
&node->Ready_queue, &node->Ready_queue,
&self->Bit_map &self->Bit_map
); );