diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-30 06:59:55 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-30 16:16:23 +0200 |
| commit | 0b713f8940d90b480f8cd36663c11aa0688587d8 (patch) | |
| tree | c71a01748c3749e0243518b486c2bb32a1c67df1 /cpukit/rtems/src/semcreate.c | |
| parent | score: Rework CORE priority ceiling mutex (diff) | |
| download | rtems-0b713f8940d90b480f8cd36663c11aa0688587d8.tar.bz2 | |
score: Rework CORE inherit priority mutex
Provide dedicated seize and surrender methods for inherit priority
mutexes. This eliminates CORE_mutex_Attributes.
Diffstat (limited to 'cpukit/rtems/src/semcreate.c')
| -rw-r--r-- | cpukit/rtems/src/semcreate.c | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/cpukit/rtems/src/semcreate.c b/cpukit/rtems/src/semcreate.c index 720fb63a0d..943d787246 100644 --- a/cpukit/rtems/src/semcreate.c +++ b/cpukit/rtems/src/semcreate.c @@ -61,10 +61,9 @@ rtems_status_code rtems_semaphore_create( rtems_id *id ) { - Semaphore_Control *the_semaphore; - CORE_mutex_Attributes the_mutex_attr; - Thread_Control *executing; - Status_Control status; + Semaphore_Control *the_semaphore; + Thread_Control *executing; + Status_Control status; if ( !rtems_is_name_valid( name ) ) return RTEMS_INVALID_NAME; @@ -137,7 +136,6 @@ rtems_status_code rtems_semaphore_create( #endif priority_ceiling = _RTEMS_tasks_Priority_to_Core( priority_ceiling ); - the_semaphore->attribute_set = attribute_set; executing = _Thread_Get_executing(); if ( _Attributes_Is_priority( attribute_set ) ) { @@ -195,9 +193,15 @@ rtems_status_code rtems_semaphore_create( } else { status = STATUS_SUCCESSFUL; } - } else if ( !_Attributes_Is_inherit_priority( attribute_set ) ) { + } else { _Assert( _Attributes_Is_binary_semaphore( attribute_set ) ); - the_semaphore->variant = SEMAPHORE_VARIANT_MUTEX_NO_PROTOCOL; + + if ( _Attributes_Is_inherit_priority( attribute_set ) ) { + the_semaphore->variant = SEMAPHORE_VARIANT_MUTEX_INHERIT_PRIORITY; + } else { + the_semaphore->variant = SEMAPHORE_VARIANT_MUTEX_NO_PROTOCOL; + } + _CORE_recursive_mutex_Initialize( &the_semaphore->Core_control.Mutex.Recursive ); @@ -207,22 +211,13 @@ rtems_status_code rtems_semaphore_create( &the_semaphore->Core_control.Mutex.Recursive.Mutex, executing ); + + if ( _Attributes_Is_inherit_priority( attribute_set ) ) { + ++executing->resource_count; + } } status = STATUS_SUCCESSFUL; - } else { - _Assert( _Attributes_Is_binary_semaphore( attribute_set ) ); - _Assert( _Attributes_Is_inherit_priority( attribute_set ) ); - the_semaphore->variant = SEMAPHORE_VARIANT_MUTEX; - - the_mutex_attr.lock_nesting_behavior = CORE_MUTEX_NESTING_ACQUIRES; - - status = _CORE_mutex_Initialize( - &the_semaphore->Core_control.Mutex.Recursive.Mutex, - executing, - &the_mutex_attr, - count != 1 - ); } if ( status != STATUS_SUCCESSFUL ) { |