[rtems commit] rtems: Use _Thread_Get_executing()

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    3b8d2fa44312b1fea52f1d4bdd8bbedd45557822
Changeset: http://git.rtems.org/rtems/commit/?id=3b8d2fa44312b1fea52f1d4bdd8bbedd45557822

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Jul 18 11:03:24 2013 +0200

rtems: Use _Thread_Get_executing()

---

 cpukit/rtems/src/rtemsobjectsetname.c |    2 +-
 cpukit/rtems/src/signalcatch.c        |    2 +-
 cpukit/rtems/src/taskgetnote.c        |    8 +++++---
 cpukit/rtems/src/taskmode.c           |    2 +-
 cpukit/rtems/src/tasksetnote.c        |    6 ++++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/cpukit/rtems/src/rtemsobjectsetname.c b/cpukit/rtems/src/rtemsobjectsetname.c
index 7e35225..6db87ac 100644
--- a/cpukit/rtems/src/rtemsobjectsetname.c
+++ b/cpukit/rtems/src/rtemsobjectsetname.c
@@ -43,7 +43,7 @@ rtems_status_code rtems_object_set_name(
   if ( !name )
     return RTEMS_INVALID_ADDRESS;
 
-  tmpId = (id == OBJECTS_ID_OF_SELF) ? _Thread_Executing->Object.id : id;
+  tmpId = (id == OBJECTS_ID_OF_SELF) ? _Thread_Get_executing()->Object.id : id;
 
   information  = _Objects_Get_information_id( tmpId );
   if ( !information )
diff --git a/cpukit/rtems/src/signalcatch.c b/cpukit/rtems/src/signalcatch.c
index 1b342e7..4b709a8 100644
--- a/cpukit/rtems/src/signalcatch.c
+++ b/cpukit/rtems/src/signalcatch.c
@@ -79,7 +79,7 @@ rtems_status_code rtems_signal_catch(
   ASR_Information    *asr;
 
 /* XXX normalize mode */
-  executing = _Thread_Executing;
+  executing = _Thread_Get_executing();
   api = (RTEMS_API_Control*)executing->API_Extensions[ THREAD_API_RTEMS ];
   asr = &api->Signal;
 
diff --git a/cpukit/rtems/src/taskgetnote.c b/cpukit/rtems/src/taskgetnote.c
index 9748a1d..f1e6b00 100644
--- a/cpukit/rtems/src/taskgetnote.c
+++ b/cpukit/rtems/src/taskgetnote.c
@@ -43,6 +43,7 @@ rtems_status_code rtems_task_get_note(
   register Thread_Control *the_thread;
   Objects_Locations        location;
   RTEMS_API_Control       *api;
+  Thread_Control          *executing;
 
   if ( !rtems_configuration_get_notepads_enabled() )
     return RTEMS_NOT_CONFIGURED;
@@ -62,9 +63,10 @@ rtems_status_code rtems_task_get_note(
    *  Optimize the most likely case to avoid the Thread_Dispatch.
    */
 
+  executing = _Thread_Get_executing();
   if ( _Objects_Are_ids_equal( id, OBJECTS_ID_OF_SELF ) ||
-       _Objects_Are_ids_equal( id, _Thread_Executing->Object.id ) ) {
-      api = _Thread_Executing->API_Extensions[ THREAD_API_RTEMS ];
+       _Objects_Are_ids_equal( id, executing->Object.id ) ) {
+      api = executing->API_Extensions[ THREAD_API_RTEMS ];
       *note = api->Notepads[ notepad ];
       return RTEMS_SUCCESSFUL;
   }
@@ -80,7 +82,7 @@ rtems_status_code rtems_task_get_note(
 
 #if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:
-      _Thread_Executing->Wait.return_argument = note;
+      executing->Wait.return_argument = note;
 
       return _RTEMS_tasks_MP_Send_request_packet(
         RTEMS_TASKS_MP_GET_NOTE_REQUEST,
diff --git a/cpukit/rtems/src/taskmode.c b/cpukit/rtems/src/taskmode.c
index 7b3233e..d9c7fce 100644
--- a/cpukit/rtems/src/taskmode.c
+++ b/cpukit/rtems/src/taskmode.c
@@ -48,7 +48,7 @@ rtems_status_code rtems_task_mode(
   if ( !previous_mode_set )
     return RTEMS_INVALID_ADDRESS;
 
-  executing     = _Thread_Executing;
+  executing     = _Thread_Get_executing();
   api = executing->API_Extensions[ THREAD_API_RTEMS ];
   asr = &api->Signal;
 
diff --git a/cpukit/rtems/src/tasksetnote.c b/cpukit/rtems/src/tasksetnote.c
index eb5ed9e..28218cd 100644
--- a/cpukit/rtems/src/tasksetnote.c
+++ b/cpukit/rtems/src/tasksetnote.c
@@ -43,6 +43,7 @@ rtems_status_code rtems_task_set_note(
   register Thread_Control *the_thread;
   Objects_Locations        location;
   RTEMS_API_Control       *api;
+  Thread_Control          *executing;
 
   if ( !rtems_configuration_get_notepads_enabled() )
     return RTEMS_NOT_CONFIGURED;
@@ -59,9 +60,10 @@ rtems_status_code rtems_task_set_note(
    *  Optimize the most likely case to avoid the Thread_Dispatch.
    */
 
+  executing = _Thread_Get_executing();
   if ( _Objects_Are_ids_equal( id, OBJECTS_ID_OF_SELF ) ||
-       _Objects_Are_ids_equal( id, _Thread_Executing->Object.id ) ) {
-      api = _Thread_Executing->API_Extensions[ THREAD_API_RTEMS ];
+       _Objects_Are_ids_equal( id, executing->Object.id ) ) {
+      api = executing->API_Extensions[ THREAD_API_RTEMS ];
       api->Notepads[ notepad ] = note;
       return RTEMS_SUCCESSFUL;
   }