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/score/src/condition.c | |
| 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/score/src/condition.c')
| -rw-r--r-- | cpukit/score/src/condition.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/cpukit/score/src/condition.c b/cpukit/score/src/condition.c index b9e14adce8..36ef98949b 100644 --- a/cpukit/score/src/condition.c +++ b/cpukit/score/src/condition.c @@ -63,7 +63,7 @@ static Thread_Control *_Condition_Queue_acquire_critical( _Thread_queue_Queue_acquire_critical( &condition->Queue.Queue, &executing->Potpourri_stats, - &queue_context->Lock_context + &queue_context->Lock_context.Lock_context ); return executing; @@ -76,7 +76,7 @@ static void _Condition_Queue_release( { _Thread_queue_Queue_release( &condition->Queue.Queue, - &queue_context->Lock_context + &queue_context->Lock_context.Lock_context ); } @@ -91,7 +91,9 @@ static Per_CPU_Control *_Condition_Do_wait( condition = _Condition_Get( _condition ); executing = _Condition_Queue_acquire_critical( condition, queue_context ); - cpu_self = _Thread_Dispatch_disable_critical( &queue_context->Lock_context ); + cpu_self = _Thread_Dispatch_disable_critical( + &queue_context->Lock_context.Lock_context + ); _Thread_queue_Context_set_expected_level( queue_context, 2 ); _Thread_queue_Enqueue_critical( @@ -114,7 +116,7 @@ void _Condition_Wait( Per_CPU_Control *cpu_self; _Thread_queue_Context_initialize( &queue_context ); - _ISR_lock_ISR_disable( &queue_context.Lock_context ); + _ISR_lock_ISR_disable( &queue_context.Lock_context.Lock_context ); _Thread_queue_Context_set_no_timeout( &queue_context ); cpu_self = _Condition_Do_wait( _condition, @@ -139,15 +141,15 @@ int _Condition_Wait_timed( Watchdog_Interval ticks; _Thread_queue_Context_initialize( &queue_context ); - _ISR_lock_ISR_disable( &queue_context.Lock_context ); + _ISR_lock_ISR_disable( &queue_context.Lock_context.Lock_context ); switch ( _TOD_Absolute_timeout_to_ticks( abstime, CLOCK_REALTIME, &ticks ) ) { case TOD_ABSOLUTE_TIMEOUT_INVALID: - _ISR_lock_ISR_enable( &queue_context.Lock_context ); + _ISR_lock_ISR_enable( &queue_context.Lock_context.Lock_context ); return EINVAL; case TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST: case TOD_ABSOLUTE_TIMEOUT_IS_NOW: - _ISR_lock_ISR_enable( &queue_context.Lock_context ); + _ISR_lock_ISR_enable( &queue_context.Lock_context.Lock_context ); return ETIMEDOUT; default: break; @@ -175,7 +177,7 @@ void _Condition_Wait_recursive( unsigned int nest_level; _Thread_queue_Context_initialize( &queue_context ); - _ISR_lock_ISR_disable( &queue_context.Lock_context ); + _ISR_lock_ISR_disable( &queue_context.Lock_context.Lock_context ); _Thread_queue_Context_set_no_timeout( &queue_context ); cpu_self = _Condition_Do_wait( _condition, &queue_context ); @@ -201,15 +203,15 @@ int _Condition_Wait_recursive_timed( Watchdog_Interval ticks; _Thread_queue_Context_initialize( &queue_context ); - _ISR_lock_ISR_disable( &queue_context.Lock_context ); + _ISR_lock_ISR_disable( &queue_context.Lock_context.Lock_context ); switch ( _TOD_Absolute_timeout_to_ticks( abstime, CLOCK_REALTIME, &ticks ) ) { case TOD_ABSOLUTE_TIMEOUT_INVALID: - _ISR_lock_ISR_enable( &queue_context.Lock_context ); + _ISR_lock_ISR_enable( &queue_context.Lock_context.Lock_context ); return EINVAL; case TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST: case TOD_ABSOLUTE_TIMEOUT_IS_NOW: - _ISR_lock_ISR_enable( &queue_context.Lock_context ); + _ISR_lock_ISR_enable( &queue_context.Lock_context.Lock_context ); return ETIMEDOUT; default: break; @@ -261,7 +263,7 @@ static void _Condition_Wake( struct _Condition_Control *_condition, int count ) condition = _Condition_Get( _condition ); _Thread_queue_Context_initialize( &context.Base ); - _ISR_lock_ISR_disable( &context.Base.Lock_context ); + _ISR_lock_ISR_disable( &context.Base.Lock_context.Lock_context ); _Condition_Queue_acquire_critical( condition, &context.Base ); /* |