summaryrefslogtreecommitdiffstats
path: root/cpukit/rtems/src/taskwakewhen.c
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2015-05-11 14:56:49 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2015-05-19 12:00:48 +0200
commitaa05cfbb3d6309ec45b69f34d0870465fe30b74c (patch)
treee004fe884c7018b81bf430b095af350b66f86f6f /cpukit/rtems/src/taskwakewhen.c
parentscore: Add static initializers for thread queues (diff)
downloadrtems-aa05cfbb3d6309ec45b69f34d0870465fe30b74c.tar.bz2
score: Replace _Thread_Delay_ended()
Use _Thread_Timeout() instead. Use pseudo thread queue for nanosleep() to deal with signals. Close #2130.
Diffstat (limited to 'cpukit/rtems/src/taskwakewhen.c')
-rw-r--r--cpukit/rtems/src/taskwakewhen.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/cpukit/rtems/src/taskwakewhen.c b/cpukit/rtems/src/taskwakewhen.c
index a1fc15f047..cf0b303cd3 100644
--- a/cpukit/rtems/src/taskwakewhen.c
+++ b/cpukit/rtems/src/taskwakewhen.c
@@ -30,6 +30,7 @@ rtems_status_code rtems_task_wake_when(
{
Watchdog_Interval seconds;
Thread_Control *executing;
+ Per_CPU_Control *cpu_self;
if ( !_TOD_Is_set() )
return RTEMS_NOT_DEFINED;
@@ -47,12 +48,13 @@ rtems_status_code rtems_task_wake_when(
if ( seconds <= _TOD_Seconds_since_epoch() )
return RTEMS_INVALID_CLOCK;
- _Thread_Disable_dispatch();
+ cpu_self = _Thread_Dispatch_disable();
executing = _Thread_Executing;
_Thread_Set_state( executing, STATES_WAITING_FOR_TIME );
+ _Thread_Wait_flags_set( executing, THREAD_WAIT_STATE_BLOCKED );
_Watchdog_Initialize(
&executing->Timer,
- _Thread_Delay_ended,
+ _Thread_Timeout,
0,
executing
);
@@ -60,6 +62,6 @@ rtems_status_code rtems_task_wake_when(
&executing->Timer,
seconds - _TOD_Seconds_since_epoch()
);
- _Thread_Enable_dispatch();
+ _Thread_Dispatch_enable( cpu_self );
return RTEMS_SUCCESSFUL;
}