diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-07-18 16:00:54 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-07-22 16:56:59 +0200 |
| commit | 33a4a56e7f2c52148bfd09cdcb7371d9b1b37eb5 (patch) | |
| tree | 63951d498925df25b7d2dbd93a95e1645c6fab2c /cpukit/score | |
| parent | score: Create message queue implementation header (diff) | |
| download | rtems-33a4a56e7f2c52148bfd09cdcb7371d9b1b37eb5.tar.bz2 | |
score: Avoid direct usage of _Thread_Executing
Pass the executing thread as a function parameter. Obtain the executing
thread inside a thread dispatch critical section to avoid problems on
SMP.
Diffstat (limited to 'cpukit/score')
| -rw-r--r-- | cpukit/score/include/rtems/score/coremsgimpl.h | 4 | ||||
| -rw-r--r-- | cpukit/score/src/coremsgseize.c | 5 | ||||
| -rw-r--r-- | cpukit/score/src/coremsgsubmit.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/cpukit/score/include/rtems/score/coremsgimpl.h b/cpukit/score/include/rtems/score/coremsgimpl.h index 406a5963c1..f579e6363b 100644 --- a/cpukit/score/include/rtems/score/coremsgimpl.h +++ b/cpukit/score/include/rtems/score/coremsgimpl.h @@ -274,6 +274,7 @@ CORE_message_queue_Status _CORE_message_queue_Broadcast( */ CORE_message_queue_Status _CORE_message_queue_Submit( CORE_message_queue_Control *the_message_queue, + Thread_Control *executing, const void *buffer, size_t size, Objects_Id id, @@ -320,6 +321,7 @@ CORE_message_queue_Status _CORE_message_queue_Submit( */ void _CORE_message_queue_Seize( CORE_message_queue_Control *the_message_queue, + Thread_Control *executing, Objects_Id id, void *buffer, size_t *size_p, @@ -363,6 +365,7 @@ RTEMS_INLINE_ROUTINE CORE_message_queue_Status _CORE_message_queue_Send( { return _CORE_message_queue_Submit( the_message_queue, + _Thread_Executing, buffer, size, id, @@ -388,6 +391,7 @@ RTEMS_INLINE_ROUTINE CORE_message_queue_Status _CORE_message_queue_Urgent( { return _CORE_message_queue_Submit( the_message_queue, + _Thread_Executing, buffer, size, id, diff --git a/cpukit/score/src/coremsgseize.c b/cpukit/score/src/coremsgseize.c index f0567dbce4..5d64616ace 100644 --- a/cpukit/score/src/coremsgseize.c +++ b/cpukit/score/src/coremsgseize.c @@ -29,6 +29,7 @@ void _CORE_message_queue_Seize( CORE_message_queue_Control *the_message_queue, + Thread_Control *executing, Objects_Id id, void *buffer, size_t *size_p, @@ -38,9 +39,7 @@ void _CORE_message_queue_Seize( { ISR_Level level; CORE_message_queue_Buffer_control *the_message; - Thread_Control *executing; - executing = _Thread_Executing; executing->Wait.return_code = CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL; _ISR_Disable( level ); the_message = _CORE_message_queue_Get_pending_message( the_message_queue ); @@ -49,7 +48,7 @@ void _CORE_message_queue_Seize( _ISR_Enable( level ); *size_p = the_message->Contents.size; - _Thread_Executing->Wait.count = + executing->Wait.count = _CORE_message_queue_Get_message_priority( the_message ); _CORE_message_queue_Copy_buffer( the_message->Contents.buffer, diff --git a/cpukit/score/src/coremsgsubmit.c b/cpukit/score/src/coremsgsubmit.c index c5e9a6b621..6acaadab89 100644 --- a/cpukit/score/src/coremsgsubmit.c +++ b/cpukit/score/src/coremsgsubmit.c @@ -30,6 +30,7 @@ CORE_message_queue_Status _CORE_message_queue_Submit( CORE_message_queue_Control *the_message_queue, + Thread_Control *executing, const void *buffer, size_t size, Objects_Id id, @@ -122,7 +123,6 @@ CORE_message_queue_Status _CORE_message_queue_Submit( * would be to use this variable prior to here. */ { - Thread_Control *executing = _Thread_Executing; ISR_Level level; _ISR_Disable( level ); |