diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-02-18 08:36:26 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-03-04 13:36:10 +0100 |
| commit | 03b900d3ed120ea919ea3eded7edbece3488cff3 (patch) | |
| tree | 182781fc14fe15fd67caeb80e46f1c58495839c2 /cpukit/posix/src/timerdelete.c | |
| parent | score: Distribute clock tick to all online CPUs (diff) | |
| download | rtems-03b900d3ed120ea919ea3eded7edbece3488cff3.tar.bz2 | |
score: Replace watchdog handler implementation
Use a red-black tree instead of delta chains.
Close #2344.
Update #2554.
Update #2555.
Close #2606.
Diffstat (limited to 'cpukit/posix/src/timerdelete.c')
| -rw-r--r-- | cpukit/posix/src/timerdelete.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cpukit/posix/src/timerdelete.c b/cpukit/posix/src/timerdelete.c index 8438b0d5b0..c39de8e168 100644 --- a/cpukit/posix/src/timerdelete.c +++ b/cpukit/posix/src/timerdelete.c @@ -45,16 +45,22 @@ int timer_delete( */ POSIX_Timer_Control *ptimer; Objects_Locations location; + ISR_lock_Context lock_context; + Per_CPU_Control *cpu; _Objects_Allocator_lock(); - ptimer = _POSIX_Timer_Get( timerid, &location ); + ptimer = _POSIX_Timer_Get( timerid, &location, &lock_context ); switch ( location ) { case OBJECTS_LOCAL: _Objects_Close( &_POSIX_Timer_Information, &ptimer->Object ); + cpu = _POSIX_Timer_Acquire_critical( ptimer, &lock_context ); ptimer->state = POSIX_TIMER_STATE_FREE; - _Watchdog_Remove_ticks( &ptimer->Timer ); - _Objects_Put( &ptimer->Object ); + _Watchdog_Remove( + &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_RELATIVE ], + &ptimer->Timer + ); + _POSIX_Timer_Release( cpu, &lock_context ); _POSIX_Timer_Free( ptimer ); _Objects_Allocator_unlock(); |