Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-20 18:45:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

rtems: Fix rtems_task_mode()

Browse Source 
Do the ASR and preemption mode change only if requested by the mode
mask.  The bug was introduced by
508f868237.
This commit is contained in:
Sebastian Huber
2021-03-18 10:38:53 +01:00
parent b4eb937ecd
commit 50abce31ef
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/rtems/src/taskmode.c
+22 -16
View File
@@ -94,31 +94,37 @@ rtems_status_code rtems_task_mode(
if ( ( mask & ( RTEMS_ASR_MASK | RTEMS_PREEMPT_MASK ) ) != 0 ) {
bool need_thread_dispatch;
ISR_lock_Context lock_context;
bool previous_asr_is_enabled;
bool previous_is_preemptible;
need_thread_dispatch = false;
_Thread_State_acquire( executing, &lock_context );
previous_asr_is_enabled = asr->is_enabled;
asr->is_enabled = !_Modes_Is_asr_disabled( mode_set );
if ( ( mask & RTEMS_ASR_MASK ) != 0 ) {
bool previous_asr_is_enabled;
if (
!previous_asr_is_enabled &&
asr->is_enabled &&
asr->signals_pending != 0
) {
need_thread_dispatch = true;
_Thread_Append_post_switch_action( executing, &api->Signal_action );
previous_asr_is_enabled = asr->is_enabled;
asr->is_enabled = !_Modes_Is_asr_disabled( mode_set );
if (
!previous_asr_is_enabled &&
asr->is_enabled &&
asr->signals_pending != 0
) {
need_thread_dispatch = true;
_Thread_Append_post_switch_action( executing, &api->Signal_action );
}
}
previous_is_preemptible = executing->is_preemptible;
executing->is_preemptible = _Modes_Is_preempt( mode_set );
if ( ( mask & RTEMS_PREEMPT_MASK ) != 0 ) {
bool previous_is_preemptible;
if ( executing->is_preemptible && !previous_is_preemptible ) {
need_thread_dispatch = true;
_Scheduler_Schedule( executing );
previous_is_preemptible = executing->is_preemptible;
executing->is_preemptible = _Modes_Is_preempt( mode_set );
if ( executing->is_preemptible && !previous_is_preemptible ) {
need_thread_dispatch = true;
_Scheduler_Schedule( executing );
}
}
if ( need_thread_dispatch ) {