diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-08-04 10:20:29 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-08-04 10:20:29 +0200 |
commit | ee0e41355d1faa5f74085effc4f57c3a7fc1f884 (patch) | |
tree | c845395523e084218ca6715977648b807d30605d /cpukit/rtems/src/ratemoncancel.c | |
parent | score: Fix _Thread_queue_Path_release() (diff) | |
download | rtems-ee0e41355d1faa5f74085effc4f57c3a7fc1f884.tar.bz2 |
score: Fix a release/cancel job race condition
Split up the potential thread priority change in the scheduler
release/cancel job operation. Protect the rate monotonic period state
with a dedicated SMP lock. This avoids a race condition during
_Rate_monotonic_Timeout() while _Rate_monotonic_Cancel() is called on
another processor.
Diffstat (limited to 'cpukit/rtems/src/ratemoncancel.c')
-rw-r--r-- | cpukit/rtems/src/ratemoncancel.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cpukit/rtems/src/ratemoncancel.c b/cpukit/rtems/src/ratemoncancel.c index 41ba48856f..b4e899d296 100644 --- a/cpukit/rtems/src/ratemoncancel.c +++ b/cpukit/rtems/src/ratemoncancel.c @@ -28,18 +28,17 @@ void _Rate_monotonic_Cancel( ) { Per_CPU_Control *cpu_self; + Thread_Control *update_priority; - _Watchdog_Per_CPU_remove_relative( &the_period->Timer ); + _Rate_monotonic_Acquire_critical( the_period, lock_context ); - owner = the_period->owner; - _Rate_monotonic_Acquire_critical( owner, lock_context ); + _Watchdog_Per_CPU_remove_relative( &the_period->Timer ); the_period->state = RATE_MONOTONIC_INACTIVE; + update_priority = _Scheduler_Cancel_job( the_period->owner ); cpu_self = _Thread_Dispatch_disable_critical( lock_context ); - _Rate_monotonic_Release( owner, lock_context ); - - _Scheduler_Cancel_job( owner ); - + _Rate_monotonic_Release( the_period, lock_context ); + _Thread_Update_priority( update_priority ); _Thread_Dispatch_enable( cpu_self ); } |