From e97b7c9a7af2f4e19a8bdeaf13033617f8c4c2b6 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 11 Apr 2019 13:47:50 +0200 Subject: score: Use an ISR lock for Per_CPU_Control::Lock The use of a hand crafted lock for Per_CPU_Control::Lock was necessary at some point in the SMP support development, but it is no longer justified. --- cpukit/score/src/threaddispatch.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'cpukit/score/src/threaddispatch.c') diff --git a/cpukit/score/src/threaddispatch.c b/cpukit/score/src/threaddispatch.c index 55dc437eaf..65951cccfe 100644 --- a/cpukit/score/src/threaddispatch.c +++ b/cpukit/score/src/threaddispatch.c @@ -158,27 +158,30 @@ static ISR_Level _Thread_Preemption_intervention( ) { #if defined(RTEMS_SMP) + ISR_lock_Context lock_context; + level = _Thread_Check_pinning( executing, cpu_self, level ); - _Per_CPU_Acquire( cpu_self ); + _Per_CPU_Acquire( cpu_self, &lock_context ); while ( !_Chain_Is_empty( &cpu_self->Threads_in_need_for_help ) ) { - Chain_Node *node; - Thread_Control *the_thread; - ISR_lock_Context lock_context; + Chain_Node *node; + Thread_Control *the_thread; node = _Chain_Get_first_unprotected( &cpu_self->Threads_in_need_for_help ); _Chain_Set_off_chain( node ); the_thread = THREAD_OF_SCHEDULER_HELP_NODE( node ); - _Per_CPU_Release( cpu_self ); + _Per_CPU_Release( cpu_self, &lock_context ); + _Thread_State_acquire( the_thread, &lock_context ); _Thread_Ask_for_help( the_thread ); _Thread_State_release( the_thread, &lock_context ); - _Per_CPU_Acquire( cpu_self ); + + _Per_CPU_Acquire( cpu_self, &lock_context ); } - _Per_CPU_Release( cpu_self ); + _Per_CPU_Release( cpu_self, &lock_context ); #else (void) cpu_self; #endif -- cgit v1.2.3