[rtems commit] score: Rename to _Scheduler_Control

Sebastian Huber sebh at rtems.org
Wed Sep 27 10:11:40 UTC 2017


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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Sep 27 12:07:14 2017 +0200

score: Rename to _Scheduler_Control

Rename struct Scheduler_Control to _Scheduler_Control to allow its use
in standard header files, e.g. <pthread.h>.

Update #3112.

---

 cpukit/score/include/rtems/score/coremutex.h         |  4 ++--
 cpukit/score/include/rtems/score/percpu.h            |  2 +-
 cpukit/score/include/rtems/score/priority.h          |  4 ++--
 cpukit/score/include/rtems/score/scheduler.h         |  4 ++--
 cpukit/score/include/rtems/score/schedulernodeimpl.h | 10 +++++-----
 cpukit/score/include/rtems/score/thread.h            |  4 ++--
 cpukit/score/include/rtems/score/threadimpl.h        |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/cpukit/score/include/rtems/score/coremutex.h b/cpukit/score/include/rtems/score/coremutex.h
index d2bf1c2..fd1f27c 100644
--- a/cpukit/score/include/rtems/score/coremutex.h
+++ b/cpukit/score/include/rtems/score/coremutex.h
@@ -27,7 +27,7 @@
 #include <rtems/score/watchdog.h>
 #include <rtems/score/interr.h>
 
-struct Scheduler_Control;
+struct _Scheduler_Control;
 
 #ifdef __cplusplus
 extern "C" {
@@ -90,7 +90,7 @@ typedef struct {
   /**
    * @brief The scheduler instance for this priority ceiling mutex.
    */
-  const struct Scheduler_Control *scheduler;
+  const struct _Scheduler_Control *scheduler;
 #endif
 } CORE_ceiling_mutex_Control;
 
diff --git a/cpukit/score/include/rtems/score/percpu.h b/cpukit/score/include/rtems/score/percpu.h
index 3b63c7c..97cb2be 100644
--- a/cpukit/score/include/rtems/score/percpu.h
+++ b/cpukit/score/include/rtems/score/percpu.h
@@ -452,7 +452,7 @@ typedef struct Per_CPU_Control {
        * This pointer is NULL in case this processor is currently not used by a
        * scheduler instance.
        */
-      const struct Scheduler_Control *control;
+      const struct _Scheduler_Control *control;
 
       /**
        * @brief The scheduler context of the scheduler owning this processor.
diff --git a/cpukit/score/include/rtems/score/priority.h b/cpukit/score/include/rtems/score/priority.h
index 595aa3e..9cc6338 100644
--- a/cpukit/score/include/rtems/score/priority.h
+++ b/cpukit/score/include/rtems/score/priority.h
@@ -22,7 +22,7 @@
 #include <rtems/score/cpu.h>
 #include <rtems/score/rbtree.h>
 
-struct Scheduler_Control;
+struct _Scheduler_Control;
 
 #ifdef __cplusplus
 extern "C" {
@@ -140,7 +140,7 @@ struct Priority_Aggregation {
   /**
    * @brief The scheduler instance of this priority aggregation.
    */
-  const struct Scheduler_Control *scheduler;
+  const struct _Scheduler_Control *scheduler;
 #endif
 
   /**
diff --git a/cpukit/score/include/rtems/score/scheduler.h b/cpukit/score/include/rtems/score/scheduler.h
index a2a72b0..38f3e71 100644
--- a/cpukit/score/include/rtems/score/scheduler.h
+++ b/cpukit/score/include/rtems/score/scheduler.h
@@ -40,7 +40,7 @@ struct Per_CPU_Control;
  */
 /**@{*/
 
-typedef struct Scheduler_Control Scheduler_Control;
+typedef struct _Scheduler_Control Scheduler_Control;
 
 /**
  * @brief The scheduler operations.
@@ -236,7 +236,7 @@ typedef struct Scheduler_Context {
 /**
  * @brief Scheduler control.
  */
-struct Scheduler_Control {
+struct _Scheduler_Control {
   /**
    * @brief Reference to a statically allocated scheduler context.
    */
diff --git a/cpukit/score/include/rtems/score/schedulernodeimpl.h b/cpukit/score/include/rtems/score/schedulernodeimpl.h
index 009ad8f..9ac0334 100644
--- a/cpukit/score/include/rtems/score/schedulernodeimpl.h
+++ b/cpukit/score/include/rtems/score/schedulernodeimpl.h
@@ -18,7 +18,7 @@
 #include <rtems/score/schedulernode.h>
 #include <rtems/score/priorityimpl.h>
 
-struct Scheduler_Control;
+struct _Scheduler_Control;
 
 #ifdef __cplusplus
 extern "C" {
@@ -31,10 +31,10 @@ extern "C" {
   RTEMS_CONTAINER_OF( node, Scheduler_Node, Wait.Priority )
 
 RTEMS_INLINE_ROUTINE void _Scheduler_Node_do_initialize(
-  const struct Scheduler_Control *scheduler,
-  Scheduler_Node                 *node,
-  Thread_Control                 *the_thread,
-  Priority_Control                priority
+  const struct _Scheduler_Control *scheduler,
+  Scheduler_Node                  *node,
+  Thread_Control                  *the_thread,
+  Priority_Control                 priority
 )
 {
   node->owner = the_thread;
diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h
index ecab766..488e961 100644
--- a/cpukit/score/include/rtems/score/thread.h
+++ b/cpukit/score/include/rtems/score/thread.h
@@ -44,7 +44,7 @@ struct _pthread_cleanup_context;
 
 struct Per_CPU_Control;
 
-struct Scheduler_Control;
+struct _Scheduler_Control;
 
 struct User_extensions_Iterator;
 
@@ -261,7 +261,7 @@ typedef struct {
   /**
    * @brief The home scheduler control of this thread.
    */
-  const struct Scheduler_Control *home;
+  const struct _Scheduler_Control *home;
 
   /**
    * @brief The processor assigned by the current scheduler.
diff --git a/cpukit/score/include/rtems/score/threadimpl.h b/cpukit/score/include/rtems/score/threadimpl.h
index b2263a1..7fe06e7 100644
--- a/cpukit/score/include/rtems/score/threadimpl.h
+++ b/cpukit/score/include/rtems/score/threadimpl.h
@@ -165,7 +165,7 @@ void _Thread_Stack_Free(
 bool _Thread_Initialize(
   Thread_Information                   *information,
   Thread_Control                       *the_thread,
-  const struct Scheduler_Control       *scheduler,
+  const struct _Scheduler_Control      *scheduler,
   void                                 *stack_area,
   size_t                                stack_size,
   bool                                  is_fp,



More information about the vc mailing list