From 1fcac5adc5ed38fb88ce4c6d24b2ca2e27e3cd10 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 25 Jul 2016 16:35:37 +0200 Subject: score: Turn thread lock into thread wait lock The _Thread_Lock_acquire() function had a potentially infinite run-time due to the lack of fairness at atomic operations level. Update #2412. Update #2556. Update #2765. --- cpukit/rtems/src/eventreceive.c | 4 ++-- cpukit/rtems/src/eventseize.c | 6 +++--- cpukit/rtems/src/eventsurrender.c | 6 +++--- cpukit/rtems/src/systemeventreceive.c | 4 ++-- cpukit/rtems/src/tasksetscheduler.c | 18 ++++++++---------- 5 files changed, 18 insertions(+), 20 deletions(-) (limited to 'cpukit/rtems/src') diff --git a/cpukit/rtems/src/eventreceive.c b/cpukit/rtems/src/eventreceive.c index e03ff279eb..193960b7b2 100644 --- a/cpukit/rtems/src/eventreceive.c +++ b/cpukit/rtems/src/eventreceive.c @@ -38,7 +38,7 @@ rtems_status_code rtems_event_receive( RTEMS_API_Control *api; Event_Control *event; - executing = _Thread_Lock_acquire_default_for_executing( &lock_context ); + executing = _Thread_Wait_acquire_default_for_executing( &lock_context ); api = executing->API_Extensions[ THREAD_API_RTEMS ]; event = &api->Event; @@ -56,7 +56,7 @@ rtems_status_code rtems_event_receive( ); } else { *event_out = event->pending_events; - _Thread_Lock_release_default( executing, &lock_context ); + _Thread_Wait_release_default( executing, &lock_context ); sc = RTEMS_SUCCESSFUL; } } else { diff --git a/cpukit/rtems/src/eventseize.c b/cpukit/rtems/src/eventseize.c index 7f5903df89..696481c2f5 100644 --- a/cpukit/rtems/src/eventseize.c +++ b/cpukit/rtems/src/eventseize.c @@ -50,13 +50,13 @@ rtems_status_code _Event_Seize( (seized_events == event_in || _Options_Is_any( option_set )) ) { event->pending_events = _Event_sets_Clear( pending_events, seized_events ); - _Thread_Lock_release_default( executing, lock_context ); + _Thread_Wait_release_default( executing, lock_context ); *event_out = seized_events; return RTEMS_SUCCESSFUL; } if ( _Options_Is_no_wait( option_set ) ) { - _Thread_Lock_release_default( executing, lock_context ); + _Thread_Wait_release_default( executing, lock_context ); *event_out = seized_events; return RTEMS_UNSATISFIED; } @@ -78,7 +78,7 @@ rtems_status_code _Event_Seize( _Thread_Wait_flags_set( executing, intend_to_block ); cpu_self = _Thread_Dispatch_disable_critical( lock_context ); - _Thread_Lock_release_default( executing, lock_context ); + _Thread_Wait_release_default( executing, lock_context ); if ( ticks ) { _Thread_Timer_insert_relative( diff --git a/cpukit/rtems/src/eventsurrender.c b/cpukit/rtems/src/eventsurrender.c index a9bef5916c..c805b0e89d 100644 --- a/cpukit/rtems/src/eventsurrender.c +++ b/cpukit/rtems/src/eventsurrender.c @@ -77,7 +77,7 @@ rtems_status_code _Event_Surrender( rtems_event_set seized_events; bool unblock; - _Thread_Lock_acquire_default_critical( the_thread, lock_context ); + _Thread_Wait_acquire_default_critical( the_thread, lock_context ); _Event_sets_Post( event_in, &event->pending_events ); pending_events = event->pending_events; @@ -116,14 +116,14 @@ rtems_status_code _Event_Surrender( Per_CPU_Control *cpu_self; cpu_self = _Thread_Dispatch_disable_critical( lock_context ); - _Thread_Lock_release_default( the_thread, lock_context ); + _Thread_Wait_release_default( the_thread, lock_context ); _Thread_Timer_remove( the_thread ); _Thread_Unblock( the_thread ); _Thread_Dispatch_enable( cpu_self ); } else { - _Thread_Lock_release_default( the_thread, lock_context ); + _Thread_Wait_release_default( the_thread, lock_context ); } return RTEMS_SUCCESSFUL; diff --git a/cpukit/rtems/src/systemeventreceive.c b/cpukit/rtems/src/systemeventreceive.c index a2215fa7ec..93a5694eec 100644 --- a/cpukit/rtems/src/systemeventreceive.c +++ b/cpukit/rtems/src/systemeventreceive.c @@ -44,7 +44,7 @@ rtems_status_code rtems_event_system_receive( RTEMS_API_Control *api; Event_Control *event; - executing = _Thread_Lock_acquire_default_for_executing( &lock_context ); + executing = _Thread_Wait_acquire_default_for_executing( &lock_context ); api = executing->API_Extensions[ THREAD_API_RTEMS ]; event = &api->System_event; @@ -62,7 +62,7 @@ rtems_status_code rtems_event_system_receive( ); } else { *event_out = event->pending_events; - _Thread_Lock_release_default( executing, &lock_context ); + _Thread_Wait_release_default( executing, &lock_context ); sc = RTEMS_SUCCESSFUL; } } else { diff --git a/cpukit/rtems/src/tasksetscheduler.c b/cpukit/rtems/src/tasksetscheduler.c index 175f235f02..0ff74d9c97 100644 --- a/cpukit/rtems/src/tasksetscheduler.c +++ b/cpukit/rtems/src/tasksetscheduler.c @@ -28,10 +28,9 @@ rtems_status_code rtems_task_set_scheduler( { const Scheduler_Control *scheduler; Thread_Control *the_thread; - ISR_lock_Context lock_context; - ISR_lock_Context state_lock_context; + Thread_queue_Context queue_context; + ISR_lock_Context state_context; Per_CPU_Control *cpu_self; - void *lock; bool valid; Priority_Control core_priority; Status_Control status; @@ -45,7 +44,7 @@ rtems_status_code rtems_task_set_scheduler( return RTEMS_INVALID_PRIORITY; } - the_thread = _Thread_Get( task_id, &lock_context ); + the_thread = _Thread_Get( task_id, &queue_context.Lock_context ); if ( the_thread == NULL ) { #if defined(RTEMS_MULTIPROCESSING) @@ -57,16 +56,15 @@ rtems_status_code rtems_task_set_scheduler( return RTEMS_INVALID_ID; } - cpu_self = _Thread_Dispatch_disable_critical( &lock_context ); - _ISR_lock_ISR_enable( &lock_context ); + cpu_self = _Thread_Dispatch_disable_critical( &queue_context.Lock_context ); - lock = _Thread_Lock_acquire( the_thread, &lock_context ); - _Thread_State_acquire_critical( the_thread, &state_lock_context ); + _Thread_Wait_acquire_critical( the_thread, &queue_context ); + _Thread_State_acquire_critical( the_thread, &state_context ); status = _Scheduler_Set( scheduler, the_thread, core_priority ); - _Thread_State_release_critical( the_thread, &state_lock_context ); - _Thread_Lock_release( lock, &lock_context ); + _Thread_State_release_critical( the_thread, &state_context ); + _Thread_Wait_release( the_thread, &queue_context ); _Thread_Dispatch_enable( cpu_self ); return _Status_Get( status ); } -- cgit v1.2.3