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

_CORE_Mutex_seize: added checks for priority ceiling violation, also added

Browse Source 
checks to ensure priority was not lowered.
This commit is contained in:
Mark Johannes
1996-08-07 20:57:28 +00:00
parent c123a08496
commit cc757febff
2 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
c/src/exec/score/src/coremutex.c
View File

@@ -110,6 +110,18 @@ void _CORE_mutex_Seize(
ISR_Level level;
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 ) ) {
@@ -123,13 +135,16 @@ void _CORE_mutex_Seize(
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(
executing,
the_mutex->holder,
the_mutex->Attributes.priority_ceiling
);
break;
}
}
return;
}
@@ -180,10 +195,13 @@ void _CORE_mutex_Seize(
case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
break;
case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
_Thread_Change_priority(
executing,
the_mutex->Attributes.priority_ceiling
);
if ( the_mutex->Attributes.priority_ceiling <
executing->current_priority ) {
_Thread_Change_priority(
executing,
the_mutex->Attributes.priority_ceiling
);
};
break;
}
}

30
cpukit/score/src/coremutex.c
View File

@@ -110,6 +110,18 @@ void _CORE_mutex_Seize(
ISR_Level level;
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 ) ) {
@@ -123,13 +135,16 @@ void _CORE_mutex_Seize(
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(
executing,
the_mutex->holder,
the_mutex->Attributes.priority_ceiling
);
break;
}
}
return;
}
@@ -180,10 +195,13 @@ void _CORE_mutex_Seize(
case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
break;
case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
_Thread_Change_priority(
executing,
the_mutex->Attributes.priority_ceiling
);
if ( the_mutex->Attributes.priority_ceiling <
executing->current_priority ) {
_Thread_Change_priority(
executing,
the_mutex->Attributes.priority_ceiling
);
};
break;
}
}