summaryrefslogtreecommitdiffstats
path: root/cpukit/rtems
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2015-04-26 15:22:20 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2015-05-19 12:00:44 +0200
commitb7cff7feb0a0d41ec4876e5ac846bb6cf8254dce (patch)
tree6fefc9247636f7619ca170e2189e06d7fec59e10 /cpukit/rtems
parentFilesystem: Thread life protection for env changes (diff)
downloadrtems-b7cff7feb0a0d41ec4876e5ac846bb6cf8254dce.tar.bz2
score: Reduce thread wait states
Merge THREAD_WAIT_STATE_SATISFIED, THREAD_WAIT_STATE_TIMEOUT, THREAD_WAIT_STATE_INTERRUPT_SATISFIED, and THREAD_WAIT_STATE_INTERRUPT_TIMEOUT into one state THREAD_WAIT_STATE_READY_AGAIN. This helps to write generic routines to block a thread. Update #2273.
Diffstat (limited to 'cpukit/rtems')
-rw-r--r--cpukit/rtems/src/eventsurrender.c4
-rw-r--r--cpukit/rtems/src/eventtimeout.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/cpukit/rtems/src/eventsurrender.c b/cpukit/rtems/src/eventsurrender.c
index e29d203f71..b740721e22 100644
--- a/cpukit/rtems/src/eventsurrender.c
+++ b/cpukit/rtems/src/eventsurrender.c
@@ -85,7 +85,7 @@ void _Event_Surrender(
success = _Thread_Wait_flags_try_change_critical(
the_thread,
intend_to_block,
- wait_class | THREAD_WAIT_STATE_INTERRUPT_SATISFIED
+ wait_class | THREAD_WAIT_STATE_READY_AGAIN
);
if ( success ) {
_Event_Satisfy( the_thread, event, pending_events, seized_events );
@@ -94,7 +94,7 @@ void _Event_Surrender(
_Event_Satisfy( the_thread, event, pending_events, seized_events );
_Thread_Wait_flags_set(
the_thread,
- wait_class | THREAD_WAIT_STATE_SATISFIED
+ wait_class | THREAD_WAIT_STATE_READY_AGAIN
);
unblock = true;
} else {
diff --git a/cpukit/rtems/src/eventtimeout.c b/cpukit/rtems/src/eventtimeout.c
index 9c091748c0..5db118b183 100644
--- a/cpukit/rtems/src/eventtimeout.c
+++ b/cpukit/rtems/src/eventtimeout.c
@@ -45,7 +45,7 @@ void _Event_Timeout(
success = _Thread_Wait_flags_try_change_critical(
the_thread,
intend_to_block,
- wait_class | THREAD_WAIT_STATE_INTERRUPT_TIMEOUT
+ wait_class | THREAD_WAIT_STATE_READY_AGAIN
);
if ( success ) {
@@ -55,7 +55,7 @@ void _Event_Timeout(
the_thread->Wait.return_code = RTEMS_TIMEOUT;
_Thread_Wait_flags_set(
the_thread,
- wait_class | THREAD_WAIT_STATE_TIMEOUT
+ wait_class | THREAD_WAIT_STATE_READY_AGAIN
);
unblock = true;
} else {