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

score: Not set CPU in _Scheduler_Use_idle_thread()

Browse Source 
Do not set the CPU of the idle thread in _Scheduler_Use_idle_thread().  This
helps to use _Scheduler_Try_to_schedule_node() under more general conditions in
the future, for example in case the owner and user of a node are not the same.

Update #4531.
This commit is contained in:
Sebastian Huber
2021-10-18 09:07:07 +02:00
parent 45e942d1ae
commit 7ae4f56929
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cpukit/include/rtems/score/schedulerimpl.h
View File

@@ -915,14 +915,12 @@ RTEMS_INLINE_ROUTINE void _Scheduler_Thread_change_state(
RTEMS_INLINE_ROUTINE Thread_Control *_Scheduler_Use_idle_thread( RTEMS_INLINE_ROUTINE Thread_Control *_Scheduler_Use_idle_thread(
Scheduler_Context *context, Scheduler_Context *context,
Scheduler_Node *node, Scheduler_Node *node,
Per_CPU_Control *cpu,
Scheduler_Get_idle_thread get_idle_thread Scheduler_Get_idle_thread get_idle_thread
) )
{ {
Thread_Control *idle = ( *get_idle_thread )( context ); Thread_Control *idle = ( *get_idle_thread )( context );
_Scheduler_Node_set_idle_user( node, idle ); _Scheduler_Node_set_idle_user( node, idle );
_Thread_Set_CPU( idle, cpu );
return idle; return idle;
} }
@@ -999,12 +997,12 @@ _Scheduler_Try_to_schedule_node(
} else if ( idle != NULL ) { } else if ( idle != NULL ) {
action = SCHEDULER_TRY_TO_SCHEDULE_DO_IDLE_EXCHANGE; action = SCHEDULER_TRY_TO_SCHEDULE_DO_IDLE_EXCHANGE;
} else { } else {
_Scheduler_Use_idle_thread( Thread_Control *idle;
context, Thread_Control *user;
node,
_Thread_Get_CPU( owner ), idle = _Scheduler_Use_idle_thread( context, node, get_idle_thread );
get_idle_thread user = _Scheduler_Node_get_user( node );
); _Thread_Set_CPU( idle, _Thread_Get_CPU( user ) );
} }
_Thread_Scheduler_release_critical( owner, &lock_context ); _Thread_Scheduler_release_critical( owner, &lock_context );
@@ -1104,12 +1102,8 @@ RTEMS_INLINE_ROUTINE Per_CPU_Control *_Scheduler_Block_node(
if ( is_scheduled && _Scheduler_Node_get_idle( node ) == NULL ) { if ( is_scheduled && _Scheduler_Node_get_idle( node ) == NULL ) {
Thread_Control *idle; Thread_Control *idle;
idle = _Scheduler_Use_idle_thread( idle = _Scheduler_Use_idle_thread( context, node, get_idle_thread );
context, _Thread_Set_CPU( idle, thread_cpu );
node,
thread_cpu,
get_idle_thread
);
_Thread_Dispatch_update_heir( _Per_CPU_Get(), thread_cpu, idle ); _Thread_Dispatch_update_heir( _Per_CPU_Get(), thread_cpu, idle );
} }