From f068384e3c8fd31d4791e22b4c91e29fa907ff3b Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 24 Jul 2013 12:03:31 +0200 Subject: score: Create schedulerpriority impl header Move implementation specific parts of schedulerpriority.h and schedulerpriority.inl into new header file schedulerpriorityimpl.h. The schedulerpriority.h contains now only the application visible API. Add missing includes. Remove superfluous includes. Move declaration of _Priority_Bit_map to prioritybitmap.inl since this variable is used only here. Remove second declaration of _Priority_Major_bit_map. --- cpukit/score/Makefile.am | 2 +- .../score/include/rtems/score/schedulerpriority.h | 18 +- .../include/rtems/score/schedulerpriorityimpl.h | 214 +++++++++++++++++++++ .../include/rtems/score/schedulersimpleimpl.h | 2 + cpukit/score/inline/rtems/score/prioritybitmap.inl | 5 + .../score/inline/rtems/score/schedulerpriority.inl | 210 -------------------- cpukit/score/preinstall.am | 8 +- cpukit/score/src/schedulercbs.c | 6 +- cpukit/score/src/schedulercbscleanup.c | 4 +- cpukit/score/src/schedulercbscreateserver.c | 4 +- cpukit/score/src/schedulercbsdestroyserver.c | 4 +- cpukit/score/src/scheduleredfunblock.c | 3 +- cpukit/score/src/schedulerpriority.c | 6 +- cpukit/score/src/schedulerpriorityblock.c | 10 +- cpukit/score/src/schedulerpriorityenqueue.c | 5 +- cpukit/score/src/schedulerpriorityenqueuefirst.c | 5 +- cpukit/score/src/schedulerpriorityextract.c | 5 +- .../score/src/schedulerpriorityprioritycompare.c | 5 +- cpukit/score/src/schedulerpriorityschedule.c | 4 +- cpukit/score/src/schedulerpriorityunblock.c | 4 +- cpukit/score/src/schedulerpriorityyield.c | 5 +- cpukit/score/src/schedulersimple.c | 6 +- cpukit/score/src/schedulersimpleextract.c | 5 +- cpukit/score/src/schedulersimpleschedule.c | 10 +- cpukit/score/src/schedulersimplesmp.c | 1 + 25 files changed, 248 insertions(+), 303 deletions(-) create mode 100644 cpukit/score/include/rtems/score/schedulerpriorityimpl.h delete mode 100644 cpukit/score/inline/rtems/score/schedulerpriority.inl diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index f04a904f94..8c422a5634 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -47,6 +47,7 @@ include_rtems_score_HEADERS += include/rtems/score/scheduler.h include_rtems_score_HEADERS += include/rtems/score/schedulercbs.h include_rtems_score_HEADERS += include/rtems/score/scheduleredf.h include_rtems_score_HEADERS += include/rtems/score/schedulerpriority.h +include_rtems_score_HEADERS += include/rtems/score/schedulerpriorityimpl.h include_rtems_score_HEADERS += include/rtems/score/schedulersimple.h include_rtems_score_HEADERS += include/rtems/score/schedulersimpleimpl.h include_rtems_score_HEADERS += include/rtems/score/smp.h @@ -99,7 +100,6 @@ endif include_rtems_score_HEADERS += inline/rtems/score/object.inl include_rtems_score_HEADERS += inline/rtems/score/prioritybitmap.inl include_rtems_score_HEADERS += inline/rtems/score/scheduler.inl -include_rtems_score_HEADERS += inline/rtems/score/schedulerpriority.inl include_rtems_score_HEADERS += inline/rtems/score/states.inl include_rtems_score_HEADERS += inline/rtems/score/thread.inl include_rtems_score_HEADERS += inline/rtems/score/threadq.inl diff --git a/cpukit/score/include/rtems/score/schedulerpriority.h b/cpukit/score/include/rtems/score/schedulerpriority.h index abd48196f2..862f9e1c7d 100644 --- a/cpukit/score/include/rtems/score/schedulerpriority.h +++ b/cpukit/score/include/rtems/score/schedulerpriority.h @@ -20,7 +20,7 @@ #define _RTEMS_SCORE_SCHEDULERPRIORITY_H #include -#include +#include #include #ifdef __cplusplus @@ -225,25 +225,11 @@ void _Scheduler_priority_Release_job ( uint32_t deadline ); -/** - * This is the major bit map. - */ -extern volatile Priority_bit_map_Control _Priority_Major_bit_map; - -/** - * This is the minor bit map. - */ -extern Priority_bit_map_Control _Priority_Bit_map[16] CPU_STRUCTURE_ALIGNMENT; - -#ifndef __RTEMS_APPLICATION__ -#include -#endif +/**@}*/ #ifdef __cplusplus } #endif -/**@}*/ - #endif /* end of include file */ diff --git a/cpukit/score/include/rtems/score/schedulerpriorityimpl.h b/cpukit/score/include/rtems/score/schedulerpriorityimpl.h new file mode 100644 index 0000000000..03568ed141 --- /dev/null +++ b/cpukit/score/include/rtems/score/schedulerpriorityimpl.h @@ -0,0 +1,214 @@ +/** + * @file + * + * @brief Inlined Routines Associated with the Manipulation of the + * Priority-Based Scheduling Structures + * + * This inline file contains all of the inlined routines associated with + * the manipulation of the priority-based scheduling structures. + */ + +/* + * Copyright (C) 2010 Gedare Bloom. + * Copyright (C) 2011 On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + */ + +#ifndef _RTEMS_SCORE_SCHEDULERPRIORITYIMPL_H +#define _RTEMS_SCORE_SCHEDULERPRIORITYIMPL_H + +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @addtogroup ScoreScheduler + */ +/**@{**/ + +/** + * @brief Ready queue initialization. + * + * This routine initializes @a the_ready_queue for priority-based scheduling. + */ +RTEMS_INLINE_ROUTINE void _Scheduler_priority_Ready_queue_initialize(void) +{ + size_t index; + Chain_Control *ready_queues; + + /* allocate ready queue structures */ + _Scheduler.information = _Workspace_Allocate_or_fatal_error( + ((size_t) PRIORITY_MAXIMUM + 1) * sizeof(Chain_Control) + ); + + /* initialize ready queue structures */ + ready_queues = (Chain_Control *) _Scheduler.information; + for( index=0; index <= PRIORITY_MAXIMUM; index++) + _Chain_Initialize_empty( &ready_queues[index] ); +} + +/** + * @brief Put a thread to the ready queue. + * + * This routine puts @a the_thread on to the priority-based ready queue. + * + * @param[in] the_thread is a pointer to the thread + */ +RTEMS_INLINE_ROUTINE void _Scheduler_priority_Ready_queue_enqueue( + Thread_Control *the_thread +) +{ + Scheduler_priority_Per_thread *sched_info; + Chain_Control *ready; + + sched_info = (Scheduler_priority_Per_thread *) the_thread->scheduler_info; + ready = sched_info->ready_chain; + + _Priority_bit_map_Add( &sched_info->Priority_map ); + + _Chain_Append_unprotected( ready, &the_thread->Object.Node ); +} + +/** + * @brief Put a thread to the head of the ready queue. + * + * This routine puts @a the_thread to the head of the ready queue. + * For priority-based ready queues, the thread will be the first thread + * at its priority level. + * + * @param[in] the_thread is a pointer to the thread. + */ +RTEMS_INLINE_ROUTINE void _Scheduler_priority_Ready_queue_enqueue_first( + Thread_Control *the_thread +) +{ + Scheduler_priority_Per_thread *sched_info; + + sched_info = (Scheduler_priority_Per_thread *) the_thread->scheduler_info; + + _Priority_bit_map_Add( &sched_info->Priority_map ); + + _Chain_Prepend_unprotected( + sched_info->ready_chain, + &the_thread->Object.Node + ); +} + +/** + * @brief Remove a specific thread from the ready queue. + * + * This routine removes a specific thread from the specified + * priority-based ready queue. + * + * @param[in] the_thread is a pointer to the thread. + */ +RTEMS_INLINE_ROUTINE void _Scheduler_priority_Ready_queue_extract( + Thread_Control *the_thread +) +{ + Scheduler_priority_Per_thread *sched_info; + Chain_Control *ready; + + sched_info = (Scheduler_priority_Per_thread *) the_thread->scheduler_info; + ready = sched_info->ready_chain; + + if ( _Chain_Has_only_one_node( ready ) ) { + _Chain_Initialize_empty( ready ); + _Priority_bit_map_Remove( &sched_info->Priority_map ); + } else { + _Chain_Extract_unprotected( &the_thread->Object.Node ); + } +} + +/** + * @brief Return a pointer to the first thread. + * + * This routines returns a pointer to the first thread on @a the_ready_queue. + * + * @param[in] the_ready_queue - pointer to thread queue + * + * @return This method returns the first thread or NULL + */ +RTEMS_INLINE_ROUTINE Thread_Control *_Scheduler_priority_Ready_queue_first( + Chain_Control *the_ready_queue +) +{ + Priority_Control index = _Priority_bit_map_Get_highest(); + + if ( !_Chain_Is_empty( &the_ready_queue[ index ] ) ) + return (Thread_Control *) _Chain_First( &the_ready_queue[ index ] ); + + return NULL; +} + +/** + * @brief Requeue a thread on the ready queue. + * + * This routine is invoked when a thread changes priority and should be + * moved to a different position on the ready queue. + * + * @param[in] the_thread is a pointer to the thread + */ +RTEMS_INLINE_ROUTINE void _Scheduler_priority_Ready_queue_requeue( + Thread_Control *the_thread +) +{ + Scheduler_priority_Per_thread *sched_info; + + sched_info = (Scheduler_priority_Per_thread *) the_thread->scheduler_info; + + if ( !_Chain_Has_only_one_node( sched_info->ready_chain ) ) { + _Chain_Extract_unprotected( &the_thread->Object.Node ); + + _Chain_Append_unprotected( + sched_info->ready_chain, + &the_thread->Object.Node + ); + } +} + +/** + * @brief Scheduling decision logic. + * + * This kernel routine implements scheduling decision logic + * for priority-based scheduling. + */ +RTEMS_INLINE_ROUTINE void _Scheduler_priority_Schedule_body(void) +{ + _Thread_Heir = _Scheduler_priority_Ready_queue_first( + (Chain_Control *) _Scheduler.information + ); +} + +/** + * @brief Priority comparison. + * + * This routine implements priority comparison for priority-based + * scheduling. + * + * @return >0 for higher priority, 0 for equal and <0 for lower priority. + */ +RTEMS_INLINE_ROUTINE int _Scheduler_priority_Priority_compare_body( + Priority_Control p1, + Priority_Control p2 +) +{ + /* High priority in priority scheduler is represented by low numbers. */ + return ( p2 - p1 ); +} + +/** @} */ + +#ifdef __cplusplus +} +#endif + +#endif +/* end of include file */ diff --git a/cpukit/score/include/rtems/score/schedulersimpleimpl.h b/cpukit/score/include/rtems/score/schedulersimpleimpl.h index e8c4cc6cad..076d1a9258 100644 --- a/cpukit/score/include/rtems/score/schedulersimpleimpl.h +++ b/cpukit/score/include/rtems/score/schedulersimpleimpl.h @@ -20,6 +20,8 @@ #define _RTEMS_SCORE_SCHEDULERSIMPLEIMPL_H #include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/cpukit/score/inline/rtems/score/prioritybitmap.inl b/cpukit/score/inline/rtems/score/prioritybitmap.inl index 70844fa0e3..19196ceea2 100644 --- a/cpukit/score/inline/rtems/score/prioritybitmap.inl +++ b/cpukit/score/inline/rtems/score/prioritybitmap.inl @@ -97,6 +97,11 @@ RTEMS_INLINE_ROUTINE uint32_t _Priority_Bits_index ( * Priority Queue implemented by bit map */ +/** + * This is the minor bit map. + */ +extern Priority_bit_map_Control _Priority_Bit_map[16] CPU_STRUCTURE_ALIGNMENT; + /** * This routine performs the initialization necessary for this handler. */ diff --git a/cpukit/score/inline/rtems/score/schedulerpriority.inl b/cpukit/score/inline/rtems/score/schedulerpriority.inl deleted file mode 100644 index 393ee09062..0000000000 --- a/cpukit/score/inline/rtems/score/schedulerpriority.inl +++ /dev/null @@ -1,210 +0,0 @@ -/** - * @file - * - * @brief Inlined Routines Associated with the Manipulation of the - * Priority-Based Scheduling Structures - * - * This inline file contains all of the inlined routines associated with - * the manipulation of the priority-based scheduling structures. - */ - -/* - * Copyright (C) 2010 Gedare Bloom. - * Copyright (C) 2011 On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - */ - -#ifndef _RTEMS_SCORE_SCHEDULERPRIORITY_H -# error "Never use directly; include instead." -#endif - -#ifndef _RTEMS_SCORE_SCHEDULERPRIORITY_INL -#define _RTEMS_SCORE_SCHEDULERPRIORITY_INL - -#include -#include -#include - -/** - * @addtogroup ScoreScheduler - */ -/**@{**/ - -/** - * @brief Ready queue initialization. - * - * This routine initializes @a the_ready_queue for priority-based scheduling. - */ -RTEMS_INLINE_ROUTINE void _Scheduler_priority_Ready_queue_initialize(void) -{ - size_t index; - Chain_Control *ready_queues; - - /* allocate ready queue structures */ - _Scheduler.information = _Workspace_Allocate_or_fatal_error( - ((size_t) PRIORITY_MAXIMUM + 1) * sizeof(Chain_Control) - ); - - /* initialize ready queue structures */ - ready_queues = (Chain_Control *) _Scheduler.information; - for( index=0; index <= PRIORITY_MAXIMUM; index++) - _Chain_Initialize_empty( &ready_queues[index] ); -} - -/** - * @brief Put a thread to the ready queue. - * - * This routine puts @a the_thread on to the priority-based ready queue. - * - * @param[in] the_thread is a pointer to the thread - */ -RTEMS_INLINE_ROUTINE void _Scheduler_priority_Ready_queue_enqueue( - Thread_Control *the_thread -) -{ - Scheduler_priority_Per_thread *sched_info; - Chain_Control *ready; - - sched_info = (Scheduler_priority_Per_thread *) the_thread->scheduler_info; - ready = sched_info->ready_chain; - - _Priority_bit_map_Add( &sched_info->Priority_map ); - - _Chain_Append_unprotected( ready, &the_thread->Object.Node ); -} - -/** - * @brief Put a thread to the head of the ready queue. - * - * This routine puts @a the_thread to the head of the ready queue. - * For priority-based ready queues, the thread will be the first thread - * at its priority level. - * - * @param[in] the_thread is a pointer to the thread. - */ -RTEMS_INLINE_ROUTINE void _Scheduler_priority_Ready_queue_enqueue_first( - Thread_Control *the_thread -) -{ - Scheduler_priority_Per_thread *sched_info; - - sched_info = (Scheduler_priority_Per_thread *) the_thread->scheduler_info; - - _Priority_bit_map_Add( &sched_info->Priority_map ); - - _Chain_Prepend_unprotected( - sched_info->ready_chain, - &the_thread->Object.Node - ); -} - -/** - * @brief Remove a specific thread from the ready queue. - * - * This routine removes a specific thread from the specified - * priority-based ready queue. - * - * @param[in] the_thread is a pointer to the thread. - */ -RTEMS_INLINE_ROUTINE void _Scheduler_priority_Ready_queue_extract( - Thread_Control *the_thread -) -{ - Scheduler_priority_Per_thread *sched_info; - Chain_Control *ready; - - sched_info = (Scheduler_priority_Per_thread *) the_thread->scheduler_info; - ready = sched_info->ready_chain; - - if ( _Chain_Has_only_one_node( ready ) ) { - _Chain_Initialize_empty( ready ); - _Priority_bit_map_Remove( &sched_info->Priority_map ); - } else { - _Chain_Extract_unprotected( &the_thread->Object.Node ); - } -} - -/** - * @brief Return a pointer to the first thread. - * - * This routines returns a pointer to the first thread on @a the_ready_queue. - * - * @param[in] the_ready_queue - pointer to thread queue - * - * @return This method returns the first thread or NULL - */ -RTEMS_INLINE_ROUTINE Thread_Control *_Scheduler_priority_Ready_queue_first( - Chain_Control *the_ready_queue -) -{ - Priority_Control index = _Priority_bit_map_Get_highest(); - - if ( !_Chain_Is_empty( &the_ready_queue[ index ] ) ) - return (Thread_Control *) _Chain_First( &the_ready_queue[ index ] ); - - return NULL; -} - -/** - * @brief Requeue a thread on the ready queue. - * - * This routine is invoked when a thread changes priority and should be - * moved to a different position on the ready queue. - * - * @param[in] the_thread is a pointer to the thread - */ -RTEMS_INLINE_ROUTINE void _Scheduler_priority_Ready_queue_requeue( - Thread_Control *the_thread -) -{ - Scheduler_priority_Per_thread *sched_info; - - sched_info = (Scheduler_priority_Per_thread *) the_thread->scheduler_info; - - if ( !_Chain_Has_only_one_node( sched_info->ready_chain ) ) { - _Chain_Extract_unprotected( &the_thread->Object.Node ); - - _Chain_Append_unprotected( - sched_info->ready_chain, - &the_thread->Object.Node - ); - } -} - -/** - * @brief Scheduling decision logic. - * - * This kernel routine implements scheduling decision logic - * for priority-based scheduling. - */ -RTEMS_INLINE_ROUTINE void _Scheduler_priority_Schedule_body(void) -{ - _Thread_Heir = _Scheduler_priority_Ready_queue_first( - (Chain_Control *) _Scheduler.information - ); -} - -/** - * @brief Priority comparison. - * - * This routine implements priority comparison for priority-based - * scheduling. - * - * @return >0 for higher priority, 0 for equal and <0 for lower priority. - */ -RTEMS_INLINE_ROUTINE int _Scheduler_priority_Priority_compare_body( - Priority_Control p1, - Priority_Control p2 -) -{ - /* High priority in priority scheduler is represented by low numbers. */ - return ( p2 - p1 ); -} - -/** @} */ - -#endif -/* end of include file */ diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am index 35b57d055a..d650a4664c 100644 --- a/cpukit/score/preinstall.am +++ b/cpukit/score/preinstall.am @@ -171,6 +171,10 @@ $(PROJECT_INCLUDE)/rtems/score/schedulerpriority.h: include/rtems/score/schedule $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulerpriority.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulerpriority.h +$(PROJECT_INCLUDE)/rtems/score/schedulerpriorityimpl.h: include/rtems/score/schedulerpriorityimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulerpriorityimpl.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulerpriorityimpl.h + $(PROJECT_INCLUDE)/rtems/score/schedulersimple.h: include/rtems/score/schedulersimple.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulersimple.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulersimple.h @@ -327,10 +331,6 @@ $(PROJECT_INCLUDE)/rtems/score/scheduler.inl: inline/rtems/score/scheduler.inl $ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/scheduler.inl PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/scheduler.inl -$(PROJECT_INCLUDE)/rtems/score/schedulerpriority.inl: inline/rtems/score/schedulerpriority.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulerpriority.inl -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulerpriority.inl - $(PROJECT_INCLUDE)/rtems/score/states.inl: inline/rtems/score/states.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/states.inl PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/states.inl diff --git a/cpukit/score/src/schedulercbs.c b/cpukit/score/src/schedulercbs.c index 7905387018..f3aa2c0261 100644 --- a/cpukit/score/src/schedulercbs.c +++ b/cpukit/score/src/schedulercbs.c @@ -18,11 +18,9 @@ #include "config.h" #endif -#include -#include -#include #include -#include +#include +#include Scheduler_CBS_Server **_Scheduler_CBS_Server_list; diff --git a/cpukit/score/src/schedulercbscleanup.c b/cpukit/score/src/schedulercbscleanup.c index abffeafdc6..c1aaa91891 100644 --- a/cpukit/score/src/schedulercbscleanup.c +++ b/cpukit/score/src/schedulercbscleanup.c @@ -18,10 +18,8 @@ #include "config.h" #endif -#include -#include -#include #include +#include int _Scheduler_CBS_Cleanup (void) { diff --git a/cpukit/score/src/schedulercbscreateserver.c b/cpukit/score/src/schedulercbscreateserver.c index 9f69fba821..e499b0ff27 100644 --- a/cpukit/score/src/schedulercbscreateserver.c +++ b/cpukit/score/src/schedulercbscreateserver.c @@ -18,10 +18,8 @@ #include "config.h" #endif -#include -#include -#include #include +#include int _Scheduler_CBS_Create_server ( Scheduler_CBS_Parameters *params, diff --git a/cpukit/score/src/schedulercbsdestroyserver.c b/cpukit/score/src/schedulercbsdestroyserver.c index 5030b6f098..8fb1b7eb8e 100644 --- a/cpukit/score/src/schedulercbsdestroyserver.c +++ b/cpukit/score/src/schedulercbsdestroyserver.c @@ -19,10 +19,8 @@ #include "config.h" #endif -#include -#include -#include #include +#include int _Scheduler_CBS_Destroy_server ( Scheduler_CBS_Server_id server_id diff --git a/cpukit/score/src/scheduleredfunblock.c b/cpukit/score/src/scheduleredfunblock.c index 31ed6401af..0aeb7dec65 100644 --- a/cpukit/score/src/scheduleredfunblock.c +++ b/cpukit/score/src/scheduleredfunblock.c @@ -18,9 +18,8 @@ #include "config.h" #endif -#include -#include #include +#include void _Scheduler_EDF_Unblock( Thread_Control *the_thread diff --git a/cpukit/score/src/schedulerpriority.c b/cpukit/score/src/schedulerpriority.c index e6176e8d05..7314da4965 100644 --- a/cpukit/score/src/schedulerpriority.c +++ b/cpukit/score/src/schedulerpriority.c @@ -18,11 +18,7 @@ #include "config.h" #endif -#include -#include -#include -#include -#include +#include /* Instantiate any global variables needed by the priority scheduler */ volatile Priority_bit_map_Control _Priority_Major_bit_map; diff --git a/cpukit/score/src/schedulerpriorityblock.c b/cpukit/score/src/schedulerpriorityblock.c index d527907faf..d5f5840cba 100644 --- a/cpukit/score/src/schedulerpriorityblock.c +++ b/cpukit/score/src/schedulerpriorityblock.c @@ -20,15 +20,7 @@ #include "config.h" #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include void _Scheduler_priority_Block( Thread_Control *the_thread diff --git a/cpukit/score/src/schedulerpriorityenqueue.c b/cpukit/score/src/schedulerpriorityenqueue.c index 89cf4a22b7..b1ecf34e56 100644 --- a/cpukit/score/src/schedulerpriorityenqueue.c +++ b/cpukit/score/src/schedulerpriorityenqueue.c @@ -18,10 +18,7 @@ #include "config.h" #endif -#include -#include -#include -#include +#include void _Scheduler_priority_Enqueue( Thread_Control *the_thread diff --git a/cpukit/score/src/schedulerpriorityenqueuefirst.c b/cpukit/score/src/schedulerpriorityenqueuefirst.c index f5b4940693..a18efbac4f 100644 --- a/cpukit/score/src/schedulerpriorityenqueuefirst.c +++ b/cpukit/score/src/schedulerpriorityenqueuefirst.c @@ -18,10 +18,7 @@ #include "config.h" #endif -#include -#include -#include -#include +#include void _Scheduler_priority_Enqueue_first( Thread_Control *the_thread diff --git a/cpukit/score/src/schedulerpriorityextract.c b/cpukit/score/src/schedulerpriorityextract.c index 02f6004d28..3000c80867 100644 --- a/cpukit/score/src/schedulerpriorityextract.c +++ b/cpukit/score/src/schedulerpriorityextract.c @@ -19,10 +19,7 @@ #include "config.h" #endif -#include -#include -#include -#include +#include void _Scheduler_priority_Extract( Thread_Control *the_thread diff --git a/cpukit/score/src/schedulerpriorityprioritycompare.c b/cpukit/score/src/schedulerpriorityprioritycompare.c index 7d37707986..f8c13fe6c4 100644 --- a/cpukit/score/src/schedulerpriorityprioritycompare.c +++ b/cpukit/score/src/schedulerpriorityprioritycompare.c @@ -18,10 +18,7 @@ #include "config.h" #endif -#include -#include -#include -#include +#include int _Scheduler_priority_Priority_compare( Priority_Control p1, diff --git a/cpukit/score/src/schedulerpriorityschedule.c b/cpukit/score/src/schedulerpriorityschedule.c index 3757387d06..22ed5f403c 100644 --- a/cpukit/score/src/schedulerpriorityschedule.c +++ b/cpukit/score/src/schedulerpriorityschedule.c @@ -18,9 +18,7 @@ #include "config.h" #endif -#include -#include -#include +#include void _Scheduler_priority_Schedule(void) { diff --git a/cpukit/score/src/schedulerpriorityunblock.c b/cpukit/score/src/schedulerpriorityunblock.c index f1d52e39dd..8afa3855bd 100644 --- a/cpukit/score/src/schedulerpriorityunblock.c +++ b/cpukit/score/src/schedulerpriorityunblock.c @@ -20,9 +20,7 @@ #include "config.h" #endif -#include -#include -#include +#include void _Scheduler_priority_Unblock ( Thread_Control *the_thread diff --git a/cpukit/score/src/schedulerpriorityyield.c b/cpukit/score/src/schedulerpriorityyield.c index 4c2b5996c1..e65bdb8af6 100644 --- a/cpukit/score/src/schedulerpriorityyield.c +++ b/cpukit/score/src/schedulerpriorityyield.c @@ -18,11 +18,8 @@ #include "config.h" #endif -#include +#include #include -#include -#include -#include void _Scheduler_priority_Yield( Thread_Control *thread ) { diff --git a/cpukit/score/src/schedulersimple.c b/cpukit/score/src/schedulersimple.c index 6ba46a36b2..84ffb7465a 100644 --- a/cpukit/score/src/schedulersimple.c +++ b/cpukit/score/src/schedulersimple.c @@ -19,12 +19,8 @@ #include "config.h" #endif -#include -#include -#include -#include #include -#include +#include #include void * _Scheduler_simple_Allocate( diff --git a/cpukit/score/src/schedulersimpleextract.c b/cpukit/score/src/schedulersimpleextract.c index e5d6e78e2f..9cd0b02e8b 100644 --- a/cpukit/score/src/schedulersimpleextract.c +++ b/cpukit/score/src/schedulersimpleextract.c @@ -19,10 +19,9 @@ #include "config.h" #endif -#include -#include -#include #include +#include +#include void _Scheduler_simple_Extract( Thread_Control *the_thread diff --git a/cpukit/score/src/schedulersimpleschedule.c b/cpukit/score/src/schedulersimpleschedule.c index e41fa96483..b60f096b09 100644 --- a/cpukit/score/src/schedulersimpleschedule.c +++ b/cpukit/score/src/schedulersimpleschedule.c @@ -18,16 +18,8 @@ #include "config.h" #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include void _Scheduler_simple_Schedule(void) { diff --git a/cpukit/score/src/schedulersimplesmp.c b/cpukit/score/src/schedulersimplesmp.c index b197af5cd8..55c40a67e8 100644 --- a/cpukit/score/src/schedulersimplesmp.c +++ b/cpukit/score/src/schedulersimplesmp.c @@ -20,6 +20,7 @@ #include #include +#include static Scheduler_simple_smp_Control *_Scheduler_simple_smp_Instance( void ) { -- cgit v1.2.3