summaryrefslogtreecommitdiffstats
path: root/cpukit/score/inline/rtems/score/priority.inl
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2010-07-29 17:52:10 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2010-07-29 17:52:10 +0000
commita55e305ed3406b935a24ceb9becdff58a1a87948 (patch)
treeb4745978fb84fecc82b1b3d0d0cb7aa0eec8d4a7 /cpukit/score/inline/rtems/score/priority.inl
parent2010-07-29 Gedare Bloom <giddyup44@yahoo.com> (diff)
downloadrtems-a55e305ed3406b935a24ceb9becdff58a1a87948.tar.bz2
2010-07-29 Gedare Bloom <giddyup44@yahoo.com>
PR 1635/cpukit * sapi/src/exinit.c, score/Makefile.am, score/preinstall.am, score/include/rtems/score/bitfield.h, score/include/rtems/score/priority.h, score/include/rtems/score/thread.h, score/inline/rtems/score/priority.inl, score/inline/rtems/score/thread.inl, score/src/threadchangepriority.c, score/src/threadclearstate.c, score/src/threadready.c, score/src/threadresume.c, score/src/threadsetpriority.c, score/src/threadsetstate.c, score/src/threadsettransient.c, score/src/threadsuspend.c: Refactoring of priority handling, to isolate the bitmap implementation of priorities in the supercore so that priority management is a little more modular. This change is in anticipation of scheduler implementations that can select how they manage tracking priority levels / finding the highest priority ready task. Note that most of the changes here are simple renaming, to clarify the use of the bitmap-based priority management. * score/include/rtems/score/prioritybitmap.h, score/inline/rtems/score/prioritybitmap.inl: New files.
Diffstat (limited to 'cpukit/score/inline/rtems/score/priority.inl')
-rw-r--r--cpukit/score/inline/rtems/score/priority.inl165
1 files changed, 0 insertions, 165 deletions
diff --git a/cpukit/score/inline/rtems/score/priority.inl b/cpukit/score/inline/rtems/score/priority.inl
index f03570e27d..089a81ebda 100644
--- a/cpukit/score/inline/rtems/score/priority.inl
+++ b/cpukit/score/inline/rtems/score/priority.inl
@@ -28,21 +28,6 @@
* @{
*/
-#include <rtems/score/bitfield.h>
-
-/**
- * This routine performs the initialization necessary for this handler.
- */
-
-RTEMS_INLINE_ROUTINE void _Priority_Handler_initialization( void )
-{
- int index;
-
- _Priority_Major_bit_map = 0;
- for ( index=0 ; index <16 ; index++ )
- _Priority_Bit_map[ index ] = 0;
-}
-
/**
* This function returns true if the_priority if valid for a
* user task, and false otherwise.
@@ -60,157 +45,7 @@ RTEMS_INLINE_ROUTINE bool _Priority_Is_valid (
return ( the_priority <= PRIORITY_MAXIMUM );
}
-/**
- * This function returns the major portion of the_priority.
- */
-RTEMS_INLINE_ROUTINE Priority_Bit_map_control _Priority_Major (
- Priority_Control the_priority
-)
-{
- return (Priority_Bit_map_control)( the_priority / 16 );
-}
-
-/**
- * This function returns the minor portion of the_priority.
- */
-
-RTEMS_INLINE_ROUTINE Priority_Bit_map_control _Priority_Minor (
- Priority_Control the_priority
-)
-{
- return (Priority_Bit_map_control)( the_priority % 16 );
-}
-
-#if ( CPU_USE_GENERIC_BITFIELD_CODE == TRUE )
-
-/**
- * This function returns the mask associated with the major or minor
- * number passed to it.
- */
-
-RTEMS_INLINE_ROUTINE Priority_Bit_map_control _Priority_Mask (
- uint32_t bit_number
-)
-{
- return (Priority_Bit_map_control)(0x8000u >> bit_number);
-}
-
-/**
- * This function returns the mask bit inverted.
- */
-
-RTEMS_INLINE_ROUTINE Priority_Bit_map_control _Priority_Mask_invert (
- uint32_t mask
-)
-{
- return (Priority_Bit_map_control)(~mask);
-}
-
-
-/**
- * This function translates the bit numbers returned by the bit scan
- * of a priority bit field into something suitable for use as
- * a major or minor component of a priority.
- */
-
-RTEMS_INLINE_ROUTINE uint32_t _Priority_Bits_index (
- uint32_t bit_number
-)
-{
- return bit_number;
-}
-
-#endif
-
-/**
- * This routine uses the_priority_map to update the priority
- * bit maps to indicate that a thread has been readied.
- */
-
-RTEMS_INLINE_ROUTINE void _Priority_Add_to_bit_map (
- Priority_Information *the_priority_map
-)
-{
- *the_priority_map->minor |= the_priority_map->ready_minor;
- _Priority_Major_bit_map |= the_priority_map->ready_major;
-}
-
-/**
- * This routine uses the_priority_map to update the priority
- * bit maps to indicate that a thread has been removed from the
- * ready state.
- */
-
-RTEMS_INLINE_ROUTINE void _Priority_Remove_from_bit_map (
- Priority_Information *the_priority_map
-)
-{
- *the_priority_map->minor &= the_priority_map->block_minor;
- if ( *the_priority_map->minor == 0 )
- _Priority_Major_bit_map &= the_priority_map->block_major;
-}
-
-/**
- * This function returns the priority of the highest priority
- * ready thread.
- */
-
-RTEMS_INLINE_ROUTINE Priority_Control _Priority_Get_highest( void )
-{
- Priority_Bit_map_control minor;
- Priority_Bit_map_control major;
-
- _Bitfield_Find_first_bit( _Priority_Major_bit_map, major );
- _Bitfield_Find_first_bit( _Priority_Bit_map[major], minor );
-
- return (_Priority_Bits_index( major ) << 4) +
- _Priority_Bits_index( minor );
-}
-
-/**
- * This routine initializes the_priority_map so that it
- * contains the information necessary to manage a thread
- * at new_priority.
- */
-
-RTEMS_INLINE_ROUTINE void _Priority_Initialize_information(
- Priority_Information *the_priority_map,
- Priority_Control new_priority
-)
-{
- Priority_Bit_map_control major;
- Priority_Bit_map_control minor;
- Priority_Bit_map_control mask;
-
- major = _Priority_Major( new_priority );
- minor = _Priority_Minor( new_priority );
-
- the_priority_map->minor =
- &_Priority_Bit_map[ _Priority_Bits_index(major) ];
-
- mask = _Priority_Mask( major );
- the_priority_map->ready_major = mask;
- /* Add _Priority_Mask_invert to non-generic bitfield then change this code. */
- the_priority_map->block_major = (Priority_Bit_map_control)(~((uint32_t)mask));
-
- mask = _Priority_Mask( minor );
- the_priority_map->ready_minor = mask;
- /* Add _Priority_Mask_invert to non-generic bitfield then change this code. */
- the_priority_map->block_minor = (Priority_Bit_map_control)(~((uint32_t)mask));
-}
-
-/**
- * This function returns true if the priority GROUP is empty, and
- * false otherwise.
- */
-
-RTEMS_INLINE_ROUTINE bool _Priority_Is_group_empty (
- Priority_Control the_priority
-)
-{
- return the_priority == 0;
-}
/**@}*/