summaryrefslogtreecommitdiffstats
path: root/cpukit/score/src/threadqextractpriority.c
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2013-08-23 11:52:01 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2013-08-26 10:22:18 +0200
commit2077ae4cc8e0a16f4cb117b88a0cf9b463c7980e (patch)
tree025efe3c0a30991a7e26f361ee8d1d6b7e7aed91 /cpukit/score/src/threadqextractpriority.c
parentlibblock: PR2040: Avoid NULL pointer access (diff)
downloadrtems-2077ae4cc8e0a16f4cb117b88a0cf9b463c7980e.tar.bz2
score: PR2140: _Thread_queue_Extract()
Return if the executing context performed the extract operation since interrupts may interfere.
Diffstat (limited to 'cpukit/score/src/threadqextractpriority.c')
-rw-r--r--cpukit/score/src/threadqextractpriority.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/cpukit/score/src/threadqextractpriority.c b/cpukit/score/src/threadqextractpriority.c
index 706f51e828..f314f75da9 100644
--- a/cpukit/score/src/threadqextractpriority.c
+++ b/cpukit/score/src/threadqextractpriority.c
@@ -43,7 +43,7 @@
* EXTRACT_PRIORITY
*/
-void _Thread_queue_Extract_priority_helper(
+bool _Thread_queue_Extract_priority_helper(
Thread_queue_Control *the_thread_queue __attribute__((unused)),
Thread_Control *the_thread,
bool requeuing
@@ -62,7 +62,7 @@ void _Thread_queue_Extract_priority_helper(
_ISR_Disable( level );
if ( !_States_Is_waiting_on_thread_queue( the_thread->current_state ) ) {
_ISR_Enable( level );
- return;
+ return false;
}
/*
@@ -103,7 +103,7 @@ void _Thread_queue_Extract_priority_helper(
if ( requeuing ) {
_ISR_Enable( level );
- return;
+ return true;
}
if ( !_Watchdog_Is_active( &the_thread->Timer ) ) {
@@ -119,4 +119,6 @@ void _Thread_queue_Extract_priority_helper(
if ( !_Objects_Is_local_id( the_thread->Object.id ) )
_Thread_MP_Free_proxy( the_thread );
#endif
+
+ return true;
}