diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-12-10 10:41:48 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2020-02-12 09:08:37 +0100 |
commit | 24851567c38f573e9176529e9ca431fbf80c6cef (patch) | |
tree | bd75506122c9a310228d1c58fba7544a5e05dd65 /cpukit/score/src/objectallocate.c | |
parent | score: Add _Objects_Free_objects_block() (diff) | |
download | rtems-24851567c38f573e9176529e9ca431fbf80c6cef.tar.bz2 |
score: Split up objects allocation
Split up the different objects allocation methods into separate
functions. This helps to avoid a dependency on the workspace in case no
objects or a static set of objects is configured.
Change license to BSD-2-Clause according to file histories.
Update #3053.
Update #3835.
Diffstat (limited to 'cpukit/score/src/objectallocate.c')
-rw-r--r-- | cpukit/score/src/objectallocate.c | 101 |
1 files changed, 27 insertions, 74 deletions
diff --git a/cpukit/score/src/objectallocate.c b/cpukit/score/src/objectallocate.c index ac7579dc78..588c516b33 100644 --- a/cpukit/score/src/objectallocate.c +++ b/cpukit/score/src/objectallocate.c @@ -1,17 +1,36 @@ /** - * @file + * @file * - * @brief Allocate Object - * @ingroup RTEMSScoreObject + * @ingroup RTEMSScoreObject + * + * @brief Allocate Object */ /* - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (C) 2014 embedded brains GmbH + * + * 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. */ #if HAVE_CONFIG_H @@ -19,72 +38,6 @@ #endif #include <rtems/score/objectimpl.h> -#include <rtems/score/assert.h> -#include <rtems/score/chainimpl.h> -#include <rtems/score/sysstate.h> - -static Objects_Control *_Objects_Get_inactive( - Objects_Information *information -) -{ - return (Objects_Control *) _Chain_Get_unprotected( &information->Inactive ); -} - -Objects_Control *_Objects_Allocate_unprotected( - Objects_Information *information -) -{ - Objects_Control *the_object; - - _Assert( - _Objects_Allocator_is_owner() - || !_System_state_Is_up( _System_state_Get() ) - ); - - /* - * If the application is using the optional manager stubs and - * still attempts to create the object, the information block - * should be all zeroed out because it is in the BSS. So let's - * check that code for this manager is even present. - */ - if ( information->object_size == 0 ) - return NULL; - - /* - * OK. The manager should be initialized and configured to have objects. - * With any luck, it is safe to attempt to allocate an object. - */ - the_object = _Objects_Get_inactive( information ); - - if ( _Objects_Is_auto_extend( information ) ) { - /* - * If the list is empty then we are out of objects and need to - * extend information base. - */ - - if ( the_object == NULL ) { - _Objects_Extend_information( information ); - the_object = _Objects_Get_inactive( information ); - } - - if ( the_object != NULL ) { - Objects_Maximum objects_per_block; - Objects_Maximum block; - - objects_per_block = information->objects_per_block; - block = _Objects_Get_index( the_object->id ) - OBJECTS_INDEX_MINIMUM; - - if ( block > objects_per_block ) { - block /= objects_per_block; - - information->inactive_per_block[ block ]--; - information->inactive--; - } - } - } - - return the_object; -} Objects_Control *_Objects_Allocate( Objects_Information *information ) { |