score: Use processor mask for set affinity

Update #3059.

3 files changed, 27 insertions, 21 deletions

diff --git a/cpukit/score/src/schedulerdefaultsetaffinity.c b/cpukit/score/src/schedulerdefaultsetaffinity.c
index e53f8b8349..940d0939dc 100644
--- a/cpukit/score/src/schedulerdefaultsetaffinity.c
+++ b/cpukit/score/src/schedulerdefaultsetaffinity.c
@@ -24,14 +24,12 @@
 bool _Scheduler_default_Set_affinity(
   const Scheduler_Control *scheduler,
   Thread_Control          *thread,
-  size_t                   cpusetsize,
-  const cpu_set_t         *cpuset
+  const Processor_mask    *affinity
 )
 {
   return _Scheduler_default_Set_affinity_body(
     scheduler,
     thread,
-    cpusetsize,
-    cpuset
+    affinity
   );
 }
diff --git a/cpukit/score/src/schedulerpriorityaffinitysmp.c b/cpukit/score/src/schedulerpriorityaffinitysmp.c
index 4533dec9d7..6cc480d5c4 100644
--- a/cpukit/score/src/schedulerpriorityaffinitysmp.c
+++ b/cpukit/score/src/schedulerpriorityaffinitysmp.c
@@ -614,17 +614,20 @@ Thread_Control *_Scheduler_priority_affinity_SMP_Remove_processor(
 bool _Scheduler_priority_affinity_SMP_Set_affinity(
   const Scheduler_Control *scheduler,
   Thread_Control          *thread,
-  size_t                   cpusetsize,
-  const cpu_set_t         *cpuset
+  const Processor_mask    *affinity
 )
 {
   Scheduler_priority_affinity_SMP_Node *node;
   States_Control                        current_state;
+  cpu_set_t                             cpuset;
+  size_t                                cpusetsize;
 
+  cpusetsize = sizeof( cpuset );
+  _Processor_mask_To_cpu_set_t( affinity, cpusetsize, &cpuset );
   /*
    * Validate that the cpset meets basic requirements.
    */
-  if ( !_CPU_set_Is_valid( cpuset, cpusetsize ) ) {
+  if ( !_CPU_set_Is_valid( &cpuset, cpusetsize ) ) {
     return false;
   }
 
@@ -634,7 +637,7 @@ bool _Scheduler_priority_affinity_SMP_Set_affinity(
    * The old and new set are the same, there is no point in
    * doing anything.
    */
-  if ( CPU_EQUAL_S( cpusetsize, cpuset, node->Affinity.set ) )
+  if ( CPU_EQUAL_S( cpusetsize, &cpuset, node->Affinity.set ) )
     return true;
 
   current_state = thread->current_state;
@@ -643,7 +646,7 @@ bool _Scheduler_priority_affinity_SMP_Set_affinity(
     _Scheduler_priority_affinity_SMP_Block( scheduler, thread, &node->Base.Base.Base );
   }
 
-  CPU_COPY( cpuset, node->Affinity.set );
+  CPU_COPY( &cpuset, node->Affinity.set );
 
   if ( _States_Is_ready( current_state ) ) {
     /*
diff --git a/cpukit/score/src/schedulersetaffinity.c b/cpukit/score/src/schedulersetaffinity.c
index 67073dffd1..93ed851b9e 100644
--- a/cpukit/score/src/schedulersetaffinity.c
+++ b/cpukit/score/src/schedulersetaffinity.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2014, 2017 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
  *  Dornierstr. 4
@@ -19,16 +19,19 @@
 #include <rtems/score/schedulerimpl.h>
 
 bool _Scheduler_Set_affinity(
-  Thread_Control  *the_thread,
-  size_t           cpusetsize,
-  const cpu_set_t *cpuset
+  Thread_Control       *the_thread,
+  size_t                cpusetsize,
+  const cpu_set_t      *cpuset
 )
 {
-  const Scheduler_Control *scheduler;
-  ISR_lock_Context         lock_context;
-  bool                     ok;
+  Processor_mask             affinity;
+  Processor_mask_Copy_status status;
+  const Scheduler_Control   *scheduler;
+  ISR_lock_Context           lock_context;
+  bool                       ok;
 
-  if ( !_CPU_set_Is_large_enough( cpusetsize ) ) {
+  status = _Processor_mask_From_cpu_set_t( &affinity, cpusetsize, cpuset );
+  if ( !_Processor_mask_Is_at_most_partial_loss( status ) ) {
     return false;
   }
 
@@ -39,15 +42,17 @@ bool _Scheduler_Set_affinity(
   ok = ( *scheduler->Operations.set_affinity )(
     scheduler,
     the_thread,
-    cpusetsize,
-    cpuset
+    &affinity
   );
+
+  if ( ok ) {
+    _Processor_mask_Assign( &the_thread->Scheduler.Affinity, &affinity );
+  }
 #else
   ok = _Scheduler_default_Set_affinity_body(
     scheduler,
     the_thread,
-    cpusetsize,
-    cpuset
+    &affinity
   );
 #endif