RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

score: Delete STATES_WAITING_ON_THREAD_QUEUE

Browse Source 
Avoid the usage of the current thread state in
_Thread_queue_Extract_with_return_code() since thread queues should not
know anything about thread states.
This commit is contained in:
Sebastian Huber
2015-04-23 21:29:56 +02:00
parent 22788bc2ba
commit 56729d83c9
3 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpukit/posix/src/psignalunblockthread.c
View File

@@ -114,11 +114,11 @@ bool _POSIX_signals_Unblock_thread(
* In pthread_cond_wait, a thread will be blocking on a thread * In pthread_cond_wait, a thread will be blocking on a thread
* queue, but is also interruptible by a POSIX signal. * queue, but is also interruptible by a POSIX signal.
*/ */
if ( _States_Is_waiting_on_thread_queue(the_thread->current_state) ) if ( _States_Is_delaying(the_thread->current_state) ) {
_Thread_queue_Extract_with_proxy( the_thread );
else if ( _States_Is_delaying(the_thread->current_state) ) {
(void) _Watchdog_Remove( &the_thread->Timer ); (void) _Watchdog_Remove( &the_thread->Timer );
_Thread_Unblock( the_thread ); _Thread_Unblock( the_thread );
} else {
_Thread_queue_Extract_with_proxy( the_thread );
} }
} }
} }

26
cpukit/score/include/rtems/score/statesimpl.h
View File

@@ -105,19 +105,14 @@ extern "C" {
STATES_WAITING_FOR_BSD_WAKEUP | \ STATES_WAITING_FOR_BSD_WAKEUP | \
STATES_WAITING_FOR_RWLOCK ) STATES_WAITING_FOR_RWLOCK )
/** This macro corresponds to a task waiting which is blocked on
* a thread queue. */
#define STATES_WAITING_ON_THREAD_QUEUE \
( STATES_LOCALLY_BLOCKED | \
STATES_WAITING_FOR_RPC_REPLY )
/** This macro corresponds to a task waiting which is blocked. */ /** This macro corresponds to a task waiting which is blocked. */
#define STATES_BLOCKED ( STATES_DELAYING | \ #define STATES_BLOCKED ( STATES_DELAYING | \
STATES_LOCALLY_BLOCKED | \
STATES_WAITING_FOR_TIME | \ STATES_WAITING_FOR_TIME | \
STATES_WAITING_FOR_PERIOD | \ STATES_WAITING_FOR_PERIOD | \
STATES_WAITING_FOR_EVENT | \ STATES_WAITING_FOR_EVENT | \
STATES_WAITING_FOR_RPC_REPLY | \
STATES_WAITING_FOR_SYSTEM_EVENT | \ STATES_WAITING_FOR_SYSTEM_EVENT | \
STATES_WAITING_ON_THREAD_QUEUE | \
STATES_INTERRUPTIBLE_BY_SIGNAL ) STATES_INTERRUPTIBLE_BY_SIGNAL )
/** All state bits set to one (provided for _Thread_Ready()) */ /** All state bits set to one (provided for _Thread_Ready()) */
@@ -414,23 +409,6 @@ RTEMS_INLINE_ROUTINE bool _States_Is_locally_blocked (
return (the_states & STATES_LOCALLY_BLOCKED); return (the_states & STATES_LOCALLY_BLOCKED);
} }
/**
* This function returns true if one of the states which indicates
* that a task is blocked waiting for a local resource is set in
* the_states, and false otherwise.
*
* @param[in] the_states is the task state set to test
*
* @return This method returns true if the state indicates that the
* assocated thread is waiting on a thread queue.
*/
RTEMS_INLINE_ROUTINE bool _States_Is_waiting_on_thread_queue (
States_Control the_states
)
{
return (the_states & STATES_WAITING_ON_THREAD_QUEUE);
}
/** /**
* This function returns true if one of the states which indicates * This function returns true if one of the states which indicates
* that a task is blocked is set in the_states, and false otherwise. * that a task is blocked is set in the_states, and false otherwise.

5
cpukit/score/src/threadqenqueue.c
View File

@@ -194,13 +194,12 @@ void _Thread_queue_Extract_with_return_code(
_Thread_queue_Acquire( &lock_context ); _Thread_queue_Acquire( &lock_context );
if ( !_States_Is_waiting_on_thread_queue( the_thread->current_state ) ) { the_thread_queue = the_thread->Wait.queue;
if ( the_thread_queue == NULL ) {
_Thread_queue_Release( &lock_context ); _Thread_queue_Release( &lock_context );
return; return;
} }
the_thread_queue = the_thread->Wait.queue;
if ( the_thread_queue->discipline == THREAD_QUEUE_DISCIPLINE_FIFO ) { if ( the_thread_queue->discipline == THREAD_QUEUE_DISCIPLINE_FIFO ) {
_Chain_Extract_unprotected( &the_thread->Object.Node ); _Chain_Extract_unprotected( &the_thread->Object.Node );
} else { /* must be THREAD_QUEUE_DISCIPLINE_PRIORITY */ } else { /* must be THREAD_QUEUE_DISCIPLINE_PRIORITY */