From 78515554fd110c9636c38501b699a5da125a5496 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 3 Jul 2017 14:05:26 +0200 Subject: score: Move processor affinity to Thread_Control Update #3059. --- cpukit/score/src/processormaskcopy.c | 2 ++ cpukit/score/src/schedulerdefaultgetaffinity.c | 37 ------------------------- cpukit/score/src/schedulergetaffinity.c | 30 ++++++-------------- cpukit/score/src/schedulerpriorityaffinitysmp.c | 23 --------------- cpukit/score/src/threadinitialize.c | 1 + 5 files changed, 12 insertions(+), 81 deletions(-) delete mode 100644 cpukit/score/src/schedulerdefaultgetaffinity.c (limited to 'cpukit/score/src') diff --git a/cpukit/score/src/processormaskcopy.c b/cpukit/score/src/processormaskcopy.c index bf8082d3c4..677c886e60 100644 --- a/cpukit/score/src/processormaskcopy.c +++ b/cpukit/score/src/processormaskcopy.c @@ -26,6 +26,8 @@ #include +const Processor_mask _Processor_mask_The_one_and_only = { .__bits[ 0 ] = 1 }; + Processor_mask_Copy_status _Processor_mask_Copy( long *dst, size_t dst_size, diff --git a/cpukit/score/src/schedulerdefaultgetaffinity.c b/cpukit/score/src/schedulerdefaultgetaffinity.c deleted file mode 100644 index 56a4ee4fad..0000000000 --- a/cpukit/score/src/schedulerdefaultgetaffinity.c +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @file - * - * @brief Scheduler Default Get Affinity Operation - * - * @ingroup ScoreScheduler - */ - -/* - * COPYRIGHT (c) 2014. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#if HAVE_CONFIG_H - #include "config.h" -#endif - -#include - -bool _Scheduler_default_Get_affinity( - const Scheduler_Control *scheduler, - Thread_Control *thread, - size_t cpusetsize, - cpu_set_t *cpuset -) -{ - return _Scheduler_default_Get_affinity_body( - scheduler, - thread, - cpusetsize, - cpuset - ); -} diff --git a/cpukit/score/src/schedulergetaffinity.c b/cpukit/score/src/schedulergetaffinity.c index 37e10de958..8425a7fcf6 100644 --- a/cpukit/score/src/schedulergetaffinity.c +++ b/cpukit/score/src/schedulergetaffinity.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 @@ -24,33 +24,21 @@ bool _Scheduler_Get_affinity( cpu_set_t *cpuset ) { - const Scheduler_Control *scheduler; - ISR_lock_Context lock_context; - bool ok; - - if ( !_CPU_set_Is_large_enough( cpusetsize ) ) { - return false; - } + const Scheduler_Control *scheduler; + ISR_lock_Context lock_context; + Processor_mask *affinity; + Processor_mask_Copy_status status; scheduler = _Thread_Scheduler_get_home( the_thread ); _Scheduler_Acquire_critical( scheduler, &lock_context ); #if defined(RTEMS_SMP) - ok = ( *scheduler->Operations.get_affinity )( - scheduler, - the_thread, - cpusetsize, - cpuset - ); + affinity = &the_thread->Scheduler.Affinity; #else - ok = _Scheduler_default_Get_affinity_body( - scheduler, - the_thread, - cpusetsize, - cpuset - ); + affinity = &_Processor_mask_The_one_and_only; #endif + status = _Processor_mask_To_cpu_set_t( affinity, cpusetsize, cpuset ); _Scheduler_Release_critical( scheduler, &lock_context ); - return ok; + return status == PROCESSOR_MASK_COPY_LOSSLESS; } diff --git a/cpukit/score/src/schedulerpriorityaffinitysmp.c b/cpukit/score/src/schedulerpriorityaffinitysmp.c index 1fa5dbf920..4533dec9d7 100644 --- a/cpukit/score/src/schedulerpriorityaffinitysmp.c +++ b/cpukit/score/src/schedulerpriorityaffinitysmp.c @@ -611,29 +611,6 @@ Thread_Control *_Scheduler_priority_affinity_SMP_Remove_processor( ); } -/* - * This is the public scheduler specific Change Priority operation. - */ -bool _Scheduler_priority_affinity_SMP_Get_affinity( - const Scheduler_Control *scheduler, - Thread_Control *thread, - size_t cpusetsize, - cpu_set_t *cpuset -) -{ - Scheduler_priority_affinity_SMP_Node *node = - _Scheduler_priority_affinity_SMP_Thread_get_node(thread); - - (void) scheduler; - - if ( node->Affinity.setsize != cpusetsize ) { - return false; - } - - CPU_COPY( node->Affinity.set, cpuset ); - return true; -} - bool _Scheduler_priority_affinity_SMP_Set_affinity( const Scheduler_Control *scheduler, Thread_Control *thread, diff --git a/cpukit/score/src/threadinitialize.c b/cpukit/score/src/threadinitialize.c index c34113db3d..803ee7b646 100644 --- a/cpukit/score/src/threadinitialize.c +++ b/cpukit/score/src/threadinitialize.c @@ -248,6 +248,7 @@ bool _Thread_Initialize( RTEMS_STATIC_ASSERT( THREAD_SCHEDULER_BLOCKED == 0, Scheduler_state ); the_thread->Scheduler.home = scheduler; _ISR_lock_Initialize( &the_thread->Scheduler.Lock, "Thread Scheduler" ); + _Processor_mask_Assign( &the_thread->Scheduler.Affinity, &_SMP_Online_processors ); _ISR_lock_Initialize( &the_thread->Wait.Lock.Default, "Thread Wait Default" ); _Thread_queue_Gate_open( &the_thread->Wait.Lock.Tranquilizer ); _RBTree_Initialize_node( &the_thread->Wait.Link.Registry_node ); -- cgit v1.2.3