Changeset 2369b10 in rtems

Timestamp:

05/14/14 14:04:10 (10 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

f39f667a

Parents:

0f41cc3

git-author:

Sebastian Huber <sebastian.huber@…> (05/14/14 14:04:10)

git-committer:

Sebastian Huber <sebastian.huber@…> (05/14/14 15:01:22)

Message:

score: Add and use _Scheduler_Get_context()

Location:

cpukit/score

Files:

• include/rtems/score/scheduleredfimpl.h (modified) (1 diff)
• include/rtems/score/schedulerimpl.h (modified) (2 diffs)
• include/rtems/score/schedulerpriorityimpl.h (modified) (1 diff)
• include/rtems/score/schedulersimpleimpl.h (modified) (1 diff)
• src/schedulerprioritysmp.c (modified) (1 diff)
• src/schedulersimplesmp.c (modified) (1 diff)
• src/smp.c (modified) (1 diff)

cpukit/score/include/rtems/score/scheduleredfimpl.h

@@ -35 +35 @@
   _Scheduler_EDF_Get_context( const Scheduler_Control *scheduler )
 {
-  return (Scheduler_EDF_Context *) scheduler->context;
+  return (Scheduler_EDF_Context *) _Scheduler_Get_context( scheduler );
 }
 

cpukit/score/include/rtems/score/schedulerimpl.h

@@ -579 +579 @@
 }
 
+RTEMS_INLINE_ROUTINE Scheduler_Context *_Scheduler_Get_context(
+  const Scheduler_Control *scheduler
+)
+{
+  return scheduler->context;
+}
+
 RTEMS_INLINE_ROUTINE uint32_t _Scheduler_Get_processor_count(
   const Scheduler_Control *scheduler
@@ -584 +591 @@
 {
 #if defined(RTEMS_SMP)
-  return scheduler->context->processor_count;
+  return _Scheduler_Get_context( scheduler )->processor_count;
 #else
   (void) scheduler;

cpukit/score/include/rtems/score/schedulerpriorityimpl.h

@@ -39 +39 @@
   _Scheduler_priority_Get_context( const Scheduler_Control *scheduler )
 {
-  return (Scheduler_priority_Context *) scheduler->context;
+  return (Scheduler_priority_Context *) _Scheduler_Get_context( scheduler );
 }
 

cpukit/score/include/rtems/score/schedulersimpleimpl.h

@@ -36 +36 @@
   _Scheduler_simple_Get_context( const Scheduler_Control *scheduler )
 {
-  return (Scheduler_simple_Context *) scheduler->context;
+  return (Scheduler_simple_Context *) _Scheduler_Get_context( scheduler );
 }
 

cpukit/score/src/schedulerprioritysmp.c

@@ -33 +33 @@
 _Scheduler_priority_SMP_Get_context( const Scheduler_Control *scheduler )
 {
-  return (Scheduler_priority_SMP_Context *) scheduler->context;
+  return (Scheduler_priority_SMP_Context *) _Scheduler_Get_context( scheduler );
 }
 

cpukit/score/src/schedulersimplesmp.c

@@ -26 +26 @@
 _Scheduler_simple_SMP_Get_context( const Scheduler_Control *scheduler )
 {
-  return (Scheduler_simple_SMP_Context *) scheduler->context;
+  return (Scheduler_simple_SMP_Context *) _Scheduler_Get_context( scheduler );
 }
 

cpukit/score/src/smp.c

@@ -59 +59 @@
 
     if ( started ) {
-      Scheduler_Context *scheduler_context = assignment->scheduler->context;
+      Scheduler_Context *context =
+        _Scheduler_Get_context( assignment->scheduler );
 
-      ++scheduler_context->processor_count;
-      cpu->scheduler_context = scheduler_context;
+      ++context->processor_count;
+      cpu->scheduler_context = context;
     }
   }