diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-01-30 14:56:57 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-01-30 14:56:57 +0000 |
commit | c57f26bd079d35aa41963c13bd30c9322a99232d (patch) | |
tree | 586f1339546d8c8b3c9a1d95f88d99aac6061ff5 /cpukit | |
parent | 2008-01-29 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-c57f26bd079d35aa41963c13bd30c9322a99232d.tar.bz2 |
2008-01-30 Joel Sherrill <joel.sherrill@OARcorp.com>
* score/Makefile.am, score/include/rtems/score/threadq.h,
score/inline/rtems/score/threadq.inl: _Thread_queue_Process_timeout
was really too complex to be inlined.
* score/src/threadqprocesstimeout.c: New file.
Diffstat (limited to '')
-rw-r--r-- | cpukit/ChangeLog | 7 | ||||
-rw-r--r-- | cpukit/score/Makefile.am | 2 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/threadq.h | 15 | ||||
-rw-r--r-- | cpukit/score/inline/rtems/score/threadq.inl | 41 | ||||
-rw-r--r-- | cpukit/score/src/threadqprocesstimeout.c | 57 |
5 files changed, 80 insertions, 42 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 377caf6d4f..548992244c 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,10 @@ +2008-01-30 Joel Sherrill <joel.sherrill@OARcorp.com> + + * score/Makefile.am, score/include/rtems/score/threadq.h, + score/inline/rtems/score/threadq.inl: _Thread_queue_Process_timeout + was really too complex to be inlined. + * score/src/threadqprocesstimeout.c: New file. + 2008-01-29 Joel Sherrill <joel.sherrill@oarcorp.com> * score/Doxyfile: Revert Doxygen version changes. diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index bb3c7bfcd6..dd5e3fad0d 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -158,7 +158,7 @@ libscore_a_SOURCES += src/threadq.c src/threadqdequeue.c \ src/threadqextractfifo.c src/threadqextractpriority.c \ src/threadqextractwithproxy.c src/threadqfirst.c src/threadqfirstfifo.c \ src/threadqfirstpriority.c src/threadqflush.c src/threadqrequeue.c \ - src/threadqtimeout.c + src/threadqprocesstimeout.c src/threadqtimeout.c ## TIMESPEC_C_FILES libscore_a_SOURCES += src/timespecaddto.c src/timespecfromticks.c \ diff --git a/cpukit/score/include/rtems/score/threadq.h b/cpukit/score/include/rtems/score/threadq.h index 2345087c04..d3a7679d7e 100644 --- a/cpukit/score/include/rtems/score/threadq.h +++ b/cpukit/score/include/rtems/score/threadq.h @@ -270,6 +270,21 @@ void _Thread_queue_Timeout ( void *ignored ); +/** + * @brief Process Thread Queue Timeout + * + * This is a shared helper routine which makes it easier to have multiple + * object class specific timeout routines. + * + * @param[in] the_thread is the thread to extract + * + * @note This method assumes thread dispatching is disabled + * and is expected to be called via the processing of + * a clock tick. + */ +void _Thread_queue_Process_timeout( + Thread_Control *the_thread +); #ifndef __RTEMS_APPLICATION__ #include <rtems/score/threadq.inl> diff --git a/cpukit/score/inline/rtems/score/threadq.inl b/cpukit/score/inline/rtems/score/threadq.inl index 5e0d921ac8..2e6f1d96bd 100644 --- a/cpukit/score/inline/rtems/score/threadq.inl +++ b/cpukit/score/inline/rtems/score/threadq.inl @@ -26,47 +26,6 @@ * @{ */ -/** - * - * @brief Process Thread Queue Timeout - * - * This is a shared helper routine which makes it easier to have multiple - * object class specific timeout routines. - * - * @param[in] the_thread is the thread to extract - * - * @note Assume Dispatching is disabled. - */ -static inline void _Thread_queue_Process_timeout( - Thread_Control *the_thread -) -{ - Thread_queue_Control *the_thread_queue = the_thread->Wait.queue; - - /* - * If the_thread_queue is not synchronized, then it is either - * "nothing happened", "timeout", or "satisfied". If the_thread - * is the executing thread, then it is in the process of blocking - * and it is the thread which is responsible for the synchronization - * process. - * - * If it is not satisfied, then it is "nothing happened" and - * this is the "timeout" transition. After a request is satisfied, - * a timeout is not allowed to occur. - */ - - if ( the_thread_queue->sync_state != THREAD_BLOCKING_OPERATION_SYNCHRONIZED && - _Thread_Is_executing( the_thread ) ) { - if ( the_thread_queue->sync_state != THREAD_BLOCKING_OPERATION_SATISFIED ) { - the_thread->Wait.return_code = the_thread->Wait.queue->timeout_status; - the_thread_queue->sync_state = THREAD_BLOCKING_OPERATION_TIMEOUT; - } - } else { - the_thread->Wait.return_code = the_thread->Wait.queue->timeout_status; - _Thread_queue_Extract( the_thread->Wait.queue, the_thread ); - } -} - /**@}*/ #endif diff --git a/cpukit/score/src/threadqprocesstimeout.c b/cpukit/score/src/threadqprocesstimeout.c new file mode 100644 index 0000000000..9683a6e728 --- /dev/null +++ b/cpukit/score/src/threadqprocesstimeout.c @@ -0,0 +1,57 @@ +/* + * Thread Queue Handler - Process Timeout Handler + * + * + * COPYRIGHT (c) 1989-2008. + * 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$ + */ + +#if HAVE_CONFIG_H +#include "config.h" +#endif + +#include <rtems/system.h> +#include <rtems/score/chain.h> +#include <rtems/score/isr.h> +#include <rtems/score/object.h> +#include <rtems/score/states.h> +#include <rtems/score/thread.h> +#include <rtems/score/threadq.h> +#include <rtems/score/tqdata.h> + +void _Thread_queue_Process_timeout( + Thread_Control *the_thread +) +{ + Thread_queue_Control *the_thread_queue = the_thread->Wait.queue; + + /* + * If the_thread_queue is not synchronized, then it is either + * "nothing happened", "timeout", or "satisfied". If the_thread + * is the executing thread, then it is in the process of blocking + * and it is the thread which is responsible for the synchronization + * process. + * + * If it is not satisfied, then it is "nothing happened" and + * this is the "timeout" transition. After a request is satisfied, + * a timeout is not allowed to occur. + */ + + if ( the_thread_queue->sync_state != THREAD_BLOCKING_OPERATION_SYNCHRONIZED && + _Thread_Is_executing( the_thread ) ) { + if ( the_thread_queue->sync_state != THREAD_BLOCKING_OPERATION_SATISFIED ) { + the_thread->Wait.return_code = the_thread->Wait.queue->timeout_status; + the_thread_queue->sync_state = THREAD_BLOCKING_OPERATION_TIMEOUT; + } + } else { + the_thread->Wait.return_code = the_thread->Wait.queue->timeout_status; + _Thread_queue_Extract( the_thread->Wait.queue, the_thread ); + } +} + |