diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-11-24 15:51:28 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-11-24 15:51:28 +0000 |
commit | 0faa9dad0768f0291cb44d8d0dcb74fd3f362cc2 (patch) | |
tree | 5fdf3fb63a7b901897891cf25b3958c9a750ed69 /cpukit/score/include/rtems/score/thread.h | |
parent | Remove duplicate entry. (diff) | |
download | rtems-0faa9dad0768f0291cb44d8d0dcb74fd3f362cc2.tar.bz2 |
2010-11-24 Gedare Bloom <giddyup44@yahoo.com>
PR 1647/cpukit
* posix/src/nanosleep.c, posix/src/sched_yield.c,
rtems/src/taskwakeafter.c, sapi/include/confdefs.h,
sapi/include/rtems/config.h, sapi/src/exinit.c, score/Makefile.am,
score/preinstall.am, score/include/rtems/score/prioritybitmap.h,
score/include/rtems/score/thread.h,
score/inline/rtems/score/thread.inl, score/src/thread.c,
score/src/threadchangepriority.c, score/src/threadclearstate.c,
score/src/threadclose.c, score/src/threadinitialize.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,
score/src/threadtickletimeslice.c: Refactor scheduler out of thread
handler to facilitate alternate scheduler implementations.
* score/src/threadyieldprocessor.c: Removed.
* score/src/schedulerprioritythreadschedulerupdate.c,
score/src/schedulerprioritythreadschedulerfree.c,
score/src/schedulerpriorityblock.c, score/src/scheduler.c,
score/src/schedulerprioritythreadschedulerallocate.c,
score/src/schedulerpriorityunblock.c,
score/src/schedulerpriority.c, score/src/schedulerpriorityyield.c,
score/include/rtems/score/schedulerpriority.h,
score/include/rtems/score/scheduler.h,
score/inline/rtems/score/scheduler.inl,
score/inline/rtems/score/schedulerpriority.inl: New files.
Diffstat (limited to 'cpukit/score/include/rtems/score/thread.h')
-rw-r--r-- | cpukit/score/include/rtems/score/thread.h | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h index 9565458bb8..370d5491a3 100644 --- a/cpukit/score/include/rtems/score/thread.h +++ b/cpukit/score/include/rtems/score/thread.h @@ -70,7 +70,7 @@ extern "C" { #endif #include <rtems/score/object.h> #include <rtems/score/priority.h> -#include <rtems/score/prioritybitmap.h> +#include <rtems/score/scheduler.h> #include <rtems/score/stack.h> #include <rtems/score/states.h> #include <rtems/score/tod.h> @@ -390,10 +390,10 @@ struct Thread_Control_struct { * since it was created. */ Thread_CPU_usage_t cpu_time_used; - /** This field points to the Ready FIFO for this priority. */ - Chain_Control *ready; - /** This field contains precalculated priority map indices. */ - Priority_bit_map_Information Priority_map; + /** This union holds per-thread data for the scheduler and ready queue. */ + union { + Scheduler_priority_Per_thread *priority; + } scheduler; /** This field contains information about the starting state of * this thread. */ @@ -456,12 +456,6 @@ SCORE_EXTERN uint32_t _Thread_Maximum_extensions; SCORE_EXTERN uint32_t _Thread_Ticks_per_timeslice; /** - * The following points to the array of FIFOs used to manage the - * set of ready threads. - */ -SCORE_EXTERN Chain_Control *_Thread_Ready_chain; - -/** * The following points to the thread whose floating point * context is currently loaded. */ @@ -654,13 +648,6 @@ void _Thread_Set_transient( void _Thread_Tickle_timeslice( void ); /** - * This routine is invoked when a thread wishes to voluntarily - * transfer control of the processor to another thread of equal - * or greater priority. - */ -void _Thread_Yield_processor( void ); - -/** * This routine initializes the context of the_thread to its * appropriate starting state. */ |