summaryrefslogtreecommitdiffstats
path: root/cpukit/rtems/src/eventseize.c
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2015-04-20 09:45:10 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2015-04-21 08:25:32 +0200
commit1041de1ab071d126148f0c02e5da0db637001f1c (patch)
tree07c077b044a14d2abca32e8f9a453eec1141431e /cpukit/rtems/src/eventseize.c
parentscore: Modify _Thread_Dispatch_disable_critical() (diff)
downloadrtems-1041de1ab071d126148f0c02e5da0db637001f1c.tar.bz2
score: Add _Thread_Get_interrupt_disable()
Remove _Thread_Acquire() and _Thread_Acquire_for_executing(). Add utility functions for the default thread lock. Use the default thread lock for the RTEMS events. There is no need to disable thread dispatching and a Giant acquire in _Event_Timeout() since this was already done by the caller. Update #2273.
Diffstat (limited to 'cpukit/rtems/src/eventseize.c')
-rw-r--r--cpukit/rtems/src/eventseize.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/cpukit/rtems/src/eventseize.c b/cpukit/rtems/src/eventseize.c
index 59a2b6256f..929665641c 100644
--- a/cpukit/rtems/src/eventseize.c
+++ b/cpukit/rtems/src/eventseize.c
@@ -57,13 +57,13 @@ void _Event_Seize(
(seized_events == event_in || _Options_Is_any( option_set )) ) {
event->pending_events =
_Event_sets_Clear( pending_events, seized_events );
- _Objects_Release_and_ISR_enable( &executing->Object, lock_context );
+ _Thread_Lock_release_default( executing, lock_context );
*event_out = seized_events;
return;
}
if ( _Options_Is_no_wait( option_set ) ) {
- _Objects_Release_and_ISR_enable( &executing->Object, lock_context );
+ _Thread_Lock_release_default( executing, lock_context );
executing->Wait.return_code = RTEMS_UNSATISFIED;
*event_out = seized_events;
return;
@@ -84,19 +84,12 @@ void _Event_Seize(
executing->Wait.return_argument = event_out;
_Thread_Wait_flags_set( executing, intend_to_block );
- cpu_self = _Objects_Release_and_thread_dispatch_disable(
- &executing->Object,
- lock_context
- );
+ cpu_self = _Thread_Dispatch_disable_critical();
+ _Thread_Lock_release_default( executing, lock_context );
_Giant_Acquire( cpu_self );
if ( ticks ) {
- _Watchdog_Initialize(
- &executing->Timer,
- _Event_Timeout,
- executing->Object.id,
- NULL
- );
+ _Watchdog_Initialize( &executing->Timer, _Event_Timeout, 0, executing );
_Watchdog_Insert_ticks( &executing->Timer, ticks );
}