From 29594b4dbc011c0a768395acaf8afc59c512c164 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 7 Sep 2016 09:27:59 +0200 Subject: score: Remove superfluous SMP debug support This information turned out to be useless in the last couple of months. --- cpukit/score/include/rtems/score/schedulersmpimpl.h | 3 --- cpukit/score/include/rtems/score/thread.h | 8 -------- cpukit/score/include/rtems/score/threadimpl.h | 13 ------------- cpukit/score/src/threaddispatch.c | 2 -- cpukit/score/src/threadhandler.c | 8 ++------ cpukit/score/src/threadinitialize.c | 2 -- 6 files changed, 2 insertions(+), 34 deletions(-) diff --git a/cpukit/score/include/rtems/score/schedulersmpimpl.h b/cpukit/score/include/rtems/score/schedulersmpimpl.h index f2c9919d6b..ae1941aa43 100644 --- a/cpukit/score/include/rtems/score/schedulersmpimpl.h +++ b/cpukit/score/include/rtems/score/schedulersmpimpl.h @@ -472,9 +472,6 @@ static inline void _Scheduler_SMP_Allocate_processor_lazy( ); } else { /* We have to force a migration to our processor set */ - _Assert( - scheduled_thread->Scheduler.debug_real_cpu->heir != scheduled_thread - ); heir = scheduled_thread; } } else { diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h index 44080f3a82..6104ba03d7 100644 --- a/cpukit/score/include/rtems/score/thread.h +++ b/cpukit/score/include/rtems/score/thread.h @@ -672,14 +672,6 @@ typedef struct { * @brief The processor assigned by the current scheduler. */ struct Per_CPU_Control *cpu; - -#if defined(RTEMS_DEBUG) - /** - * @brief The processor on which this thread executed the last time or is - * executing. - */ - struct Per_CPU_Control *debug_real_cpu; -#endif #endif } Thread_Scheduler_control; diff --git a/cpukit/score/include/rtems/score/threadimpl.h b/cpukit/score/include/rtems/score/threadimpl.h index 965b2d190c..2e335396bb 100644 --- a/cpukit/score/include/rtems/score/threadimpl.h +++ b/cpukit/score/include/rtems/score/threadimpl.h @@ -1658,19 +1658,6 @@ RTEMS_INLINE_ROUTINE void _Thread_Remove_timer_and_unblock( #endif } -RTEMS_INLINE_ROUTINE void _Thread_Debug_set_real_processor( - Thread_Control *the_thread, - Per_CPU_Control *cpu -) -{ -#if defined(RTEMS_SMP) && defined(RTEMS_DEBUG) - the_thread->Scheduler.debug_real_cpu = cpu; -#else - (void) the_thread; - (void) cpu; -#endif -} - /** @}*/ #ifdef __cplusplus diff --git a/cpukit/score/src/threaddispatch.c b/cpukit/score/src/threaddispatch.c index 5a9c5669c1..08e96bc191 100644 --- a/cpukit/score/src/threaddispatch.c +++ b/cpukit/score/src/threaddispatch.c @@ -119,8 +119,6 @@ void _Thread_Do_dispatch( Per_CPU_Control *cpu_self, ISR_Level level ) */ cpu_self = _Per_CPU_Get(); - _Thread_Debug_set_real_processor( executing, cpu_self ); - #if !defined( RTEMS_SMP ) _ISR_Local_disable( level ); #endif diff --git a/cpukit/score/src/threadhandler.c b/cpukit/score/src/threadhandler.c index 9f004b939e..5d33f4391d 100644 --- a/cpukit/score/src/threadhandler.c +++ b/cpukit/score/src/threadhandler.c @@ -37,12 +37,8 @@ void _Thread_Handler( void ) */ _Context_Initialization_at_thread_begin(); - #if defined(RTEMS_SMP) - /* On SMP we enter _Thread_Handler() with interrupts disabled */ - _Assert( _ISR_Get_level() != 0 ); - - _Thread_Debug_set_real_processor( executing, _Per_CPU_Get() ); - #endif + /* On SMP we enter _Thread_Handler() with interrupts disabled */ + _SMP_Assert( _ISR_Get_level() != 0 ); /* * have to put level into a register for those cpu's that use diff --git a/cpukit/score/src/threadinitialize.c b/cpukit/score/src/threadinitialize.c index 8b5d9431e5..90f58e646d 100644 --- a/cpukit/score/src/threadinitialize.c +++ b/cpukit/score/src/threadinitialize.c @@ -191,8 +191,6 @@ bool _Thread_Initialize( _SMP_lock_Stats_initialize( &the_thread->Potpourri_stats, "Thread Potpourri" ); #endif - _Thread_Debug_set_real_processor( the_thread, cpu ); - /* Initialize the CPU for the non-SMP schedulers */ _Thread_Set_CPU( the_thread, cpu ); -- cgit v1.2.3