From ec17ad4c24a9b3f9c175240d66f8e39acf58e6d1 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 23 Nov 2016 07:16:41 +0100 Subject: score: Delete obsolete scheduler debug aid --- cpukit/score/Makefile.am | 1 - cpukit/score/include/rtems/score/schedulerimpl.h | 6 --- .../score/include/rtems/score/schedulersmpimpl.h | 6 --- cpukit/score/src/schedulersmpdebug.c | 54 ---------------------- 4 files changed, 67 deletions(-) delete mode 100644 cpukit/score/src/schedulersmpdebug.c diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index 58f9e652e5..02b0bfb260 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -155,7 +155,6 @@ libscore_a_SOURCES += src/schedulerpriorityaffinitysmp.c libscore_a_SOURCES += src/schedulerprioritysmp.c libscore_a_SOURCES += src/schedulersimplesmp.c libscore_a_SOURCES += src/schedulerstrongapa.c -libscore_a_SOURCES += src/schedulersmpdebug.c libscore_a_SOURCES += src/smp.c libscore_a_SOURCES += src/smplock.c libscore_a_SOURCES += src/smpmulticastaction.c diff --git a/cpukit/score/include/rtems/score/schedulerimpl.h b/cpukit/score/include/rtems/score/schedulerimpl.h index 62a8e94fa1..737d1a35ab 100644 --- a/cpukit/score/include/rtems/score/schedulerimpl.h +++ b/cpukit/score/include/rtems/score/schedulerimpl.h @@ -859,17 +859,11 @@ typedef void ( *Scheduler_Release_idle_thread )( Thread_Control *idle ); -extern const bool _Scheduler_Thread_state_valid_state_changes[ 3 ][ 3 ]; - RTEMS_INLINE_ROUTINE void _Scheduler_Thread_change_state( Thread_Control *the_thread, Thread_Scheduler_state new_state ) { - _Assert( - _Scheduler_Thread_state_valid_state_changes - [ the_thread->Scheduler.state ][ new_state ] - ); _Assert( _ISR_lock_Is_owner( &the_thread->Scheduler.Lock ) || the_thread->Scheduler.state == THREAD_SCHEDULER_BLOCKED diff --git a/cpukit/score/include/rtems/score/schedulersmpimpl.h b/cpukit/score/include/rtems/score/schedulersmpimpl.h index 95a9eaed06..92a22d2ff8 100644 --- a/cpukit/score/include/rtems/score/schedulersmpimpl.h +++ b/cpukit/score/include/rtems/score/schedulersmpimpl.h @@ -425,8 +425,6 @@ static inline void _Scheduler_SMP_Node_update_priority( node->priority = new_priority; } -extern const bool _Scheduler_SMP_Node_valid_state_changes[ 3 ][ 3 ]; - static inline void _Scheduler_SMP_Node_change_state( Scheduler_Node *node, Scheduler_SMP_Node_state new_state @@ -435,10 +433,6 @@ static inline void _Scheduler_SMP_Node_change_state( Scheduler_SMP_Node *the_node; the_node = _Scheduler_SMP_Node_downcast( node ); - _Assert( - _Scheduler_SMP_Node_valid_state_changes[ the_node->state ][ new_state ] - ); - the_node->state = new_state; } diff --git a/cpukit/score/src/schedulersmpdebug.c b/cpukit/score/src/schedulersmpdebug.c deleted file mode 100644 index 1ccebba788..0000000000 --- a/cpukit/score/src/schedulersmpdebug.c +++ /dev/null @@ -1,54 +0,0 @@ -/** - * @file - * - * @ingroup ScoreScheduler - * - * @brief Scheduler SMP Debug Implementation - */ - -/* - * Copyright (c) 2014 embedded brains GmbH. All rights reserved. - * - * embedded brains GmbH - * Dornierstr. 4 - * 82178 Puchheim - * Germany - * - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#if HAVE_CONFIG_H - #include "config.h" -#endif - -#include -#include - -#if defined(RTEMS_DEBUG) - -/* - * Table with all valid state transitions for _Scheduler_Thread_change_state() - * in case RTEMS_DEBUG is defined. - */ -const bool _Scheduler_Thread_state_valid_state_changes[ 3 ][ 3 ] = { - /* FROM / TO BLOCKED SCHEDULED READY */ - /* BLOCKED */ { true, true, true }, - /* SCHEDULED */ { true, true, true }, - /* READY */ { true, true, true } -}; - -/* - * Table with all valid state transitions for - * _Scheduler_SMP_Node_change_state() in case RTEMS_DEBUG is defined. - */ -const bool _Scheduler_SMP_Node_valid_state_changes[ 3 ][ 3 ] = { - /* FROM / TO BLOCKED SCHEDULED READY */ - /* BLOCKED */ { true, true, true }, - /* SCHEDULED */ { true, false, true }, - /* READY */ { true, true, false } -}; - -#endif -- cgit v1.2.3