diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-08-22 10:58:34 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-09-08 09:55:27 +0200 |
commit | e41308eab8ae4505844d8e499664424f8c7f2bd1 (patch) | |
tree | 7dffe5edacd3f245ba5ef3b64b431b7e4c74c454 /cpukit/posix | |
parent | score: Simplify thread queue acquire/release (diff) | |
download | rtems-e41308eab8ae4505844d8e499664424f8c7f2bd1.tar.bz2 |
score: Introduce Thread_queue_Lock_context
Introduce Thread_queue_Lock_context to contain the context necessary for
thread queue lock and thread wait lock acquire/release operations to
reduce the Thread_Control size.
Diffstat (limited to 'cpukit/posix')
-rw-r--r-- | cpukit/posix/include/rtems/posix/barrierimpl.h | 2 | ||||
-rw-r--r-- | cpukit/posix/include/rtems/posix/mqueueimpl.h | 2 | ||||
-rw-r--r-- | cpukit/posix/include/rtems/posix/posixapi.h | 14 | ||||
-rw-r--r-- | cpukit/posix/include/rtems/posix/semaphoreimpl.h | 2 | ||||
-rw-r--r-- | cpukit/posix/src/condwaitsupp.c | 4 | ||||
-rw-r--r-- | cpukit/posix/src/mqueuerecvsupp.c | 4 | ||||
-rw-r--r-- | cpukit/posix/src/mqueuesendsupp.c | 2 | ||||
-rw-r--r-- | cpukit/posix/src/pthreadgetschedparam.c | 2 | ||||
-rw-r--r-- | cpukit/posix/src/pthreadjoin.c | 18 | ||||
-rw-r--r-- | cpukit/posix/src/semunlink.c | 2 |
10 files changed, 33 insertions, 19 deletions
diff --git a/cpukit/posix/include/rtems/posix/barrierimpl.h b/cpukit/posix/include/rtems/posix/barrierimpl.h index 2fbc2f9172..fae66a6171 100644 --- a/cpukit/posix/include/rtems/posix/barrierimpl.h +++ b/cpukit/posix/include/rtems/posix/barrierimpl.h @@ -71,7 +71,7 @@ RTEMS_INLINE_ROUTINE POSIX_Barrier_Control *_POSIX_Barrier_Get( _Thread_queue_Context_initialize( queue_context ); return (POSIX_Barrier_Control *) _Objects_Get( (Objects_Id) *barrier, - &queue_context->Lock_context, + &queue_context->Lock_context.Lock_context, &_POSIX_Barrier_Information ); } diff --git a/cpukit/posix/include/rtems/posix/mqueueimpl.h b/cpukit/posix/include/rtems/posix/mqueueimpl.h index 62ddbef8f8..5888800ca1 100644 --- a/cpukit/posix/include/rtems/posix/mqueueimpl.h +++ b/cpukit/posix/include/rtems/posix/mqueueimpl.h @@ -114,7 +114,7 @@ RTEMS_INLINE_ROUTINE POSIX_Message_queue_Control *_POSIX_Message_queue_Get( _Thread_queue_Context_initialize( queue_context ); return (POSIX_Message_queue_Control *) _Objects_Get( id, - &queue_context->Lock_context, + &queue_context->Lock_context.Lock_context, &_POSIX_Message_queue_Information ); } diff --git a/cpukit/posix/include/rtems/posix/posixapi.h b/cpukit/posix/include/rtems/posix/posixapi.h index fabde4d6f9..12baa75eea 100644 --- a/cpukit/posix/include/rtems/posix/posixapi.h +++ b/cpukit/posix/include/rtems/posix/posixapi.h @@ -105,16 +105,22 @@ RTEMS_INLINE_ROUTINE int _POSIX_Zero_or_minus_one_plus_errno( if ( id == NULL ) { \ return NULL; \ } \ - the_object = \ - _Objects_Get( (Objects_Id) *id, &queue_context->Lock_context, info ); \ + the_object = _Objects_Get( \ + (Objects_Id) *id, \ + &queue_context->Lock_context.Lock_context, \ + info \ + ); \ if ( the_object == NULL ) { \ _Once_Lock(); \ if ( *id == initializer ) { \ init( id, NULL ); \ } \ _Once_Unlock(); \ - the_object = \ - _Objects_Get( (Objects_Id) *id, &queue_context->Lock_context, info ); \ + the_object = _Objects_Get( \ + (Objects_Id) *id, \ + &queue_context->Lock_context.Lock_context, \ + info \ + ); \ } \ return (type *) the_object diff --git a/cpukit/posix/include/rtems/posix/semaphoreimpl.h b/cpukit/posix/include/rtems/posix/semaphoreimpl.h index 17d3f64e92..2bafbe9b97 100644 --- a/cpukit/posix/include/rtems/posix/semaphoreimpl.h +++ b/cpukit/posix/include/rtems/posix/semaphoreimpl.h @@ -64,7 +64,7 @@ RTEMS_INLINE_ROUTINE POSIX_Semaphore_Control *_POSIX_Semaphore_Get( _Thread_queue_Context_initialize( queue_context ); return (POSIX_Semaphore_Control *) _Objects_Get( (Objects_Id) *id, - &queue_context->Lock_context, + &queue_context->Lock_context.Lock_context, &_POSIX_Semaphore_Information ); } diff --git a/cpukit/posix/src/condwaitsupp.c b/cpukit/posix/src/condwaitsupp.c index 92793ed3a4..52367f6364 100644 --- a/cpukit/posix/src/condwaitsupp.c +++ b/cpukit/posix/src/condwaitsupp.c @@ -92,7 +92,9 @@ int _POSIX_Condition_variables_Wait_support( the_cond->mutex = *mutex; - cpu_self = _Thread_Dispatch_disable_critical( &queue_context.Lock_context ); + cpu_self = _Thread_Dispatch_disable_critical( + &queue_context.Lock_context.Lock_context + ); executing = _Per_CPU_Get_executing( cpu_self ); if ( !already_timedout ) { diff --git a/cpukit/posix/src/mqueuerecvsupp.c b/cpukit/posix/src/mqueuerecvsupp.c index dcb81787a1..f91a513181 100644 --- a/cpukit/posix/src/mqueuerecvsupp.c +++ b/cpukit/posix/src/mqueuerecvsupp.c @@ -58,12 +58,12 @@ ssize_t _POSIX_Message_queue_Receive_support( } if ( ( the_mq->oflag & O_ACCMODE ) == O_WRONLY ) { - _ISR_lock_ISR_enable( &queue_context.Lock_context ); + _ISR_lock_ISR_enable( &queue_context.Lock_context.Lock_context ); rtems_set_errno_and_return_minus_one( EBADF ); } if ( msg_len < the_mq->Message_queue.maximum_message_size ) { - _ISR_lock_ISR_enable( &queue_context.Lock_context ); + _ISR_lock_ISR_enable( &queue_context.Lock_context.Lock_context ); rtems_set_errno_and_return_minus_one( EMSGSIZE ); } diff --git a/cpukit/posix/src/mqueuesendsupp.c b/cpukit/posix/src/mqueuesendsupp.c index 3fd51a4eeb..c975a95505 100644 --- a/cpukit/posix/src/mqueuesendsupp.c +++ b/cpukit/posix/src/mqueuesendsupp.c @@ -65,7 +65,7 @@ int _POSIX_Message_queue_Send_support( } if ( ( the_mq->oflag & O_ACCMODE ) == O_RDONLY ) { - _ISR_lock_ISR_enable( &queue_context.Lock_context ); + _ISR_lock_ISR_enable( &queue_context.Lock_context.Lock_context ); rtems_set_errno_and_return_minus_one( EBADF ); } diff --git a/cpukit/posix/src/pthreadgetschedparam.c b/cpukit/posix/src/pthreadgetschedparam.c index 1b7c731587..38e0b4f9b5 100644 --- a/cpukit/posix/src/pthreadgetschedparam.c +++ b/cpukit/posix/src/pthreadgetschedparam.c @@ -45,7 +45,7 @@ int pthread_getschedparam( return EINVAL; } - the_thread = _Thread_Get( thread, &queue_context.Lock_context ); + the_thread = _Thread_Get( thread, &queue_context.Lock_context.Lock_context ); if ( the_thread == NULL ) { return ESRCH; diff --git a/cpukit/posix/src/pthreadjoin.c b/cpukit/posix/src/pthreadjoin.c index 641031c20d..5ed01185f1 100644 --- a/cpukit/posix/src/pthreadjoin.c +++ b/cpukit/posix/src/pthreadjoin.c @@ -41,7 +41,7 @@ static int _POSIX_Threads_Join( pthread_t thread, void **value_ptr ) _Thread_queue_Context_initialize( &queue_context ); _Thread_queue_Context_set_expected_level( &queue_context, 1 ); _Thread_queue_Context_set_no_timeout( &queue_context ); - the_thread = _Thread_Get( thread, &queue_context.Lock_context ); + the_thread = _Thread_Get( thread, &queue_context.Lock_context.Lock_context ); if ( the_thread == NULL ) { return ESRCH; @@ -51,22 +51,28 @@ static int _POSIX_Threads_Join( pthread_t thread, void **value_ptr ) executing = _Per_CPU_Get_executing( cpu_self ); if ( executing == the_thread ) { - _ISR_lock_ISR_enable( &queue_context.Lock_context ); + _ISR_lock_ISR_enable( &queue_context.Lock_context.Lock_context ); return EDEADLK; } - _Thread_State_acquire_critical( the_thread, &queue_context.Lock_context ); + _Thread_State_acquire_critical( + the_thread, + &queue_context.Lock_context.Lock_context + ); if ( !_Thread_Is_joinable( the_thread ) ) { - _Thread_State_release( the_thread, &queue_context.Lock_context ); + _Thread_State_release( the_thread, &queue_context.Lock_context.Lock_context ); return EINVAL; } if ( _States_Is_waiting_for_join_at_exit( the_thread->current_state ) ) { value = the_thread->Life.exit_value; _Thread_Clear_state_locked( the_thread, STATES_WAITING_FOR_JOIN_AT_EXIT ); - _Thread_Dispatch_disable_with_CPU( cpu_self, &queue_context.Lock_context ); - _Thread_State_release( the_thread, &queue_context.Lock_context ); + _Thread_Dispatch_disable_with_CPU( + cpu_self, + &queue_context.Lock_context.Lock_context + ); + _Thread_State_release( the_thread, &queue_context.Lock_context.Lock_context ); _Thread_Dispatch_enable( cpu_self ); } else { _Thread_Join( diff --git a/cpukit/posix/src/semunlink.c b/cpukit/posix/src/semunlink.c index 6ba1df17a4..02fcdcab1b 100644 --- a/cpukit/posix/src/semunlink.c +++ b/cpukit/posix/src/semunlink.c @@ -40,7 +40,7 @@ int sem_unlink( _POSIX_Semaphore_Namespace_remove( the_semaphore ); - _ISR_lock_ISR_disable( &queue_context.Lock_context ); + _ISR_lock_ISR_disable( &queue_context.Lock_context.Lock_context ); _CORE_semaphore_Acquire_critical( &the_semaphore->Semaphore, &queue_context ); the_semaphore->linked = false; _POSIX_Semaphore_Delete( the_semaphore, &queue_context ); |