diff options
Diffstat (limited to 'cpukit/rtems/src/schedulerremoveprocessor.c')
-rw-r--r-- | cpukit/rtems/src/schedulerremoveprocessor.c | 85 |
1 files changed, 72 insertions, 13 deletions
diff --git a/cpukit/rtems/src/schedulerremoveprocessor.c b/cpukit/rtems/src/schedulerremoveprocessor.c index 79c17bda49..2fc9b524ae 100644 --- a/cpukit/rtems/src/schedulerremoveprocessor.c +++ b/cpukit/rtems/src/schedulerremoveprocessor.c @@ -1,31 +1,44 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + /** * @file * - * @ingroup RTEMSImplClassic + * @ingroup RTEMSImplClassicScheduler * * @brief This source file contains the implementation of * rtems_scheduler_remove_processor(). */ /* - * Copyright (c) 2016 embedded brains GmbH. All rights reserved. + * Copyright (c) 2016 embedded brains GmbH & Co. KG * - * embedded brains GmbH - * Dornierstr. 4 - * 82178 Puchheim - * Germany - * <rtems@embedded-brains.de> + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * - * 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include <rtems/rtems/tasks.h> +#include <rtems/rtems/scheduler.h> #include <rtems/score/schedulerimpl.h> #include <rtems/config.h> @@ -35,7 +48,7 @@ typedef struct { rtems_status_code status; } Scheduler_Processor_removal_context; -static bool _Scheduler_Check_processor_removal( +static bool _Scheduler_Check_processor_not_required( Thread_Control *the_thread, void *arg ) @@ -68,6 +81,45 @@ static bool _Scheduler_Check_processor_removal( _Thread_Wait_release( the_thread, &queue_context ); return iter_context->status != RTEMS_SUCCESSFUL; } + +static bool _Scheduler_Check_no_helping( + Thread_Control *the_thread, + void *arg +) +{ + Scheduler_Processor_removal_context *iter_context; + ISR_lock_Context lock_context; + const Chain_Node *node; + const Chain_Node *tail; + + if ( the_thread->is_idle ) { + return false; + } + + iter_context = arg; + + _Thread_State_acquire( the_thread, &lock_context ); + node = _Chain_Immutable_first( &the_thread->Scheduler.Scheduler_nodes ); + tail = _Chain_Immutable_tail( &the_thread->Scheduler.Scheduler_nodes ); + + do { + const Scheduler_Node *scheduler_node; + const Scheduler_Control *scheduler; + + scheduler_node = SCHEDULER_NODE_OF_THREAD_SCHEDULER_NODE( node ); + scheduler = _Scheduler_Node_get_scheduler( scheduler_node ); + + if ( scheduler == iter_context->scheduler ) { + iter_context->status = RTEMS_RESOURCE_IN_USE; + break; + } + + node = _Chain_Immutable_next( node ); + } while ( node != tail ); + + _Thread_State_release( the_thread, &lock_context ); + return iter_context->status != RTEMS_SUCCESSFUL; +} #endif rtems_status_code rtems_scheduler_remove_processor( @@ -116,7 +168,14 @@ rtems_status_code rtems_scheduler_remove_processor( _Scheduler_Release_critical( scheduler, &lock_context ); _ISR_lock_ISR_enable( &lock_context ); - _Thread_Iterate( _Scheduler_Check_processor_removal, &iter_context ); + _Thread_Iterate( _Scheduler_Check_processor_not_required, &iter_context ); + + if ( + _Processor_mask_Is_zero( &scheduler_context->Processors ) && + iter_context.status == RTEMS_SUCCESSFUL + ) { + _Thread_Iterate( _Scheduler_Check_no_helping, &iter_context ); + } _ISR_lock_ISR_disable( &lock_context ); _Scheduler_Acquire_critical( scheduler, &lock_context ); |