[rtems commit] score: Add _Thread_Clear_state_locked()
Sebastian Huber
sebh at rtems.org
Fri May 20 05:58:12 UTC 2016
Module: rtems
Branch: master
Commit: f410ea82a4b9d5609ce170d2aa09027b5a7c4c50
Changeset: http://git.rtems.org/rtems/commit/?id=f410ea82a4b9d5609ce170d2aa09027b5a7c4c50
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Fri May 13 07:12:38 2016 +0200
score: Add _Thread_Clear_state_locked()
This makes it possible to do thread state and thread life changes
together under protection of the thread state lock.
Update #2555.
Update #2626.
---
cpukit/score/include/rtems/score/threadimpl.h | 5 +++++
cpukit/score/src/threadclearstate.c | 21 ++++++++++++++++-----
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/cpukit/score/include/rtems/score/threadimpl.h b/cpukit/score/include/rtems/score/threadimpl.h
index 09e3382..68b9e72 100644
--- a/cpukit/score/include/rtems/score/threadimpl.h
+++ b/cpukit/score/include/rtems/score/threadimpl.h
@@ -231,6 +231,11 @@ void _Thread_Cancel( Thread_Control *the_thread, Thread_Control *executing );
*/
void _Thread_Close( Thread_Control *the_thread, Thread_Control *executing );
+States_Control _Thread_Clear_state_locked(
+ Thread_Control *the_thread,
+ States_Control state
+);
+
/**
* @brief Clears the specified thread state.
*
diff --git a/cpukit/score/src/threadclearstate.c b/cpukit/score/src/threadclearstate.c
index 3da3538..a67850e 100644
--- a/cpukit/score/src/threadclearstate.c
+++ b/cpukit/score/src/threadclearstate.c
@@ -22,17 +22,15 @@
#include <rtems/score/assert.h>
#include <rtems/score/schedulerimpl.h>
-States_Control _Thread_Clear_state(
+States_Control _Thread_Clear_state_locked(
Thread_Control *the_thread,
States_Control state
)
{
- ISR_lock_Context lock_context;
- States_Control previous_state;
+ States_Control previous_state;
_Assert( state != 0 );
-
- _Thread_State_acquire( the_thread, &lock_context );
+ _Assert( _Thread_State_is_owner( the_thread ) );
previous_state = the_thread->current_state;
@@ -47,6 +45,19 @@ States_Control _Thread_Clear_state(
}
}
+ return previous_state;
+}
+
+States_Control _Thread_Clear_state(
+ Thread_Control *the_thread,
+ States_Control state
+)
+{
+ ISR_lock_Context lock_context;
+ States_Control previous_state;
+
+ _Thread_State_acquire( the_thread, &lock_context );
+ previous_state = _Thread_Clear_state_locked( the_thread, state );
_Thread_State_release( the_thread, &lock_context );
return previous_state;
More information about the vc
mailing list