From ed24ed4e0ad3494bfa4d070c52fb2c24fb0fb784 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 8 Feb 2018 10:47:16 +0100 Subject: Use _Thread_Dispatch_direct() Use _Thread_Dispatch_direct() for operations that block the executing thread. This ensures that we get a fatal error (INTERNAL_ERROR_BAD_THREAD_DISPATCH_DISABLE_LEVEL) if we try to block in an invalid context, e.g. during system start or an interrupt handler. --- cpukit/rtems/src/eventseize.c | 2 +- cpukit/rtems/src/ratemonperiod.c | 4 ++-- cpukit/rtems/src/taskmode.c | 2 +- cpukit/rtems/src/taskwakewhen.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'cpukit/rtems') diff --git a/cpukit/rtems/src/eventseize.c b/cpukit/rtems/src/eventseize.c index c6bd4187bd..0d6097906c 100644 --- a/cpukit/rtems/src/eventseize.c +++ b/cpukit/rtems/src/eventseize.c @@ -96,7 +96,7 @@ rtems_status_code _Event_Seize( _Thread_Unblock( executing ); } - _Thread_Dispatch_enable( cpu_self ); + _Thread_Dispatch_direct( cpu_self ); return _Status_Get_after_wait( executing ); } diff --git a/cpukit/rtems/src/ratemonperiod.c b/cpukit/rtems/src/ratemonperiod.c index 2e4e48278d..b266920944 100644 --- a/cpukit/rtems/src/ratemonperiod.c +++ b/cpukit/rtems/src/ratemonperiod.c @@ -85,7 +85,7 @@ static void _Rate_monotonic_Release_postponed_job( cpu_self = _Thread_Dispatch_disable_critical( lock_context ); _Rate_monotonic_Release( the_period, lock_context ); _Thread_Priority_update( &queue_context ); - _Thread_Dispatch_enable( cpu_self ); + _Thread_Dispatch_direct( cpu_self ); } static void _Rate_monotonic_Release_job( @@ -263,7 +263,7 @@ static rtems_status_code _Rate_monotonic_Block_while_active( _Thread_Unblock( executing ); } - _Thread_Dispatch_enable( cpu_self ); + _Thread_Dispatch_direct( cpu_self ); return RTEMS_SUCCESSFUL; } diff --git a/cpukit/rtems/src/taskmode.c b/cpukit/rtems/src/taskmode.c index f25746e492..e16faa53fb 100644 --- a/cpukit/rtems/src/taskmode.c +++ b/cpukit/rtems/src/taskmode.c @@ -143,7 +143,7 @@ rtems_status_code rtems_task_mode( _Thread_State_acquire( executing, &lock_context ); _Scheduler_Schedule( executing ); _Thread_State_release( executing, &lock_context ); - _Thread_Dispatch_enable( cpu_self ); + _Thread_Dispatch_direct( cpu_self ); } return RTEMS_SUCCESSFUL; diff --git a/cpukit/rtems/src/taskwakewhen.c b/cpukit/rtems/src/taskwakewhen.c index 221a1b925f..330d37afe9 100644 --- a/cpukit/rtems/src/taskwakewhen.c +++ b/cpukit/rtems/src/taskwakewhen.c @@ -58,6 +58,6 @@ rtems_status_code rtems_task_wake_when( _Thread_Timeout, _Watchdog_Ticks_from_seconds( seconds ) ); - _Thread_Dispatch_enable( cpu_self ); + _Thread_Dispatch_direct( cpu_self ); return RTEMS_SUCCESSFUL; } -- cgit v1.2.3