score: Add processor set to scheduler context

Replace the simple processor count with the processor set owned by the
scheduler instance.

Update #3059.

3 files changed, 11 insertions, 23 deletions

diff --git a/cpukit/score/include/rtems/score/scheduler.h b/cpukit/score/include/rtems/score/scheduler.h
index 6e7bdcbd9a..7a3ae6b466 100644
--- a/cpukit/score/include/rtems/score/scheduler.h
+++ b/cpukit/score/include/rtems/score/scheduler.h
@@ -227,9 +227,9 @@ typedef struct Scheduler_Context {
 
 #if defined(RTEMS_SMP)
   /**
-   * @brief Count of processors owned by this scheduler instance.
+   * @brief The set of processors owned by this scheduler instance.
    */
-  uint32_t processor_count;
+  Processor_mask Processors;
 #endif
 } Scheduler_Context;
 
diff --git a/cpukit/score/include/rtems/score/schedulerimpl.h b/cpukit/score/include/rtems/score/schedulerimpl.h
index 927c6e1762..895f116066 100644
--- a/cpukit/score/include/rtems/score/schedulerimpl.h
+++ b/cpukit/score/include/rtems/score/schedulerimpl.h
@@ -589,28 +589,15 @@ RTEMS_INLINE_ROUTINE bool _Scheduler_Has_processor_ownership(
 #endif
 }
 
-RTEMS_INLINE_ROUTINE void _Scheduler_Get_processor_set(
-  const Scheduler_Control *scheduler,
-  size_t                   cpusetsize,
-  cpu_set_t               *cpuset
+RTEMS_INLINE_ROUTINE const Processor_mask *_Scheduler_Get_processors(
+  const Scheduler_Control *scheduler
 )
 {
-  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 );
-    }
+  return &_Scheduler_Get_context( scheduler )->Processors;
 #else
-    (void) scheduler;
-
-    CPU_SET_S( (int) cpu_index, cpusetsize, cpuset );
+  return &_Processor_mask_The_one_and_only;
 #endif
-  }
 }
 
 bool _Scheduler_Get_affinity(
@@ -688,7 +675,9 @@ RTEMS_INLINE_ROUTINE uint32_t _Scheduler_Get_processor_count(
 )
 {
 #if defined(RTEMS_SMP)
-  return _Scheduler_Get_context( scheduler )->processor_count;
+  const Scheduler_Context *context = _Scheduler_Get_context( scheduler );
+
+  return _Processor_mask_Count( &context->Processors );
 #else
   (void) scheduler;
 
diff --git a/cpukit/score/src/smp.c b/cpukit/score/src/smp.c
index a69b7ed46a..1a29e37d15 100644
--- a/cpukit/score/src/smp.c
+++ b/cpukit/score/src/smp.c
@@ -97,11 +97,10 @@ static void _SMP_Start_processors( uint32_t cpu_count )
       scheduler = assignment->scheduler;
       context = _Scheduler_Get_context( scheduler );
 
-      ++context->processor_count;
+      _Processor_mask_Set( &_SMP_Online_processors, cpu_index );
+      _Processor_mask_Set( &context->Processors, cpu_index );
       cpu->Scheduler.control = scheduler;
       cpu->Scheduler.context = context;
-
-      _Processor_mask_Set( &_SMP_Online_processors, cpu_index );
     }
   }
 }