summaryrefslogtreecommitdiffstats
path: root/c/src/exec/score/src
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-07-06 19:10:30 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-07-06 19:10:30 +0000
commit12aeaec6dc3704ab6e440f2b657a45f103af64aa (patch)
tree33d61523ccaa62b972c7aaf456477d7b3df07b63 /c/src/exec/score/src
parent3b4413c08f0e028f0095ec5b50f90e4169e6689b (diff)
downloadrtems-12aeaec6dc3704ab6e440f2b657a45f103af64aa.tar.bz2
The code that attempts to obtain a mutex has now been inlined. The
code remaining here now only blocks.
Diffstat (limited to 'c/src/exec/score/src')
-rw-r--r--c/src/exec/score/src/coremutexseize.c90
1 files changed, 7 insertions, 83 deletions
diff --git a/c/src/exec/score/src/coremutexseize.c b/c/src/exec/score/src/coremutexseize.c
index db576c6ef1..500c8bb61c 100644
--- a/c/src/exec/score/src/coremutexseize.c
+++ b/c/src/exec/score/src/coremutexseize.c
@@ -25,104 +25,27 @@
/*PAGE
*
- * _CORE_mutex_Seize
+ * _CORE_mutex_Seize (interrupt blocking support)
*
- * This routine attempts to allocate a mutex to the calling thread.
+ * This routine blocks the caller thread after an attempt attempts to obtain
+ * the specified mutex has failed.
*
* Input parameters:
* the_mutex - pointer to mutex control block
- * id - id of object to wait on
- * wait - TRUE if wait is allowed, FALSE otherwise
* timeout - number of ticks to wait (0 means forever)
- *
- * Output parameters: NONE
- *
- * INTERRUPT LATENCY:
- * available
- * wait
*/
-void _CORE_mutex_Seize(
+void _CORE_mutex_Seize_interrupt_blocking(
CORE_mutex_Control *the_mutex,
- Objects_Id id,
- boolean wait,
Watchdog_Interval timeout
)
{
- Thread_Control *executing;
- ISR_Level level;
+ Thread_Control *executing;
executing = _Thread_Executing;
switch ( the_mutex->Attributes.discipline ) {
case CORE_MUTEX_DISCIPLINES_FIFO:
case CORE_MUTEX_DISCIPLINES_PRIORITY:
- case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
- break;
- case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
- if ( executing->current_priority <
- the_mutex->Attributes.priority_ceiling) {
- executing->Wait.return_code = CORE_MUTEX_STATUS_CEILING_VIOLATED;
- return;
- }
- }
- executing->Wait.return_code = CORE_MUTEX_STATUS_SUCCESSFUL;
- _ISR_Disable( level );
- if ( ! _CORE_mutex_Is_locked( the_mutex ) ) {
- the_mutex->lock = CORE_MUTEX_LOCKED;
- the_mutex->holder = executing;
- the_mutex->holder_id = executing->Object.id;
- the_mutex->nest_count = 1;
- executing->resource_count++;
- _ISR_Enable( level );
- switch ( the_mutex->Attributes.discipline ) {
- case CORE_MUTEX_DISCIPLINES_FIFO:
- case CORE_MUTEX_DISCIPLINES_PRIORITY:
- case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
- /* already the highest priority */
- break;
- case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
- if ( the_mutex->Attributes.priority_ceiling <
- executing->current_priority ) {
- _Thread_Change_priority(
- the_mutex->holder,
- the_mutex->Attributes.priority_ceiling,
- FALSE
- );
- }
- }
- executing->Wait.return_code = CORE_MUTEX_STATUS_SUCCESSFUL;
- return;
- }
-
- if ( _Thread_Is_executing( the_mutex->holder ) ) {
- switch ( the_mutex->Attributes.lock_nesting_behavior ) {
- case CORE_MUTEX_NESTING_ACQUIRES:
- the_mutex->nest_count++;
- _ISR_Enable( level );
- return;
- case CORE_MUTEX_NESTING_IS_ERROR:
- executing->Wait.return_code = CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED;
- _ISR_Enable( level );
- return;
- case CORE_MUTEX_NESTING_BLOCKS:
- break;
- }
- }
-
- if ( !wait ) {
- _ISR_Enable( level );
- executing->Wait.return_code = CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT;
- return;
- }
-
- _Thread_queue_Enter_critical_section( &the_mutex->Wait_queue );
- executing->Wait.queue = &the_mutex->Wait_queue;
- executing->Wait.id = id;
- _ISR_Enable( level );
-
- switch ( the_mutex->Attributes.discipline ) {
- case CORE_MUTEX_DISCIPLINES_FIFO:
- case CORE_MUTEX_DISCIPLINES_PRIORITY:
case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
break;
case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
@@ -136,6 +59,7 @@ void _CORE_mutex_Seize(
break;
}
+ the_mutex->blocked_count++;
_Thread_queue_Enqueue( &the_mutex->Wait_queue, timeout );
if ( _Thread_Executing->Wait.return_code == CORE_MUTEX_STATUS_SUCCESSFUL ) {
@@ -156,5 +80,5 @@ void _CORE_mutex_Seize(
break;
}
}
+ _Thread_Enable_dispatch();
}
-