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

score: Add and use _CORE_mutex_Acquire_critical()

Browse Source 
Add and use _CORE_mutex_Release().
This commit is contained in:
Sebastian Huber
2016-04-19 06:18:52 +02:00
parent b8bdced14d
commit bbe654af8f
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cpukit/score/include/rtems/score/coremuteximpl.h
View File

@@ -113,6 +113,22 @@ RTEMS_INLINE_ROUTINE void _CORE_mutex_Destroy( CORE_mutex_Control *the_mutex )
_Thread_queue_Destroy( &the_mutex->Wait_queue ); _Thread_queue_Destroy( &the_mutex->Wait_queue );
} }
RTEMS_INLINE_ROUTINE void _CORE_mutex_Acquire_critical(
CORE_mutex_Control *the_mutex,
ISR_lock_Context *lock_context
)
{
_Thread_queue_Acquire_critical( &the_mutex->Wait_queue, lock_context );
}
RTEMS_INLINE_ROUTINE void _CORE_mutex_Release(
CORE_mutex_Control *the_mutex,
ISR_lock_Context *lock_context
)
{
_Thread_queue_Release( &the_mutex->Wait_queue, lock_context );
}
/** /**
* @brief Attempt to receive a unit from the_mutex. * @brief Attempt to receive a unit from the_mutex.
* *
@@ -245,10 +261,10 @@ RTEMS_INLINE_ROUTINE void _CORE_mutex_Seize_body(
INTERNAL_ERROR_MUTEX_OBTAIN_FROM_BAD_STATE INTERNAL_ERROR_MUTEX_OBTAIN_FROM_BAD_STATE
); );
} }
_Thread_queue_Acquire_critical( &the_mutex->Wait_queue, lock_context ); _CORE_mutex_Acquire_critical( the_mutex, lock_context );
if ( _CORE_mutex_Seize_interrupt_trylock( the_mutex, executing, lock_context ) ) { if ( _CORE_mutex_Seize_interrupt_trylock( the_mutex, executing, lock_context ) ) {
if ( !wait ) { if ( !wait ) {
_Thread_queue_Release( &the_mutex->Wait_queue, lock_context ); _CORE_mutex_Release( the_mutex, lock_context );
executing->Wait.return_code = executing->Wait.return_code =
CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT; CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT;
} else { } else {
@@ -462,7 +478,7 @@ RTEMS_INLINE_ROUTINE int _CORE_mutex_Seize_interrupt_trylock_body(
} }
if ( !_CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ) ) { if ( !_CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ) ) {
_Thread_queue_Release( &the_mutex->Wait_queue, lock_context ); _CORE_mutex_Release( the_mutex, lock_context );
return 0; return 0;
} /* else must be CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING } /* else must be CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING
* *
@@ -476,7 +492,7 @@ RTEMS_INLINE_ROUTINE int _CORE_mutex_Seize_interrupt_trylock_body(
ceiling = the_mutex->Attributes.priority_ceiling; ceiling = the_mutex->Attributes.priority_ceiling;
current = executing->current_priority; current = executing->current_priority;
if ( current == ceiling ) { if ( current == ceiling ) {
_Thread_queue_Release( &the_mutex->Wait_queue, lock_context ); _CORE_mutex_Release( the_mutex, lock_context );
return 0; return 0;
} }
@@ -484,7 +500,7 @@ RTEMS_INLINE_ROUTINE int _CORE_mutex_Seize_interrupt_trylock_body(
Per_CPU_Control *cpu_self; Per_CPU_Control *cpu_self;
cpu_self = _Thread_Dispatch_disable_critical( lock_context ); cpu_self = _Thread_Dispatch_disable_critical( lock_context );
_Thread_queue_Release( &the_mutex->Wait_queue, lock_context ); _CORE_mutex_Release( the_mutex, lock_context );
_Thread_Raise_priority( executing, ceiling ); _Thread_Raise_priority( executing, ceiling );
_Thread_Dispatch_enable( cpu_self ); _Thread_Dispatch_enable( cpu_self );
return 0; return 0;
@@ -494,7 +510,7 @@ RTEMS_INLINE_ROUTINE int _CORE_mutex_Seize_interrupt_trylock_body(
the_mutex->holder = NULL; the_mutex->holder = NULL;
the_mutex->nest_count = 0; /* undo locking above */ the_mutex->nest_count = 0; /* undo locking above */
executing->resource_count--; /* undo locking above */ executing->resource_count--; /* undo locking above */
_Thread_queue_Release( &the_mutex->Wait_queue, lock_context ); _CORE_mutex_Release( the_mutex, lock_context );
return 0; return 0;
} }
} }
@@ -510,12 +526,12 @@ RTEMS_INLINE_ROUTINE int _CORE_mutex_Seize_interrupt_trylock_body(
switch ( the_mutex->Attributes.lock_nesting_behavior ) { switch ( the_mutex->Attributes.lock_nesting_behavior ) {
case CORE_MUTEX_NESTING_ACQUIRES: case CORE_MUTEX_NESTING_ACQUIRES:
the_mutex->nest_count++; the_mutex->nest_count++;
_Thread_queue_Release( &the_mutex->Wait_queue, lock_context ); _CORE_mutex_Release( the_mutex, lock_context );
return 0; return 0;
#if defined(RTEMS_POSIX_API) #if defined(RTEMS_POSIX_API)
case CORE_MUTEX_NESTING_IS_ERROR: case CORE_MUTEX_NESTING_IS_ERROR:
executing->Wait.return_code = CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED; executing->Wait.return_code = CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED;
_Thread_queue_Release( &the_mutex->Wait_queue, lock_context ); _CORE_mutex_Release( the_mutex, lock_context );
return 0; return 0;
#endif #endif
case CORE_MUTEX_NESTING_BLOCKS: case CORE_MUTEX_NESTING_BLOCKS: