diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-10-10 11:36:23 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-10-11 07:37:58 +0200 |
| commit | b2dbb634eccc4132eb839a0ed5ab09c7b3bd992e (patch) | |
| tree | f8ceced2aa2efa35f9a208a9279bcf5b95ea03e5 /cpukit/score/src/schedulerpriorityaffinitysmp.c | |
| parent | posix: Validate affinity sets by the scheduler (diff) | |
| download | rtems-b2dbb634eccc4132eb839a0ed5ab09c7b3bd992e.tar.bz2 | |
score: Remove CPU_set_Control
Use Processor_mask instead.
Update #2514.
Diffstat (limited to 'cpukit/score/src/schedulerpriorityaffinitysmp.c')
| -rw-r--r-- | cpukit/score/src/schedulerpriorityaffinitysmp.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/cpukit/score/src/schedulerpriorityaffinitysmp.c b/cpukit/score/src/schedulerpriorityaffinitysmp.c index e8301226f3..03db3e9a26 100644 --- a/cpukit/score/src/schedulerpriorityaffinitysmp.c +++ b/cpukit/score/src/schedulerpriorityaffinitysmp.c @@ -84,8 +84,11 @@ void _Scheduler_priority_affinity_SMP_Node_initialize( * All we add is affinity information to the basic SMP node. */ the_node = _Scheduler_priority_affinity_SMP_Node_downcast( node ); - the_node->Affinity = *_CPU_set_Default(); - the_node->Affinity.set = &the_node->Affinity.preallocated; + _Processor_mask_To_cpu_set_t( + _SMP_Get_online_processors(), + sizeof( the_node->affinity ), + &the_node->affinity + ); } /* @@ -153,7 +156,7 @@ static Scheduler_Node *_Scheduler_priority_affinity_SMP_Get_highest_ready( /* * Can this thread run on this CPU? */ - if ( CPU_ISSET( (int) victim_cpu_index, node->Affinity.set ) ) { + if ( CPU_ISSET( (int) victim_cpu_index, &node->affinity ) ) { highest = &node->Base.Base.Base; break; } @@ -245,7 +248,7 @@ static Scheduler_Node * _Scheduler_priority_affinity_SMP_Get_lowest_scheduled( thread = _Scheduler_Node_get_owner( &node->Base.Base.Base ); cpu_index = _Per_CPU_Get_index( _Thread_Get_CPU( thread ) ); - if ( CPU_ISSET( (int) cpu_index, filter->Affinity.set ) ) { + if ( CPU_ISSET( (int) cpu_index, &filter->affinity ) ) { lowest_scheduled = &node->Base.Base.Base; break; } @@ -623,7 +626,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( &cpuset, node->Affinity.set ) ) + if ( CPU_EQUAL( &cpuset, &node->affinity ) ) return true; current_state = thread->current_state; @@ -632,7 +635,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 ); if ( _States_Is_ready( current_state ) ) { /* |