change log for rtems (2010-07-29)
rtems-vc at rtems.org
rtems-vc at rtems.org
Thu Jul 29 18:10:44 UTC 2010
*joel*:
2010-07-29 Joel Sherrill <joel.sherrilL at OARcorp.com>
* posix/src/psignalunblockthread.c: Clean up and simplify.
M 1.2534 cpukit/ChangeLog
M 1.13 cpukit/posix/src/psignalunblockthread.c
diff -u rtems/cpukit/ChangeLog:1.2533 rtems/cpukit/ChangeLog:1.2534
--- rtems/cpukit/ChangeLog:1.2533 Wed Jul 28 15:39:37 2010
+++ rtems/cpukit/ChangeLog Thu Jul 29 12:49:29 2010
@@ -1,3 +1,7 @@
+2010-07-29 Joel Sherrill <joel.sherrilL at OARcorp.com>
+
+ * posix/src/psignalunblockthread.c: Clean up and simplify.
+
2010-07-28 Vinu Rajashekhar <vinutheraj at gmail.com>
* posix/src/condinit.c, posix/src/condwaitsupp.c,
diff -u rtems/cpukit/posix/src/psignalunblockthread.c:1.12 rtems/cpukit/posix/src/psignalunblockthread.c:1.13
--- rtems/cpukit/posix/src/psignalunblockthread.c:1.12 Wed Jul 28 15:39:48 2010
+++ rtems/cpukit/posix/src/psignalunblockthread.c Thu Jul 29 12:49:30 2010
@@ -98,7 +98,7 @@
* + Any other combination, do nothing.
*/
- if ( the_thread->current_state & STATES_INTERRUPTIBLE_BY_SIGNAL ) {
+ if ( _States_Is_interruptible_by_signal( the_thread->current_state ) ) {
the_thread->Wait.return_code = EINTR;
/*
* In pthread_cond_wait, a thread will be blocking on a thread
@@ -106,9 +106,8 @@
*/
if ( _States_Is_waiting_on_thread_queue(the_thread->current_state) )
_Thread_queue_Extract_with_proxy( the_thread );
- else if ( _States_Is_delaying(the_thread->current_state) ){
- if ( _Watchdog_Is_active( &the_thread->Timer ) )
- (void) _Watchdog_Remove( &the_thread->Timer );
+ else if ( _States_Is_delaying(the_thread->current_state) ) {
+ (void) _Watchdog_Remove( &the_thread->Timer );
_Thread_Unblock( the_thread );
}
*joel*:
2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
PR 1635/cpukit
* rtems/score/cpu.h, rtems/score/types.h: 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.
M 1.51 cpukit/score/cpu/avr/ChangeLog
M 1.29 cpukit/score/cpu/avr/rtems/score/cpu.h
M 1.12 cpukit/score/cpu/avr/rtems/score/types.h
M 1.40 cpukit/score/cpu/bfin/ChangeLog
M 1.23 cpukit/score/cpu/bfin/rtems/score/cpu.h
M 1.7 cpukit/score/cpu/bfin/rtems/score/types.h
M 1.98 cpukit/score/cpu/h8300/ChangeLog
M 1.43 cpukit/score/cpu/h8300/rtems/score/cpu.h
M 1.15 cpukit/score/cpu/h8300/rtems/score/types.h
M 1.15 cpukit/score/cpu/lm32/ChangeLog
M 1.11 cpukit/score/cpu/lm32/rtems/score/cpu.h
M 1.4 cpukit/score/cpu/lm32/rtems/score/types.h
M 1.14 cpukit/score/cpu/m32c/ChangeLog
M 1.10 cpukit/score/cpu/m32c/rtems/score/cpu.h
M 1.4 cpukit/score/cpu/m32c/rtems/score/types.h
M 1.7 cpukit/score/cpu/m32r/ChangeLog
M 1.7 cpukit/score/cpu/m32r/rtems/score/cpu.h
M 1.4 cpukit/score/cpu/m32r/rtems/score/types.h
M 1.142 cpukit/score/cpu/mips/ChangeLog
M 1.60 cpukit/score/cpu/mips/rtems/score/cpu.h
M 1.17 cpukit/score/cpu/mips/rtems/score/types.h
M 1.24 cpukit/score/cpu/nios2/ChangeLog
M 1.16 cpukit/score/cpu/nios2/rtems/score/cpu.h
M 1.10 cpukit/score/cpu/nios2/rtems/score/types.h
M 1.84 cpukit/score/cpu/no_cpu/ChangeLog
M 1.34 cpukit/score/cpu/no_cpu/rtems/score/cpu.h
M 1.19 cpukit/score/cpu/no_cpu/rtems/score/types.h
M 1.156 cpukit/score/cpu/powerpc/ChangeLog
M 1.43 cpukit/score/cpu/powerpc/rtems/score/cpu.h
M 1.17 cpukit/score/cpu/powerpc/rtems/score/types.h
M 1.97 cpukit/score/cpu/sh/ChangeLog
M 1.34 cpukit/score/cpu/sh/rtems/score/cpu.h
M 1.16 cpukit/score/cpu/sh/rtems/score/types.h
diff -u rtems/cpukit/score/cpu/avr/ChangeLog:1.50 rtems/cpukit/score/cpu/avr/ChangeLog:1.51
--- rtems/cpukit/score/cpu/avr/ChangeLog:1.50 Tue Jul 27 05:51:12 2010
+++ rtems/cpukit/score/cpu/avr/ChangeLog Thu Jul 29 12:51:33 2010
@@ -1,3 +1,14 @@
+2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1635/cpukit
+ * rtems/score/cpu.h, rtems/score/types.h: 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.
+
2010-07-27 Sebastian Huber <sebastian.huber at embedded-brains.de>
* rtems/asm.h: Fixed header guard.
diff -u rtems/cpukit/score/cpu/avr/rtems/score/cpu.h:1.28 rtems/cpukit/score/cpu/avr/rtems/score/cpu.h:1.29
--- rtems/cpukit/score/cpu/avr/rtems/score/cpu.h:1.28 Tue Jul 27 05:51:12 2010
+++ rtems/cpukit/score/cpu/avr/rtems/score/cpu.h Thu Jul 29 12:51:33 2010
@@ -814,7 +814,7 @@
/*
* This routine sets _output to the bit number of the first bit
- * set in _value. _value is of CPU dependent type Priority_Bit_map_control.
+ * set in _value. _value is of CPU dependent type Priority_bit_map_Control.
* This type may be either 16 or 32 bits wide although only the 16
* least significant bits will be used.
*
diff -u rtems/cpukit/score/cpu/avr/rtems/score/types.h:1.11 rtems/cpukit/score/cpu/avr/rtems/score/types.h:1.12
--- rtems/cpukit/score/cpu/avr/rtems/score/types.h:1.11 Fri Jul 16 03:36:36 2010
+++ rtems/cpukit/score/cpu/avr/rtems/score/types.h Thu Jul 29 12:51:33 2010
@@ -31,7 +31,7 @@
* This section defines the basic types for this processor.
*/
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
typedef void avr_isr;
typedef void ( *avr_isr_entry )( void );
diff -u rtems/cpukit/score/cpu/bfin/ChangeLog:1.39 rtems/cpukit/score/cpu/bfin/ChangeLog:1.40
--- rtems/cpukit/score/cpu/bfin/ChangeLog:1.39 Tue Jul 27 05:57:31 2010
+++ rtems/cpukit/score/cpu/bfin/ChangeLog Thu Jul 29 12:51:34 2010
@@ -1,3 +1,14 @@
+2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1635/cpukit
+ * rtems/score/cpu.h, rtems/score/types.h: 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.
+
2010-07-27 Sebastian Huber <sebastian.huber at embedded-brains.de>
* rtems/score/cpu.h: Assembler compatibility fixes.
diff -u rtems/cpukit/score/cpu/bfin/rtems/score/cpu.h:1.22 rtems/cpukit/score/cpu/bfin/rtems/score/cpu.h:1.23
--- rtems/cpukit/score/cpu/bfin/rtems/score/cpu.h:1.22 Tue Jul 27 05:57:31 2010
+++ rtems/cpukit/score/cpu/bfin/rtems/score/cpu.h Thu Jul 29 12:51:34 2010
@@ -951,7 +951,7 @@
* @ingroup CPUBitfield
* This routine sets @a _output to the bit number of the first bit
* set in @a _value. @a _value is of CPU dependent type
- * @a Priority_Bit_map_control. This type may be either 16 or 32 bits
+ * @a Priority_bit_map_Control. This type may be either 16 or 32 bits
* wide although only the 16 least significant bits will be used.
*
* There are a number of variables in using a "find first bit" type
diff -u rtems/cpukit/score/cpu/bfin/rtems/score/types.h:1.6 rtems/cpukit/score/cpu/bfin/rtems/score/types.h:1.7
--- rtems/cpukit/score/cpu/bfin/rtems/score/types.h:1.6 Fri Jul 16 03:37:10 2010
+++ rtems/cpukit/score/cpu/bfin/rtems/score/types.h Thu Jul 29 12:51:34 2010
@@ -28,7 +28,7 @@
*/
/** This defines the type for a priority bit map entry. */
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
/** This defines the return type for an ISR entry point. */
typedef void blackfin_isr;
diff -u rtems/cpukit/score/cpu/h8300/ChangeLog:1.97 rtems/cpukit/score/cpu/h8300/ChangeLog:1.98
--- rtems/cpukit/score/cpu/h8300/ChangeLog:1.97 Tue Jul 27 06:03:38 2010
+++ rtems/cpukit/score/cpu/h8300/ChangeLog Thu Jul 29 12:51:36 2010
@@ -1,3 +1,14 @@
+2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1635/cpukit
+ * rtems/score/cpu.h, rtems/score/types.h: 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.
+
2010-07-27 Sebastian Huber <sebastian.huber at embedded-brains.de>
* rtems/score/cpu.h: Assembler compatibility fixes.
diff -u rtems/cpukit/score/cpu/h8300/rtems/score/cpu.h:1.42 rtems/cpukit/score/cpu/h8300/rtems/score/cpu.h:1.43
--- rtems/cpukit/score/cpu/h8300/rtems/score/cpu.h:1.42 Tue Jul 27 06:03:38 2010
+++ rtems/cpukit/score/cpu/h8300/rtems/score/cpu.h Thu Jul 29 12:51:36 2010
@@ -844,7 +844,7 @@
/*
* This routine sets _output to the bit number of the first bit
- * set in _value. _value is of CPU dependent type Priority_Bit_map_control.
+ * set in _value. _value is of CPU dependent type Priority_bit_map_Control.
* This type may be either 16 or 32 bits wide although only the 16
* least significant bits will be used.
*
diff -u rtems/cpukit/score/cpu/h8300/rtems/score/types.h:1.14 rtems/cpukit/score/cpu/h8300/rtems/score/types.h:1.15
--- rtems/cpukit/score/cpu/h8300/rtems/score/types.h:1.14 Fri Jul 16 03:37:53 2010
+++ rtems/cpukit/score/cpu/h8300/rtems/score/types.h Thu Jul 29 12:51:36 2010
@@ -31,7 +31,7 @@
* This section defines the basic types for this processor.
*/
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
typedef void h8300_isr;
typedef void ( *h8300_isr_entry )( void );
diff -u rtems/cpukit/score/cpu/lm32/ChangeLog:1.14 rtems/cpukit/score/cpu/lm32/ChangeLog:1.15
--- rtems/cpukit/score/cpu/lm32/ChangeLog:1.14 Fri Jul 16 03:39:05 2010
+++ rtems/cpukit/score/cpu/lm32/ChangeLog Thu Jul 29 12:51:40 2010
@@ -1,3 +1,14 @@
+2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1635/cpukit
+ * rtems/score/cpu.h, rtems/score/types.h: 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.
+
2010-07-16 Sebastian Huber <sebastian.huber at embedded-brains.de>
* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff -u rtems/cpukit/score/cpu/lm32/rtems/score/cpu.h:1.10 rtems/cpukit/score/cpu/lm32/rtems/score/cpu.h:1.11
--- rtems/cpukit/score/cpu/lm32/rtems/score/cpu.h:1.10 Fri Jul 16 03:39:05 2010
+++ rtems/cpukit/score/cpu/lm32/rtems/score/cpu.h Thu Jul 29 12:51:40 2010
@@ -956,7 +956,7 @@
* @ingroup CPUBitfield
* This routine sets @a _output to the bit number of the first bit
* set in @a _value. @a _value is of CPU dependent type
- * @a Priority_Bit_map_control. This type may be either 16 or 32 bits
+ * @a Priority_bit_map_Control. This type may be either 16 or 32 bits
* wide although only the 16 least significant bits will be used.
*
* There are a number of variables in using a "find first bit" type
diff -u rtems/cpukit/score/cpu/lm32/rtems/score/types.h:1.3 rtems/cpukit/score/cpu/lm32/rtems/score/types.h:1.4
--- rtems/cpukit/score/cpu/lm32/rtems/score/types.h:1.3 Fri Jul 16 03:39:05 2010
+++ rtems/cpukit/score/cpu/lm32/rtems/score/types.h Thu Jul 29 12:51:40 2010
@@ -35,7 +35,7 @@
*/
/** This defines the type for a priority bit map entry. */
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
/** This defines the return type for an ISR entry point. */
typedef void lm32_isr;
diff -u rtems/cpukit/score/cpu/m32c/ChangeLog:1.13 rtems/cpukit/score/cpu/m32c/ChangeLog:1.14
--- rtems/cpukit/score/cpu/m32c/ChangeLog:1.13 Fri Jul 16 03:39:36 2010
+++ rtems/cpukit/score/cpu/m32c/ChangeLog Thu Jul 29 12:51:42 2010
@@ -1,3 +1,14 @@
+2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1635/cpukit
+ * rtems/score/cpu.h, rtems/score/types.h: 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.
+
2010-07-16 Sebastian Huber <sebastian.huber at embedded-brains.de>
* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff -u rtems/cpukit/score/cpu/m32c/rtems/score/cpu.h:1.9 rtems/cpukit/score/cpu/m32c/rtems/score/cpu.h:1.10
--- rtems/cpukit/score/cpu/m32c/rtems/score/cpu.h:1.9 Fri Jul 16 03:39:36 2010
+++ rtems/cpukit/score/cpu/m32c/rtems/score/cpu.h Thu Jul 29 12:51:42 2010
@@ -912,7 +912,7 @@
* @ingroup CPUBitfield
* This routine sets @a _output to the bit number of the first bit
* set in @a _value. @a _value is of CPU dependent type
- * @a Priority_Bit_map_control. This type may be either 16 or 32 bits
+ * @a Priority_bit_map_Control. This type may be either 16 or 32 bits
* wide although only the 16 least significant bits will be used.
*
* There are a number of variables in using a "find first bit" type
diff -u rtems/cpukit/score/cpu/m32c/rtems/score/types.h:1.3 rtems/cpukit/score/cpu/m32c/rtems/score/types.h:1.4
--- rtems/cpukit/score/cpu/m32c/rtems/score/types.h:1.3 Fri Jul 16 03:39:36 2010
+++ rtems/cpukit/score/cpu/m32c/rtems/score/types.h Thu Jul 29 12:51:42 2010
@@ -32,7 +32,7 @@
*/
/** This defines the type for a priority bit map entry. */
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
/** This defines the return type for an ISR entry point. */
typedef void m32c_isr;
diff -u rtems/cpukit/score/cpu/m32r/ChangeLog:1.6 rtems/cpukit/score/cpu/m32r/ChangeLog:1.7
--- rtems/cpukit/score/cpu/m32r/ChangeLog:1.6 Fri Jul 16 03:40:07 2010
+++ rtems/cpukit/score/cpu/m32r/ChangeLog Thu Jul 29 12:51:44 2010
@@ -1,3 +1,14 @@
+2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1635/cpukit
+ * rtems/score/cpu.h, rtems/score/types.h: 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.
+
2010-07-16 Sebastian Huber <sebastian.huber at embedded-brains.de>
* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff -u rtems/cpukit/score/cpu/m32r/rtems/score/cpu.h:1.6 rtems/cpukit/score/cpu/m32r/rtems/score/cpu.h:1.7
--- rtems/cpukit/score/cpu/m32r/rtems/score/cpu.h:1.6 Fri Jul 16 03:40:07 2010
+++ rtems/cpukit/score/cpu/m32r/rtems/score/cpu.h Thu Jul 29 12:51:44 2010
@@ -949,7 +949,7 @@
* @ingroup CPUBitfield
* This routine sets @a _output to the bit number of the first bit
* set in @a _value. @a _value is of CPU dependent type
- * @a Priority_Bit_map_control. This type may be either 16 or 32 bits
+ * @a Priority_bit_map_Control. This type may be either 16 or 32 bits
* wide although only the 16 least significant bits will be used.
*
* There are a number of variables in using a "find first bit" type
diff -u rtems/cpukit/score/cpu/m32r/rtems/score/types.h:1.3 rtems/cpukit/score/cpu/m32r/rtems/score/types.h:1.4
--- rtems/cpukit/score/cpu/m32r/rtems/score/types.h:1.3 Fri Jul 16 03:40:07 2010
+++ rtems/cpukit/score/cpu/m32r/rtems/score/types.h Thu Jul 29 12:51:44 2010
@@ -32,7 +32,7 @@
*/
/** This defines the type for a priority bit map entry. */
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
/** This defines the return type for an ISR entry point. */
typedef void m32r_isr;
diff -u rtems/cpukit/score/cpu/mips/ChangeLog:1.141 rtems/cpukit/score/cpu/mips/ChangeLog:1.142
--- rtems/cpukit/score/cpu/mips/ChangeLog:1.141 Fri Jul 16 03:41:50 2010
+++ rtems/cpukit/score/cpu/mips/ChangeLog Thu Jul 29 12:51:48 2010
@@ -1,3 +1,14 @@
+2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1635/cpukit
+ * rtems/score/cpu.h, rtems/score/types.h: 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.
+
2010-07-16 Sebastian Huber <sebastian.huber at embedded-brains.de>
* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff -u rtems/cpukit/score/cpu/mips/rtems/score/cpu.h:1.59 rtems/cpukit/score/cpu/mips/rtems/score/cpu.h:1.60
--- rtems/cpukit/score/cpu/mips/rtems/score/cpu.h:1.59 Fri Jul 16 03:41:50 2010
+++ rtems/cpukit/score/cpu/mips/rtems/score/cpu.h Thu Jul 29 12:51:48 2010
@@ -909,7 +909,7 @@
/*
* This routine sets _output to the bit number of the first bit
- * set in _value. _value is of CPU dependent type Priority_Bit_map_control.
+ * set in _value. _value is of CPU dependent type Priority_bit_map_Control.
* This type may be either 16 or 32 bits wide although only the 16
* least significant bits will be used.
*
diff -u rtems/cpukit/score/cpu/mips/rtems/score/types.h:1.16 rtems/cpukit/score/cpu/mips/rtems/score/types.h:1.17
--- rtems/cpukit/score/cpu/mips/rtems/score/types.h:1.16 Fri Jul 16 03:41:50 2010
+++ rtems/cpukit/score/cpu/mips/rtems/score/types.h Thu Jul 29 12:51:48 2010
@@ -32,7 +32,7 @@
* This section defines the basic types for this processor.
*/
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
typedef void mips_isr;
typedef void ( *mips_isr_entry )( void );
diff -u rtems/cpukit/score/cpu/nios2/ChangeLog:1.23 rtems/cpukit/score/cpu/nios2/ChangeLog:1.24
--- rtems/cpukit/score/cpu/nios2/ChangeLog:1.23 Fri Jul 16 03:42:14 2010
+++ rtems/cpukit/score/cpu/nios2/ChangeLog Thu Jul 29 12:51:50 2010
@@ -1,3 +1,14 @@
+2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1635/cpukit
+ * rtems/score/cpu.h, rtems/score/types.h: 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.
+
2010-07-16 Sebastian Huber <sebastian.huber at embedded-brains.de>
* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff -u rtems/cpukit/score/cpu/nios2/rtems/score/cpu.h:1.15 rtems/cpukit/score/cpu/nios2/rtems/score/cpu.h:1.16
--- rtems/cpukit/score/cpu/nios2/rtems/score/cpu.h:1.15 Fri Jul 16 03:42:14 2010
+++ rtems/cpukit/score/cpu/nios2/rtems/score/cpu.h Thu Jul 29 12:51:50 2010
@@ -1000,7 +1000,7 @@
* @ingroup CPUBitfield
* This routine sets @a _output to the bit number of the first bit
* set in @a _value. @a _value is of CPU dependent type
- * @a Priority_Bit_map_control. This type may be either 16 or 32 bits
+ * @a Priority_bit_map_Control. This type may be either 16 or 32 bits
* wide although only the 16 least significant bits will be used.
*
* There are a number of variables in using a "find first bit" type
diff -u rtems/cpukit/score/cpu/nios2/rtems/score/types.h:1.9 rtems/cpukit/score/cpu/nios2/rtems/score/types.h:1.10
--- rtems/cpukit/score/cpu/nios2/rtems/score/types.h:1.9 Fri Jul 16 03:42:15 2010
+++ rtems/cpukit/score/cpu/nios2/rtems/score/types.h Thu Jul 29 12:51:50 2010
@@ -31,7 +31,7 @@
* This section defines the basic types for this processor.
*/
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
typedef void nios2_isr;
typedef void ( *nios2_isr_entry )( void );
diff -u rtems/cpukit/score/cpu/no_cpu/ChangeLog:1.83 rtems/cpukit/score/cpu/no_cpu/ChangeLog:1.84
--- rtems/cpukit/score/cpu/no_cpu/ChangeLog:1.83 Fri Jul 16 03:42:46 2010
+++ rtems/cpukit/score/cpu/no_cpu/ChangeLog Thu Jul 29 12:51:52 2010
@@ -1,3 +1,14 @@
+2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1635/cpukit
+ * rtems/score/cpu.h, rtems/score/types.h: 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.
+
2010-07-16 Sebastian Huber <sebastian.huber at embedded-brains.de>
* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff -u rtems/cpukit/score/cpu/no_cpu/rtems/score/cpu.h:1.33 rtems/cpukit/score/cpu/no_cpu/rtems/score/cpu.h:1.34
--- rtems/cpukit/score/cpu/no_cpu/rtems/score/cpu.h:1.33 Fri Jul 16 03:42:46 2010
+++ rtems/cpukit/score/cpu/no_cpu/rtems/score/cpu.h Thu Jul 29 12:51:52 2010
@@ -936,7 +936,7 @@
* @ingroup CPUBitfield
* This routine sets @a _output to the bit number of the first bit
* set in @a _value. @a _value is of CPU dependent type
- * @a Priority_Bit_map_control. This type may be either 16 or 32 bits
+ * @a Priority_bit_map_Control. This type may be either 16 or 32 bits
* wide although only the 16 least significant bits will be used.
*
* There are a number of variables in using a "find first bit" type
diff -u rtems/cpukit/score/cpu/no_cpu/rtems/score/types.h:1.18 rtems/cpukit/score/cpu/no_cpu/rtems/score/types.h:1.19
--- rtems/cpukit/score/cpu/no_cpu/rtems/score/types.h:1.18 Fri Jul 16 03:42:46 2010
+++ rtems/cpukit/score/cpu/no_cpu/rtems/score/types.h Thu Jul 29 12:51:52 2010
@@ -32,7 +32,7 @@
*/
/** This defines the type for a priority bit map entry. */
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
/** This defines the return type for an ISR entry point. */
typedef void no_cpu_isr;
diff -u rtems/cpukit/score/cpu/powerpc/ChangeLog:1.155 rtems/cpukit/score/cpu/powerpc/ChangeLog:1.156
--- rtems/cpukit/score/cpu/powerpc/ChangeLog:1.155 Fri Jul 16 03:45:02 2010
+++ rtems/cpukit/score/cpu/powerpc/ChangeLog Thu Jul 29 12:51:54 2010
@@ -1,3 +1,14 @@
+2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1635/cpukit
+ * rtems/score/cpu.h, rtems/score/types.h: 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.
+
2010-07-16 Sebastian Huber <sebastian.huber at embedded-brains.de>
* rtems/new-exceptions/cpu.h: Removed file.
diff -u rtems/cpukit/score/cpu/powerpc/rtems/score/cpu.h:1.42 rtems/cpukit/score/cpu/powerpc/rtems/score/cpu.h:1.43
--- rtems/cpukit/score/cpu/powerpc/rtems/score/cpu.h:1.42 Fri Jul 16 03:45:02 2010
+++ rtems/cpukit/score/cpu/powerpc/rtems/score/cpu.h Thu Jul 29 12:51:54 2010
@@ -762,7 +762,7 @@
/*
* This routine sets _output to the bit number of the first bit
- * set in _value. _value is of CPU dependent type Priority_Bit_map_control.
+ * set in _value. _value is of CPU dependent type Priority_bit_map_Control.
* This type may be either 16 or 32 bits wide although only the 16
* least significant bits will be used.
*
diff -u rtems/cpukit/score/cpu/powerpc/rtems/score/types.h:1.16 rtems/cpukit/score/cpu/powerpc/rtems/score/types.h:1.17
--- rtems/cpukit/score/cpu/powerpc/rtems/score/types.h:1.16 Fri Jul 16 03:45:02 2010
+++ rtems/cpukit/score/cpu/powerpc/rtems/score/types.h Thu Jul 29 12:51:54 2010
@@ -47,7 +47,7 @@
/*
* This section defines the basic types for this processor.
*/
-typedef uint32_t Priority_Bit_map_control;
+typedef uint32_t Priority_bit_map_Control;
typedef void ppc_isr;
#ifdef __cplusplus
diff -u rtems/cpukit/score/cpu/sh/ChangeLog:1.96 rtems/cpukit/score/cpu/sh/ChangeLog:1.97
--- rtems/cpukit/score/cpu/sh/ChangeLog:1.96 Fri Jul 16 03:45:28 2010
+++ rtems/cpukit/score/cpu/sh/ChangeLog Thu Jul 29 12:51:56 2010
@@ -1,3 +1,14 @@
+2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1635/cpukit
+ * rtems/score/cpu.h, rtems/score/types.h: 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.
+
2010-07-16 Sebastian Huber <sebastian.huber at embedded-brains.de>
* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff -u rtems/cpukit/score/cpu/sh/rtems/score/cpu.h:1.33 rtems/cpukit/score/cpu/sh/rtems/score/cpu.h:1.34
--- rtems/cpukit/score/cpu/sh/rtems/score/cpu.h:1.33 Fri Jul 16 03:45:28 2010
+++ rtems/cpukit/score/cpu/sh/rtems/score/cpu.h Thu Jul 29 12:51:56 2010
@@ -682,7 +682,7 @@
/*
* This routine sets _output to the bit number of the first bit
- * set in _value. _value is of CPU dependent type Priority_Bit_map_control.
+ * set in _value. _value is of CPU dependent type Priority_bit_map_Control.
* This type may be either 16 or 32 bits wide although only the 16
* least significant bits will be used.
*
diff -u rtems/cpukit/score/cpu/sh/rtems/score/types.h:1.15 rtems/cpukit/score/cpu/sh/rtems/score/types.h:1.16
--- rtems/cpukit/score/cpu/sh/rtems/score/types.h:1.15 Fri Jul 16 03:45:28 2010
+++ rtems/cpukit/score/cpu/sh/rtems/score/types.h Thu Jul 29 12:51:56 2010
@@ -41,7 +41,7 @@
* This section defines the basic types for this processor.
*/
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
typedef void sh_isr;
typedef void ( *sh_isr_entry )( void );
*joel*:
2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
PR 1635/cpukit
* rtems/score/types.h: 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.
M 1.125 cpukit/score/cpu/arm/ChangeLog
M 1.20 cpukit/score/cpu/arm/rtems/score/types.h
M 1.102 cpukit/score/cpu/i386/ChangeLog
M 1.16 cpukit/score/cpu/i386/rtems/score/types.h
M 1.125 cpukit/score/cpu/m68k/ChangeLog
M 1.16 cpukit/score/cpu/m68k/rtems/score/types.h
M 1.98 cpukit/score/cpu/sparc/ChangeLog
M 1.18 cpukit/score/cpu/sparc/rtems/score/types.h
M 1.3 cpukit/score/cpu/sparc64/ChangeLog
M 1.3 cpukit/score/cpu/sparc64/rtems/score/types.h
diff -u rtems/cpukit/score/cpu/arm/ChangeLog:1.124 rtems/cpukit/score/cpu/arm/ChangeLog:1.125
--- rtems/cpukit/score/cpu/arm/ChangeLog:1.124 Fri Jul 16 03:35:32 2010
+++ rtems/cpukit/score/cpu/arm/ChangeLog Thu Jul 29 12:51:30 2010
@@ -1,3 +1,14 @@
+2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1635/cpukit
+ * rtems/score/types.h: 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.
+
2010-07-16 Sebastian Huber <sebastian.huber at embedded-brains.de>
* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff -u rtems/cpukit/score/cpu/arm/rtems/score/types.h:1.19 rtems/cpukit/score/cpu/arm/rtems/score/types.h:1.20
--- rtems/cpukit/score/cpu/arm/rtems/score/types.h:1.19 Fri Jul 16 03:35:32 2010
+++ rtems/cpukit/score/cpu/arm/rtems/score/types.h Thu Jul 29 12:51:31 2010
@@ -42,7 +42,7 @@
* This section defines the basic types for this processor.
*/
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
/** @} */
diff -u rtems/cpukit/score/cpu/i386/ChangeLog:1.101 rtems/cpukit/score/cpu/i386/ChangeLog:1.102
--- rtems/cpukit/score/cpu/i386/ChangeLog:1.101 Fri Jul 16 03:38:35 2010
+++ rtems/cpukit/score/cpu/i386/ChangeLog Thu Jul 29 12:51:38 2010
@@ -1,3 +1,14 @@
+2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1635/cpukit
+ * rtems/score/types.h: 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.
+
2010-07-16 Sebastian Huber <sebastian.huber at embedded-brains.de>
* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff -u rtems/cpukit/score/cpu/i386/rtems/score/types.h:1.15 rtems/cpukit/score/cpu/i386/rtems/score/types.h:1.16
--- rtems/cpukit/score/cpu/i386/rtems/score/types.h:1.15 Fri Jul 16 03:38:35 2010
+++ rtems/cpukit/score/cpu/i386/rtems/score/types.h Thu Jul 29 12:51:38 2010
@@ -31,7 +31,7 @@
* This section defines the basic types for this processor.
*/
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
typedef void i386_isr;
typedef i386_isr ( *i386_isr_entry )( void );
diff -u rtems/cpukit/score/cpu/m68k/ChangeLog:1.124 rtems/cpukit/score/cpu/m68k/ChangeLog:1.125
--- rtems/cpukit/score/cpu/m68k/ChangeLog:1.124 Fri Jul 16 03:41:18 2010
+++ rtems/cpukit/score/cpu/m68k/ChangeLog Thu Jul 29 12:51:46 2010
@@ -1,3 +1,14 @@
+2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1635/cpukit
+ * rtems/score/types.h: 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.
+
2010-07-16 Sebastian Huber <sebastian.huber at embedded-brains.de>
* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff -u rtems/cpukit/score/cpu/m68k/rtems/score/types.h:1.15 rtems/cpukit/score/cpu/m68k/rtems/score/types.h:1.16
--- rtems/cpukit/score/cpu/m68k/rtems/score/types.h:1.15 Fri Jul 16 03:40:58 2010
+++ rtems/cpukit/score/cpu/m68k/rtems/score/types.h Thu Jul 29 12:51:46 2010
@@ -31,7 +31,7 @@
* This section defines the basic types for this processor.
*/
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
typedef void m68k_isr;
typedef void ( *m68k_isr_entry )( void );
diff -u rtems/cpukit/score/cpu/sparc/ChangeLog:1.97 rtems/cpukit/score/cpu/sparc/ChangeLog:1.98
--- rtems/cpukit/score/cpu/sparc/ChangeLog:1.97 Fri Jul 16 03:45:55 2010
+++ rtems/cpukit/score/cpu/sparc/ChangeLog Thu Jul 29 12:51:58 2010
@@ -1,3 +1,14 @@
+2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1635/cpukit
+ * rtems/score/types.h: 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.
+
2010-07-16 Sebastian Huber <sebastian.huber at embedded-brains.de>
* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff -u rtems/cpukit/score/cpu/sparc/rtems/score/types.h:1.17 rtems/cpukit/score/cpu/sparc/rtems/score/types.h:1.18
--- rtems/cpukit/score/cpu/sparc/rtems/score/types.h:1.17 Fri Jul 16 03:45:55 2010
+++ rtems/cpukit/score/cpu/sparc/rtems/score/types.h Thu Jul 29 12:51:58 2010
@@ -31,7 +31,7 @@
* This section defines the basic types for this processor.
*/
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
typedef void sparc_isr;
typedef void ( *sparc_isr_entry )( void );
diff -u rtems/cpukit/score/cpu/sparc64/ChangeLog:1.2 rtems/cpukit/score/cpu/sparc64/ChangeLog:1.3
--- rtems/cpukit/score/cpu/sparc64/ChangeLog:1.2 Fri Jul 16 03:46:28 2010
+++ rtems/cpukit/score/cpu/sparc64/ChangeLog Thu Jul 29 12:52:00 2010
@@ -1,3 +1,14 @@
+2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1635/cpukit
+ * rtems/score/types.h: 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.
+
2010-07-16 Sebastian Huber <sebastian.huber at embedded-brains.de>
* rtems/score/cpu.h: Include <rtems/score/types.h> first.
diff -u rtems/cpukit/score/cpu/sparc64/rtems/score/types.h:1.2 rtems/cpukit/score/cpu/sparc64/rtems/score/types.h:1.3
--- rtems/cpukit/score/cpu/sparc64/rtems/score/types.h:1.2 Fri Jul 16 03:46:29 2010
+++ rtems/cpukit/score/cpu/sparc64/rtems/score/types.h Thu Jul 29 12:52:00 2010
@@ -31,7 +31,7 @@
* This section defines the basic types for this processor.
*/
-typedef uint16_t Priority_Bit_map_control;
+typedef uint16_t Priority_bit_map_Control;
typedef void sparc_isr;
typedef void ( *sparc_isr_entry )( void );
*joel*:
2010-07-29 Gedare Bloom <giddyup44 at 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.
M 1.2535 cpukit/ChangeLog
M 1.55 cpukit/sapi/src/exinit.c
M 1.87 cpukit/score/Makefile.am
M 1.21 cpukit/score/include/rtems/score/bitfield.h
M 1.27 cpukit/score/include/rtems/score/priority.h
A 1.1 cpukit/score/include/rtems/score/prioritybitmap.h
M 1.97 cpukit/score/include/rtems/score/thread.h
M 1.26 cpukit/score/inline/rtems/score/priority.inl
A 1.1 cpukit/score/inline/rtems/score/prioritybitmap.inl
M 1.42 cpukit/score/inline/rtems/score/thread.inl
M 1.24 cpukit/score/preinstall.am
M 1.13 cpukit/score/src/threadchangepriority.c
M 1.11 cpukit/score/src/threadclearstate.c
M 1.8 cpukit/score/src/threadready.c
M 1.11 cpukit/score/src/threadresume.c
M 1.5 cpukit/score/src/threadsetpriority.c
M 1.7 cpukit/score/src/threadsetstate.c
M 1.6 cpukit/score/src/threadsettransient.c
M 1.8 cpukit/score/src/threadsuspend.c
diff -u rtems/cpukit/ChangeLog:1.2534 rtems/cpukit/ChangeLog:1.2535
--- rtems/cpukit/ChangeLog:1.2534 Thu Jul 29 12:49:29 2010
+++ rtems/cpukit/ChangeLog Thu Jul 29 12:52:09 2010
@@ -1,3 +1,26 @@
+2010-07-29 Gedare Bloom <giddyup44 at 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.
+
2010-07-29 Joel Sherrill <joel.sherrilL at OARcorp.com>
* posix/src/psignalunblockthread.c: Clean up and simplify.
diff -u rtems/cpukit/sapi/src/exinit.c:1.54 rtems/cpukit/sapi/src/exinit.c:1.55
--- rtems/cpukit/sapi/src/exinit.c:1.54 Thu Jun 17 22:03:22 2010
+++ rtems/cpukit/sapi/src/exinit.c Thu Jul 29 12:52:09 2010
@@ -42,6 +42,7 @@
#include <rtems/score/mpci.h>
#endif
#include <rtems/score/priority.h>
+#include <rtems/score/prioritybitmap.h>
#include <rtems/score/thread.h>
#include <rtems/score/tod.h>
#include <rtems/score/userext.h>
@@ -124,7 +125,7 @@
_API_Mutex_Initialization( 1 );
_API_Mutex_Allocate( &_RTEMS_Allocator_Mutex );
- _Priority_Handler_initialization();
+ _Priority_bit_map_Handler_initialization();
_Watchdog_Handler_initialization();
_TOD_Handler_initialization();
diff -u rtems/cpukit/score/Makefile.am:1.86 rtems/cpukit/score/Makefile.am:1.87
--- rtems/cpukit/score/Makefile.am:1.86 Fri Jul 16 03:31:34 2010
+++ rtems/cpukit/score/Makefile.am Thu Jul 29 12:52:09 2010
@@ -25,15 +25,15 @@
include/rtems/score/heap.h include/rtems/score/protectedheap.h \
include/rtems/score/interr.h include/rtems/score/isr.h \
include/rtems/score/object.h include/rtems/score/percpu.h \
- include/rtems/score/priority.h include/rtems/score/stack.h \
- include/rtems/score/states.h include/rtems/score/sysstate.h \
- include/rtems/score/thread.h include/rtems/score/threadq.h \
- include/rtems/score/threadsync.h include/rtems/score/timespec.h \
- include/rtems/score/timestamp.h include/rtems/score/timestamp64.h \
- include/rtems/score/tod.h include/rtems/score/tqdata.h \
- include/rtems/score/userext.h include/rtems/score/watchdog.h \
- include/rtems/score/wkspace.h include/rtems/score/cpuopts.h \
- include/rtems/score/basedefs.h
+ include/rtems/score/priority.h include/rtems/score/prioritybitmap.h \
+ include/rtems/score/stack.h include/rtems/score/states.h \
+ include/rtems/score/sysstate.h include/rtems/score/thread.h \
+ include/rtems/score/threadq.h include/rtems/score/threadsync.h \
+ include/rtems/score/timespec.h include/rtems/score/timestamp.h \
+ include/rtems/score/timestamp64.h include/rtems/score/tod.h \
+ include/rtems/score/tqdata.h include/rtems/score/userext.h \
+ include/rtems/score/watchdog.h include/rtems/score/wkspace.h \
+ include/rtems/score/cpuopts.h include/rtems/score/basedefs.h
if HAS_PTHREADS
include_rtems_score_HEADERS += include/rtems/score/corespinlock.h \
@@ -53,11 +53,12 @@
inline/rtems/score/coremsg.inl inline/rtems/score/coremutex.inl \
inline/rtems/score/coresem.inl inline/rtems/score/heap.inl \
inline/rtems/score/isr.inl inline/rtems/score/object.inl \
- inline/rtems/score/priority.inl inline/rtems/score/stack.inl \
- inline/rtems/score/states.inl inline/rtems/score/sysstate.inl \
- inline/rtems/score/thread.inl inline/rtems/score/threadq.inl \
- inline/rtems/score/tod.inl inline/rtems/score/tqdata.inl \
- inline/rtems/score/watchdog.inl inline/rtems/score/wkspace.inl
+ inline/rtems/score/priority.inl inline/rtems/score/prioritybitmap.inl \
+ inline/rtems/score/stack.inl inline/rtems/score/states.inl \
+ inline/rtems/score/sysstate.inl inline/rtems/score/thread.inl \
+ inline/rtems/score/threadq.inl inline/rtems/score/tod.inl \
+ inline/rtems/score/tqdata.inl inline/rtems/score/watchdog.inl \
+ inline/rtems/score/wkspace.inl
if HAS_PTHREADS
include_rtems_score_HEADERS += inline/rtems/score/corespinlock.inl \
diff -u rtems/cpukit/score/include/rtems/score/bitfield.h:1.20 rtems/cpukit/score/include/rtems/score/bitfield.h:1.21
--- rtems/cpukit/score/include/rtems/score/bitfield.h:1.20 Fri Nov 27 23:58:53 2009
+++ rtems/cpukit/score/include/rtems/score/bitfield.h Thu Jul 29 12:52:10 2010
@@ -90,9 +90,9 @@
register const unsigned char *__p = __log2table; \
\
if ( __value < 0x100 ) \
- (_bit_number) = (Priority_Bit_map_control)( __p[ __value ] + 8 ); \
+ (_bit_number) = (Priority_bit_map_Control)( __p[ __value ] + 8 ); \
else \
- (_bit_number) = (Priority_Bit_map_control)( __p[ __value >> 8 ] ); \
+ (_bit_number) = (Priority_bit_map_Control)( __p[ __value >> 8 ] ); \
}
#endif
diff -u rtems/cpukit/score/include/rtems/score/priority.h:1.26 rtems/cpukit/score/include/rtems/score/priority.h:1.27
--- rtems/cpukit/score/include/rtems/score/priority.h:1.26 Mon Jun 14 01:08:40 2010
+++ rtems/cpukit/score/include/rtems/score/priority.h Thu Jul 29 12:52:10 2010
@@ -7,7 +7,7 @@
*/
/*
- * COPYRIGHT (c) 1989-2006.
+ * COPYRIGHT (c) 1989-2010.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -67,76 +67,10 @@
#define PRIORITY_MAXIMUM rtems_maximum_priority
/**
- * The following record defines the information associated with
- * each thread to manage its interaction with the priority bit maps.
- */
-typedef struct {
- /** This is the address of minor bit map slot. */
- Priority_Bit_map_control *minor;
- /** This is the priority bit map ready mask. */
- Priority_Bit_map_control ready_major;
- /** This is the priority bit map ready mask. */
- Priority_Bit_map_control ready_minor;
- /** This is the priority bit map block mask. */
- Priority_Bit_map_control block_major;
- /** This is the priority bit map block mask. */
- Priority_Bit_map_control block_minor;
-} Priority_Information;
-
-/**
* This variable contains the configured number of priorities
*/
extern uint8_t rtems_maximum_priority;
-/**
- * Each sixteen bit entry in this array is associated with one of
- * the sixteen entries in the Priority Bit map.
- */
-SCORE_EXTERN volatile Priority_Bit_map_control _Priority_Major_bit_map;
-
-/** Each bit in the Priority Bitmap indicates whether or not there are
- * threads ready at a particular priority. The mapping of
- * individual priority levels to particular bits is processor
- * dependent as is the value of each bit used to indicate that
- * threads are ready at that priority.
- */
-SCORE_EXTERN Priority_Bit_map_control
- _Priority_Bit_map[16] CPU_STRUCTURE_ALIGNMENT;
-
-/*
- * The definition of the Priority_Bit_map_control type is CPU dependent.
- *
- */
-
-#if ( CPU_USE_GENERIC_BITFIELD_CODE == FALSE )
-/**
- * This method returns the priority bit mask for the specified major
- * or minor bit number.
- *
- * @param[in] _bit_number is the bit number for which we need a mask
- *
- * @return the priority bit mask
- *
- * @note This may simply be a pass through to a CPU dependent implementation.
- */
-#define _Priority_Mask( _bit_number ) \
- _CPU_Priority_Mask( _bit_number )
-#endif
-
-#if ( CPU_USE_GENERIC_BITFIELD_CODE == FALSE )
-/**
- * This method returns the bit index position for the specified priority.
- *
- * @param[in] _priority is the priority for which we need the index.
- *
- * @return This method returns the array index into the priority bit map.
- *
- * @note This may simply be a pass through to a CPU dependent implementation.
- */
-#define _Priority_Bits_index( _priority ) \
- _CPU_Priority_bits_index( _priority )
-#endif
-
#ifndef __RTEMS_APPLICATION__
#include <rtems/score/priority.inl>
#endif
diff -u /dev/null rtems/cpukit/score/include/rtems/score/prioritybitmap.h:1.1
--- /dev/null Thu Jul 29 13:10:42 2010
+++ rtems/cpukit/score/include/rtems/score/prioritybitmap.h Thu Jul 29 12:52:10 2010
@@ -0,0 +1,125 @@
+/**
+ * @file rtems/score/prioritybitmap.h
+ *
+ * This include file contains all thread priority manipulation routines for
+ * the bit map priority queue implementation.
+ */
+
+/*
+ * COPYRIGHT (c) 1989-2010.
+ * 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.
+ *
+ * $Id$
+ */
+
+#ifndef _RTEMS_SCORE_PRIORITYBITMAP_H
+#define _RTEMS_SCORE_PRIORITYBITMAP_H
+
+/**
+ * @addtogroup ScorePriority
+ *
+ */
+/**@{*/
+
+/*
+ * Processor specific information.
+ */
+#include <rtems/score/cpu.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <rtems/score/priority.h>
+
+/*
+ * TODO:
+ * These should only be instantiated if using the bit map handler. The
+ * logical place for this is in confdefs.h when a scheduler that uses the
+ * bit map handler is configured.
+ */
+
+/**
+ * Each sixteen bit entry in this array is associated with one of
+ * the sixteen entries in the Priority Bit map.
+ */
+SCORE_EXTERN volatile Priority_bit_map_Control _Priority_Major_bit_map;
+
+/** Each bit in the Priority Bitmap indicates whether or not there are
+ * threads ready at a particular priority. The mapping of
+ * individual priority levels to particular bits is processor
+ * dependent as is the value of each bit used to indicate that
+ * threads are ready at that priority.
+ */
+SCORE_EXTERN Priority_bit_map_Control
+ _Priority_Bit_map[16] CPU_STRUCTURE_ALIGNMENT;
+
+/*
+ * The definition of the Priority_bit_map_Control type is CPU dependent.
+ *
+ */
+
+/**
+ * The following record defines the information associated with
+ * each thread to manage its interaction with the priority bit maps.
+ */
+typedef struct {
+ /** This is the address of minor bit map slot. */
+ Priority_bit_map_Control *minor;
+ /** This is the priority bit map ready mask. */
+ Priority_bit_map_Control ready_major;
+ /** This is the priority bit map ready mask. */
+ Priority_bit_map_Control ready_minor;
+ /** This is the priority bit map block mask. */
+ Priority_bit_map_Control block_major;
+ /** This is the priority bit map block mask. */
+ Priority_bit_map_Control block_minor;
+} Priority_bit_map_Information;
+
+
+#if ( CPU_USE_GENERIC_BITFIELD_CODE == FALSE )
+/**
+ * This method returns the priority bit mask for the specified major
+ * or minor bit number.
+ *
+ * @param[in] _bit_number is the bit number for which we need a mask
+ *
+ * @return the priority bit mask
+ *
+ * @note This may simply be a pass through to a CPU dependent implementation.
+ */
+#define _Priority_Mask( _bit_number ) \
+ _CPU_Priority_Mask( _bit_number )
+#endif
+
+#if ( CPU_USE_GENERIC_BITFIELD_CODE == FALSE )
+/**
+ * This method returns the bit index position for the specified priority.
+ *
+ * @param[in] _priority is the priority for which we need the index.
+ *
+ * @return This method returns the array index into the priority bit map.
+ *
+ * @note This may simply be a pass through to a CPU dependent implementation.
+ */
+#define _Priority_Bits_index( _priority ) \
+ _CPU_Priority_bits_index( _priority )
+#endif
+
+#ifndef __RTEMS_APPLICATION__
+#include <rtems/score/prioritybitmap.inl>
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+/**@}*/
+
+#endif
+/* end of include file */
diff -u rtems/cpukit/score/include/rtems/score/thread.h:1.96 rtems/cpukit/score/include/rtems/score/thread.h:1.97
--- rtems/cpukit/score/include/rtems/score/thread.h:1.96 Mon Jun 28 19:34:11 2010
+++ rtems/cpukit/score/include/rtems/score/thread.h Thu Jul 29 12:52:10 2010
@@ -70,6 +70,7 @@
#endif
#include <rtems/score/object.h>
#include <rtems/score/priority.h>
+#include <rtems/score/prioritybitmap.h>
#include <rtems/score/stack.h>
#include <rtems/score/states.h>
#include <rtems/score/tod.h>
@@ -392,7 +393,7 @@
/** This field points to the Ready FIFO for this priority. */
Chain_Control *ready;
/** This field contains precalculated priority map indices. */
- Priority_Information Priority_map;
+ Priority_bit_map_Information Priority_map;
/** This field contains information about the starting state of
* this thread.
*/
diff -u rtems/cpukit/score/inline/rtems/score/priority.inl:1.25 rtems/cpukit/score/inline/rtems/score/priority.inl:1.26
--- rtems/cpukit/score/inline/rtems/score/priority.inl:1.25 Thu May 7 23:55:53 2009
+++ rtems/cpukit/score/inline/rtems/score/priority.inl Thu Jul 29 12:52:10 2010
@@ -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 @@
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;
-}
/**@}*/
diff -u /dev/null rtems/cpukit/score/inline/rtems/score/prioritybitmap.inl:1.1
--- /dev/null Thu Jul 29 13:10:42 2010
+++ rtems/cpukit/score/inline/rtems/score/prioritybitmap.inl Thu Jul 29 12:52:10 2010
@@ -0,0 +1,193 @@
+/**
+ * @file rtems/score/prioritybitmap.inl
+ *
+ * This file contains the static inline implementation of all inlined
+ * routines in the Priority Handler bit map implementation
+ */
+
+/*
+ * COPYRIGHT (c) 1989-2010.
+ * 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.
+ *
+ * $Id$
+ */
+
+#ifndef _RTEMS_SCORE_PRIORITYBITMAP_H
+# error "Never use <rtems/score/prioritybitmap.inl> directly; include <rtems/score/prioritybitmap.h> instead."
+#endif
+
+#ifndef _RTEMS_SCORE_PRIORITYBITMAP_INL
+#define _RTEMS_SCORE_PRIORITYBITMAP_INL
+
+/**
+ * @addtogroup ScorePriority
+ * @{
+ */
+
+#include <rtems/score/bitfield.h>
+
+/**
+ * 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
+
+/**
+ * Priority Queue implemented by bit map
+ */
+
+/**
+ * This routine performs the initialization necessary for this handler.
+ */
+
+RTEMS_INLINE_ROUTINE void _Priority_bit_map_Handler_initialization( void )
+{
+ int index;
+
+ _Priority_Major_bit_map = 0;
+ for ( index=0 ; index <16 ; index++ )
+ _Priority_Bit_map[ index ] = 0;
+}
+
+/**
+ * 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_bit_map_Add (
+ Priority_bit_map_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_bit_map_Remove (
+ Priority_bit_map_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_bit_map_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_bit_map_Initialize_information(
+ Priority_bit_map_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));
+}
+
+/**@}*/
+
+#endif
+/* end of include file */
diff -u rtems/cpukit/score/inline/rtems/score/thread.inl:1.41 rtems/cpukit/score/inline/rtems/score/thread.inl:1.42
--- rtems/cpukit/score/inline/rtems/score/thread.inl:1.41 Mon Jul 26 20:48:46 2010
+++ rtems/cpukit/score/inline/rtems/score/thread.inl Thu Jul 29 12:52:10 2010
@@ -127,7 +127,7 @@
RTEMS_INLINE_ROUTINE void _Thread_Calculate_heir( void )
{
_Thread_Heir = (Thread_Control *)
- _Thread_Ready_chain[ _Priority_Get_highest() ].first;
+ _Thread_Ready_chain[ _Priority_bit_map_Get_highest() ].first;
}
/**
diff -u rtems/cpukit/score/preinstall.am:1.23 rtems/cpukit/score/preinstall.am:1.24
--- rtems/cpukit/score/preinstall.am:1.23 Fri Jul 16 03:31:34 2010
+++ rtems/cpukit/score/preinstall.am Thu Jul 29 12:52:10 2010
@@ -107,6 +107,10 @@
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/priority.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/priority.h
+$(PROJECT_INCLUDE)/rtems/score/prioritybitmap.h: include/rtems/score/prioritybitmap.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/prioritybitmap.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/prioritybitmap.h
+
$(PROJECT_INCLUDE)/rtems/score/stack.h: include/rtems/score/stack.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/stack.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/stack.h
@@ -237,6 +241,10 @@
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/priority.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/priority.inl
+$(PROJECT_INCLUDE)/rtems/score/prioritybitmap.inl: inline/rtems/score/prioritybitmap.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/prioritybitmap.inl
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/prioritybitmap.inl
+
$(PROJECT_INCLUDE)/rtems/score/stack.inl: inline/rtems/score/stack.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/stack.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/stack.inl
diff -u rtems/cpukit/score/src/threadchangepriority.c:1.12 rtems/cpukit/score/src/threadchangepriority.c:1.13
--- rtems/cpukit/score/src/threadchangepriority.c:1.12 Sun Dec 21 23:52:32 2008
+++ rtems/cpukit/score/src/threadchangepriority.c Thu Jul 29 12:52:10 2010
@@ -120,7 +120,7 @@
*/
the_thread->current_state = _States_Clear( STATES_TRANSIENT, state );
- _Priority_Add_to_bit_map( &the_thread->Priority_map );
+ _Priority_bit_map_Add( &the_thread->Priority_map );
if ( prepend_it )
_Chain_Prepend_unprotected( the_thread->ready, &the_thread->Object.Node );
else
diff -u rtems/cpukit/score/src/threadclearstate.c:1.10 rtems/cpukit/score/src/threadclearstate.c:1.11
--- rtems/cpukit/score/src/threadclearstate.c:1.10 Sun Nov 29 07:51:52 2009
+++ rtems/cpukit/score/src/threadclearstate.c Thu Jul 29 12:52:10 2010
@@ -67,7 +67,7 @@
if ( _States_Is_ready( current_state ) ) {
- _Priority_Add_to_bit_map( &the_thread->Priority_map );
+ _Priority_bit_map_Add( &the_thread->Priority_map );
_Chain_Append_unprotected(the_thread->ready, &the_thread->Object.Node);
diff -u rtems/cpukit/score/src/threadready.c:1.7 rtems/cpukit/score/src/threadready.c:1.8
--- rtems/cpukit/score/src/threadready.c:1.7 Sun Dec 21 23:52:32 2008
+++ rtems/cpukit/score/src/threadready.c Thu Jul 29 12:52:10 2010
@@ -61,7 +61,7 @@
the_thread->current_state = STATES_READY;
- _Priority_Add_to_bit_map( &the_thread->Priority_map );
+ _Priority_bit_map_Add( &the_thread->Priority_map );
_Chain_Append_unprotected( the_thread->ready, &the_thread->Object.Node );
diff -u rtems/cpukit/score/src/threadresume.c:1.10 rtems/cpukit/score/src/threadresume.c:1.11
--- rtems/cpukit/score/src/threadresume.c:1.10 Thu Jun 17 21:56:26 2010
+++ rtems/cpukit/score/src/threadresume.c Thu Jul 29 12:52:10 2010
@@ -69,7 +69,7 @@
if ( _States_Is_ready( current_state ) ) {
- _Priority_Add_to_bit_map( &the_thread->Priority_map );
+ _Priority_bit_map_Add( &the_thread->Priority_map );
_Chain_Append_unprotected(the_thread->ready, &the_thread->Object.Node);
diff -u rtems/cpukit/score/src/threadsetpriority.c:1.4 rtems/cpukit/score/src/threadsetpriority.c:1.5
--- rtems/cpukit/score/src/threadsetpriority.c:1.4 Wed Jan 26 23:57:05 2005
+++ rtems/cpukit/score/src/threadsetpriority.c Thu Jul 29 12:52:10 2010
@@ -52,5 +52,8 @@
the_thread->current_priority = new_priority;
the_thread->ready = &_Thread_Ready_chain[ new_priority ];
- _Priority_Initialize_information( &the_thread->Priority_map, new_priority );
+ _Priority_bit_map_Initialize_information(
+ &the_thread->Priority_map,
+ new_priority
+ );
}
diff -u rtems/cpukit/score/src/threadsetstate.c:1.6 rtems/cpukit/score/src/threadsetstate.c:1.7
--- rtems/cpukit/score/src/threadsetstate.c:1.6 Sun Dec 21 23:52:32 2008
+++ rtems/cpukit/score/src/threadsetstate.c Thu Jul 29 12:52:10 2010
@@ -70,7 +70,7 @@
if ( _Chain_Has_only_one_node( ready ) ) {
_Chain_Initialize_empty( ready );
- _Priority_Remove_from_bit_map( &the_thread->Priority_map );
+ _Priority_bit_map_Remove( &the_thread->Priority_map );
} else
_Chain_Extract_unprotected( &the_thread->Object.Node );
diff -u rtems/cpukit/score/src/threadsettransient.c:1.5 rtems/cpukit/score/src/threadsettransient.c:1.6
--- rtems/cpukit/score/src/threadsettransient.c:1.5 Wed Jan 26 23:57:05 2005
+++ rtems/cpukit/score/src/threadsettransient.c Thu Jul 29 12:52:10 2010
@@ -66,7 +66,7 @@
if ( _Chain_Has_only_one_node( ready ) ) {
_Chain_Initialize_empty( ready );
- _Priority_Remove_from_bit_map( &the_thread->Priority_map );
+ _Priority_bit_map_Remove( &the_thread->Priority_map );
} else
_Chain_Extract_unprotected( &the_thread->Object.Node );
diff -u rtems/cpukit/score/src/threadsuspend.c:1.7 rtems/cpukit/score/src/threadsuspend.c:1.8
--- rtems/cpukit/score/src/threadsuspend.c:1.7 Thu Jun 17 21:56:26 2010
+++ rtems/cpukit/score/src/threadsuspend.c Thu Jul 29 12:52:10 2010
@@ -68,7 +68,7 @@
if ( _Chain_Has_only_one_node( ready ) ) {
_Chain_Initialize_empty( ready );
- _Priority_Remove_from_bit_map( &the_thread->Priority_map );
+ _Priority_bit_map_Remove( &the_thread->Priority_map );
} else
_Chain_Extract_unprotected( &the_thread->Object.Node );
*joel*:
2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
PR 1635/cpukit
* porting/prioritybitmap.t: 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.
M 1.284 doc/ChangeLog
M 1.7 doc/porting/prioritybitmap.t
diff -u rtems/doc/ChangeLog:1.283 rtems/doc/ChangeLog:1.284
--- rtems/doc/ChangeLog:1.283 Mon Jun 28 19:39:27 2010
+++ rtems/doc/ChangeLog Thu Jul 29 12:52:18 2010
@@ -1,3 +1,14 @@
+2010-07-29 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1635/cpukit
+ * porting/prioritybitmap.t: 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.
+
2010-06-28 Joel Sherrill <joel.sherrill at oarcorp.com>
PR 1573/cpukit
diff -u rtems/doc/porting/prioritybitmap.t:1.6 rtems/doc/porting/prioritybitmap.t:1.7
--- rtems/doc/porting/prioritybitmap.t:1.6 Thu Jan 17 15:47:45 2002
+++ rtems/doc/porting/prioritybitmap.t Thu Jul 29 12:52:18 2010
@@ -44,7 +44,7 @@
at the priority.
- at section _Priority_Bit_map_control Type
+ at section _Priority_bit_map_Control Type
The @code{_Priority_Bit_map_Control} type is the fundamental data type of the
priority bit map array used to determine which priorities have ready
@@ -59,7 +59,7 @@
The _CPU_Bitfield_Find_first_bit routine sets _output to the bit number of
the first bit set in @code{_value}. @code{_value} is of CPU dependent type
- at code{Priority_Bit_map_control}. A stub version of this routine is as follows:
+ at code{Priority_bit_map_Control}. A stub version of this routine is as follows:
@example
#define _CPU_Bitfield_Find_first_bit( _value, _output ) \
*ralf*:
2010-07-29 Ralf Corsépius <ralf.corsepius at rtems.org>
* rtems-bin2c.c: Add -C and -H options.
M 1.39 tools/build/ChangeLog
M 1.6 tools/build/rtems-bin2c.c
diff -u rtems/tools/build/ChangeLog:1.38 rtems/tools/build/ChangeLog:1.39
--- rtems/tools/build/ChangeLog:1.38 Fri Mar 12 10:27:00 2010
+++ rtems/tools/build/ChangeLog Thu Jul 29 12:12:38 2010
@@ -1,3 +1,7 @@
+2010-07-29 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * rtems-bin2c.c: Add -C and -H options.
+
2010-03-12 Joel Sherrill <joel.sherrill at oarcorp.com>
* eolstrip.c: Readdress use of ctype methods per recommendation from
diff -u rtems/tools/build/rtems-bin2c.c:1.5 rtems/tools/build/rtems-bin2c.c:1.6
--- rtems/tools/build/rtems-bin2c.c:1.5 Thu Dec 10 08:23:57 2009
+++ rtems/tools/build/rtems-bin2c.c Thu Jul 29 12:12:38 2010
@@ -38,6 +38,8 @@
int usestatic = 0;
int verbose = 0;
int zeroterminated = 0;
+int createC = 1;
+int createH = 1;
int myfgetc(FILE *f)
{
@@ -91,18 +93,23 @@
fprintf(stderr, "cannot open %s for reading\n", ifname);
exit(1);
}
+
+ if ( createC ) {
ocfile = fopen(ocname, "wb");
if (ocfile == NULL) {
fprintf(stderr, "cannot open %s for writing\n", ocname);
exit(1);
}
-
+ }
+
+ if ( createH ) {
ohfile = fopen(ohname, "wb");
if (ohfile == NULL) {
fprintf(stderr, "cannot open %s for writing\n", ohname);
exit(1);
}
-
+ }
+
/* find basename */
if ((cp = strrchr(ifname, '/')) != NULL)
++cp;
@@ -117,6 +124,7 @@
if (!isalnum(*p))
*p = '_';
+ if ( createC ) {
/* print C file header */
fprintf(
ocfile,
@@ -161,11 +169,13 @@
buf,
buf
);
-
+ } /* createC */
+
/*****************************************************************/
/****** END OF C FILE *****/
/*****************************************************************/
+ if ( createH ) {
/* print H file header */
fprintf(
ohfile,
@@ -208,21 +218,22 @@
"\n"
"#endif\n"
);
-
+ } /* createH */
+
/*****************************************************************/
/****** END OF H FILE *****/
/*****************************************************************/
fclose(ifile);
- fclose(ocfile);
- fclose(ohfile);
+ if ( createC ) { fclose(ocfile); }
+ if ( createH ) { fclose(ohfile); }
}
void usage(void)
{
fprintf(
stderr,
- "usage: bin2c [-csvz] <input_file> <output_file>\n"
+ "usage: bin2c [-csvzCH] <input_file> <output_file>\n"
" <input_file> is the binary file to convert\n"
" <output_file> should not have a .c or .h extension\n"
"\n"
@@ -230,6 +241,8 @@
" -s - do use static in declaration\n"
" -v - verbose\n"
" -z - add zero terminator\n"
+ " -H - create c-header only\n"
+ " -C - create c-source file only\n"
);
exit(1);
}
@@ -253,6 +266,16 @@
zeroterminated = 1;
--argc;
++argv;
+ } else if (!strcmp(argv[1], "-C")) {
+ createH = 0;
+ createC = 1;
+ --argc;
+ ++argv;
+ } else if (!strcmp(argv[1], "-H")) {
+ createC = 0;
+ createH = 1;
+ --argc;
+ ++argv;
} else {
usage();
}
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100729/fcccb484/attachment-0001.html>
More information about the vc
mailing list