From 97312fcc6da163d76b69bf8ce68fd791cf014c2a Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 5 Apr 2016 14:36:30 +0200 Subject: score: Delete Thread_Wait_information::id This field was only by the monitor in non-multiprocessing configurations. Add new field Thread_Wait_information::remote_id in multiprocessing configurations and use it for the remote procedure call thread queue. Add _Thread_Wait_get_id() to obtain the object identifier for debug and system information tools. Ensure the object layout via static asserts. Add test cases to sptests/spthreadq01. --- cpukit/score/Makefile.am | 1 + cpukit/score/include/rtems/score/coremuteximpl.h | 1 - cpukit/score/include/rtems/score/coresemimpl.h | 1 - cpukit/score/include/rtems/score/thread.h | 9 +++- cpukit/score/include/rtems/score/threadimpl.h | 36 ++++++++++++++++ cpukit/score/src/corebarrierwait.c | 2 - cpukit/score/src/coremsgseize.c | 1 - cpukit/score/src/coremsgsubmit.c | 1 - cpukit/score/src/corerwlockobtainread.c | 1 - cpukit/score/src/corerwlockobtainwrite.c | 1 - cpukit/score/src/mpci.c | 2 +- cpukit/score/src/threadmp.c | 1 - cpukit/score/src/threadqextractwithproxy.c | 2 +- cpukit/score/src/threadwaitgetid.c | 54 ++++++++++++++++++++++++ 14 files changed, 100 insertions(+), 13 deletions(-) create mode 100644 cpukit/score/src/threadwaitgetid.c (limited to 'cpukit/score') diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index 6ff4e02adf..5d5f6880af 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -308,6 +308,7 @@ libscore_a_SOURCES += src/threadentryadaptorpointer.c libscore_a_SOURCES += src/threadgetcputimeused.c libscore_a_SOURCES += src/threadglobalconstruction.c libscore_a_SOURCES += src/threadtimeout.c +libscore_a_SOURCES += src/threadwaitgetid.c libscore_a_SOURCES += src/threadyield.c if HAS_SMP diff --git a/cpukit/score/include/rtems/score/coremuteximpl.h b/cpukit/score/include/rtems/score/coremuteximpl.h index b22f4a7d5c..a1cbb17734 100644 --- a/cpukit/score/include/rtems/score/coremuteximpl.h +++ b/cpukit/score/include/rtems/score/coremuteximpl.h @@ -265,7 +265,6 @@ RTEMS_INLINE_ROUTINE void _CORE_mutex_Seize_body( executing->Wait.return_code = CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT; } else { - executing->Wait.id = id; _CORE_mutex_Seize_interrupt_blocking( the_mutex, executing, diff --git a/cpukit/score/include/rtems/score/coresemimpl.h b/cpukit/score/include/rtems/score/coresemimpl.h index c70e54f36c..46033a8499 100644 --- a/cpukit/score/include/rtems/score/coresemimpl.h +++ b/cpukit/score/include/rtems/score/coresemimpl.h @@ -251,7 +251,6 @@ RTEMS_INLINE_ROUTINE void _CORE_semaphore_Seize( return; } - executing->Wait.id = id; _Thread_queue_Enqueue_critical( &the_semaphore->Wait_queue.Queue, the_semaphore->operations, diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h index ffca164cd5..949e8ca5ed 100644 --- a/cpukit/score/include/rtems/score/thread.h +++ b/cpukit/score/include/rtems/score/thread.h @@ -291,8 +291,13 @@ typedef struct { RBTree_Node RBTree; } Node; - /** This field is the Id of the object this thread is waiting upon. */ - Objects_Id id; +#if defined(RTEMS_MULTIPROCESSING) + /* + * @brief This field is the identifier of the remote object this thread is + * waiting upon. + */ + Objects_Id remote_id; +#endif /** This field is used to return an integer while when blocked. */ uint32_t count; /** This field is for a pointer to a user return argument. */ diff --git a/cpukit/score/include/rtems/score/threadimpl.h b/cpukit/score/include/rtems/score/threadimpl.h index 516441ed9c..6b65e8ecbc 100644 --- a/cpukit/score/include/rtems/score/threadimpl.h +++ b/cpukit/score/include/rtems/score/threadimpl.h @@ -1448,6 +1448,42 @@ RTEMS_INLINE_ROUTINE void _Thread_Wait_set_timeout_code( the_thread->Wait.timeout_code = timeout_code; } +/** + * @brief Helper structure to ensure that all objects containing a thread queue + * have the right layout. + * + * @see _Thread_Wait_get_id() and THREAD_WAIT_QUEUE_OBJECT_ASSERT(). + */ +typedef struct { + Objects_Control Object; + Thread_queue_Control Wait_queue; +} Thread_Wait_queue_object; + +#define THREAD_WAIT_QUEUE_OBJECT_ASSERT( object_type, wait_queue_member ) \ + RTEMS_STATIC_ASSERT( \ + offsetof( object_type, wait_queue_member ) \ + == offsetof( Thread_Wait_queue_object, Wait_queue ) \ + && ( &( ( (object_type *) 0 )->wait_queue_member ) \ + == ( &( (Thread_Wait_queue_object *) 0 )->Wait_queue ) ), \ + object_type \ + ) + +/** + * @brief Returns the object identifier of the object containing the current + * thread wait queue. + * + * This function may be used for debug and system information purposes. The + * caller must be the owner of the thread lock. + * + * @retval 0 The thread waits on no thread queue currently, the thread wait + * queue is not contained in an object, or the current thread state provides + * insufficient information, e.g. the thread is in the middle of a blocking + * operation. + * @retval other The object identifier of the object containing the thread wait + * queue. + */ +Objects_Id _Thread_Wait_get_id( const Thread_Control *the_thread ); + /** * @brief General purpose thread wait timeout. * diff --git a/cpukit/score/src/corebarrierwait.c b/cpukit/score/src/corebarrierwait.c index 4fadc03d9b..52cbe74163 100644 --- a/cpukit/score/src/corebarrierwait.c +++ b/cpukit/score/src/corebarrierwait.c @@ -47,8 +47,6 @@ void _CORE_barrier_Wait( } } - executing->Wait.id = id; - _Thread_queue_Enqueue_critical( &the_barrier->Wait_queue.Queue, CORE_BARRIER_TQ_OPERATIONS, diff --git a/cpukit/score/src/coremsgseize.c b/cpukit/score/src/coremsgseize.c index 9d26fb1235..34a3c50e47 100644 --- a/cpukit/score/src/coremsgseize.c +++ b/cpukit/score/src/coremsgseize.c @@ -127,7 +127,6 @@ void _CORE_message_queue_Seize( return; } - executing->Wait.id = id; executing->Wait.return_argument_second.mutable_object = buffer; executing->Wait.return_argument = size_p; /* Wait.count will be filled in with the message priority */ diff --git a/cpukit/score/src/coremsgsubmit.c b/cpukit/score/src/coremsgsubmit.c index 5f61c5e644..02de12f6ea 100644 --- a/cpukit/score/src/coremsgsubmit.c +++ b/cpukit/score/src/coremsgsubmit.c @@ -126,7 +126,6 @@ CORE_message_queue_Status _CORE_message_queue_Submit( * it as a variable. Doing this emphasizes how dangerous it * would be to use this variable prior to here. */ - executing->Wait.id = id; executing->Wait.return_argument_second.immutable_object = buffer; executing->Wait.option = (uint32_t) size; executing->Wait.count = submit_type; diff --git a/cpukit/score/src/corerwlockobtainread.c b/cpukit/score/src/corerwlockobtainread.c index 97d7b9e513..4676dd7424 100644 --- a/cpukit/score/src/corerwlockobtainread.c +++ b/cpukit/score/src/corerwlockobtainread.c @@ -81,7 +81,6 @@ void _CORE_RWLock_Obtain_for_reading( * We need to wait to enter this critical section */ - executing->Wait.id = id; executing->Wait.option = CORE_RWLOCK_THREAD_WAITING_FOR_READ; executing->Wait.return_code = CORE_RWLOCK_SUCCESSFUL; diff --git a/cpukit/score/src/corerwlockobtainwrite.c b/cpukit/score/src/corerwlockobtainwrite.c index 28de842f9d..04416505c2 100644 --- a/cpukit/score/src/corerwlockobtainwrite.c +++ b/cpukit/score/src/corerwlockobtainwrite.c @@ -68,7 +68,6 @@ void _CORE_RWLock_Obtain_for_writing( * We need to wait to enter this critical section */ - executing->Wait.id = id; executing->Wait.option = CORE_RWLOCK_THREAD_WAITING_FOR_WRITE; executing->Wait.return_code = CORE_RWLOCK_SUCCESSFUL; diff --git a/cpukit/score/src/mpci.c b/cpukit/score/src/mpci.c index 76ca4c8309..20d5084cc5 100644 --- a/cpukit/score/src/mpci.c +++ b/cpukit/score/src/mpci.c @@ -242,7 +242,7 @@ uint32_t _MPCI_Send_request_packet ( the_packet->to_convert = ( the_packet->to_convert - sizeof(MP_packet_Prefix) ) / sizeof(uint32_t); - executing->Wait.id = the_packet->id; + executing->Wait.remote_id = the_packet->id; (*_MPCI_table->send_packet)( destination, the_packet ); diff --git a/cpukit/score/src/threadmp.c b/cpukit/score/src/threadmp.c index 2d7e92496d..33c90789b0 100644 --- a/cpukit/score/src/threadmp.c +++ b/cpukit/score/src/threadmp.c @@ -95,7 +95,6 @@ Thread_Control *_Thread_MP_Allocate_proxy ( the_proxy->current_state = _States_Set( STATES_DORMANT, the_state ); - the_proxy->Wait.id = executing->Wait.id; the_proxy->Wait.count = executing->Wait.count; the_proxy->Wait.return_argument = executing->Wait.return_argument; the_proxy->Wait.return_argument_second = executing->Wait.return_argument_second; diff --git a/cpukit/score/src/threadqextractwithproxy.c b/cpukit/score/src/threadqextractwithproxy.c index 9bbf9c6f64..efe0940940 100644 --- a/cpukit/score/src/threadqextractwithproxy.c +++ b/cpukit/score/src/threadqextractwithproxy.c @@ -41,7 +41,7 @@ void _Thread_queue_Extract_with_proxy( Objects_Information *the_information; Objects_Thread_queue_Extract_callout proxy_extract_callout; - id = the_thread->Wait.id; + id = the_thread->Wait.remote_id; the_information = _Objects_Get_information_id( id ); proxy_extract_callout = the_information->extract; diff --git a/cpukit/score/src/threadwaitgetid.c b/cpukit/score/src/threadwaitgetid.c new file mode 100644 index 0000000000..0851e8f18d --- /dev/null +++ b/cpukit/score/src/threadwaitgetid.c @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2016 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.org/license/LICENSE. + */ + +#if HAVE_CONFIG_H + #include "config.h" +#endif + +#include + +#define THREAD_WAIT_QUEUE_OBJECT_STATES \ + ( STATES_WAITING_FOR_BARRIER \ + | STATES_WAITING_FOR_CONDITION_VARIABLE \ + | STATES_WAITING_FOR_MESSAGE \ + | STATES_WAITING_FOR_MUTEX \ + | STATES_WAITING_FOR_RWLOCK \ + | STATES_WAITING_FOR_SEMAPHORE ) + +Objects_Id _Thread_Wait_get_id( const Thread_Control *the_thread ) +{ + States_Control current_state; + + current_state = the_thread->current_state; + +#if defined(RTEMS_MULTIPROCESSING) + if ( ( current_state & STATES_WAITING_FOR_RPC_REPLY ) != 0 ) { + return the_thread->Wait.remote_id; + } +#endif + + if ( ( current_state & THREAD_WAIT_QUEUE_OBJECT_STATES ) != 0 ) { + const Thread_Wait_queue_object *queue_object; + + queue_object = RTEMS_CONTAINER_OF( + the_thread->Wait.queue, + Thread_Wait_queue_object, + Wait_queue.Queue + ); + + return queue_object->Object.id; + } + + return 0; +} -- cgit v1.2.3