Changeset 390e73c4 in rtems

Timestamp:

05/12/14 13:55:25 (10 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

c8b7b32

Parents:

fa0a9a18

git-author:

Sebastian Huber <sebastian.huber@…> (05/12/14 13:55:25)

git-committer:

Sebastian Huber <sebastian.huber@…> (05/12/14 13:56:42)

Message:

score: Move out of RTEMS_HAVE_SYS_CPUSET_H

Move _Scheduler_Get() and _Scheduler_Set() out of the #if
defined(RTEMS_HAVE_SYS_CPUSET_H) block.

File:

• cpukit/score/include/rtems/score/schedulerimpl.h (modified) (2 diffs)

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

@@ -330 +330 @@
 #endif
 }
-
-#if defined(__RTEMS_HAVE_SYS_CPUSET_H__)
-
-RTEMS_INLINE_ROUTINE void _Scheduler_Get_processor_set(
-  const Scheduler_Control *scheduler,
-  size_t                   cpusetsize,
-  cpu_set_t               *cpuset
-)
-{
-  uint32_t cpu_count = _SMP_Get_processor_count();
-  uint32_t cpu_index;
-
-  CPU_ZERO_S( cpusetsize, cpuset );
-
-  for ( cpu_index = 0 ; cpu_index < cpu_count ; ++cpu_index ) {
-#if defined(RTEMS_SMP)
-    if ( _Scheduler_Has_processor_ownership( scheduler, cpu_index ) ) {
-      CPU_SET_S( (int) cpu_index, cpusetsize, cpuset );
-    }
-#else
-    (void) scheduler;
-
-    CPU_SET_S( (int) cpu_index, cpusetsize, cpuset );
-#endif
-  }
-}
-
-RTEMS_INLINE_ROUTINE bool _Scheduler_default_Get_affinity_body(
-  const Scheduler_Control *scheduler,
-  Thread_Control          *the_thread,
-  size_t                   cpusetsize,
-  cpu_set_t               *cpuset
-)
-{
-  (void) the_thread;
-
-  _Scheduler_Get_processor_set( scheduler, cpusetsize, cpuset );
-
-  return true;
-}
-
-bool _Scheduler_Get_affinity(
-  const Scheduler_Control *scheduler,
-  Thread_Control          *the_thread,
-  size_t                   cpusetsize,
-  cpu_set_t               *cpuset
-);
 
 RTEMS_INLINE_ROUTINE const Scheduler_Control *_Scheduler_Get(
@@ -412 +365 @@
 }
 
+#if defined(__RTEMS_HAVE_SYS_CPUSET_H__)
+
+RTEMS_INLINE_ROUTINE void _Scheduler_Get_processor_set(
+  const Scheduler_Control *scheduler,
+  size_t                   cpusetsize,
+  cpu_set_t               *cpuset
+)
+{
+  uint32_t cpu_count = _SMP_Get_processor_count();
+  uint32_t cpu_index;
+
+  CPU_ZERO_S( cpusetsize, cpuset );
+
+  for ( cpu_index = 0 ; cpu_index < cpu_count ; ++cpu_index ) {
+#if defined(RTEMS_SMP)
+    if ( _Scheduler_Has_processor_ownership( scheduler, cpu_index ) ) {
+      CPU_SET_S( (int) cpu_index, cpusetsize, cpuset );
+    }
+#else
+    (void) scheduler;
+
+    CPU_SET_S( (int) cpu_index, cpusetsize, cpuset );
+#endif
+  }
+}
+
+RTEMS_INLINE_ROUTINE bool _Scheduler_default_Get_affinity_body(
+  const Scheduler_Control *scheduler,
+  Thread_Control          *the_thread,
+  size_t                   cpusetsize,
+  cpu_set_t               *cpuset
+)
+{
+  (void) the_thread;
+
+  _Scheduler_Get_processor_set( scheduler, cpusetsize, cpuset );
+
+  return true;
+}
+
+bool _Scheduler_Get_affinity(
+  const Scheduler_Control *scheduler,
+  Thread_Control          *the_thread,
+  size_t                   cpusetsize,
+  cpu_set_t               *cpuset
+);
+
 RTEMS_INLINE_ROUTINE bool _Scheduler_default_Set_affinity_body(
   const Scheduler_Control *scheduler,