diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2020-09-30 11:31:58 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2020-10-01 19:05:33 +0200 |
commit | f2185d109930fb5db31a5c228a3f46178072f270 (patch) | |
tree | 166d29b19bcf7ff01b4368f351e3fab52b750c19 /cpukit/libcsupport | |
parent | 71689a0775f39d65b3c9f0a81b58394d0b04e534 (diff) |
Decouple the C Program Heap initialization
Before this patch RTEMS_Malloc_Initialize() had a fixed dependency on
_Workspace_Area. Introduce _Workspace_Malloc_initializer to have this
dependency only if CONFIGURE_UNIFIED_WORK_AREAS is defined by the
application configuration.
Diffstat (limited to 'cpukit/libcsupport')
-rw-r--r-- | cpukit/libcsupport/src/malloc_initialize.c | 78 | ||||
-rw-r--r-- | cpukit/libcsupport/src/mallocheap.c | 56 |
2 files changed, 90 insertions, 44 deletions
diff --git a/cpukit/libcsupport/src/malloc_initialize.c b/cpukit/libcsupport/src/malloc_initialize.c index 0203e22411..fb0999df01 100644 --- a/cpukit/libcsupport/src/malloc_initialize.c +++ b/cpukit/libcsupport/src/malloc_initialize.c @@ -19,73 +19,63 @@ #include <rtems/malloc.h> #include <rtems/score/wkspace.h> -#include <rtems/sysinit.h> #include "malloc_p.h" -Heap_Control *RTEMS_Malloc_Heap; - -static void _Malloc_Initialize( void ) -{ - RTEMS_Malloc_Initialize( _Memory_Get(), _Heap_Extend ); -} - -RTEMS_SYSINIT_ITEM( - _Malloc_Initialize, - RTEMS_SYSINIT_MALLOC, - RTEMS_SYSINIT_ORDER_MIDDLE -); - #ifdef RTEMS_NEWLIB static Heap_Control _Malloc_Heap; -void RTEMS_Malloc_Initialize( +Heap_Control *RTEMS_Malloc_Initialize( const Memory_Information *mem, Heap_Initialization_or_extend_handler extend ) { - if ( rtems_configuration_get_unified_work_area() ) { - RTEMS_Malloc_Heap = &_Workspace_Area; - } else { - Heap_Control *heap; - Heap_Initialization_or_extend_handler init_or_extend; - uintptr_t page_size; - size_t i; + Heap_Control *heap; + Heap_Initialization_or_extend_handler init_or_extend; + uintptr_t page_size; + size_t i; - heap = &_Malloc_Heap; - RTEMS_Malloc_Heap = heap; - init_or_extend = _Heap_Initialize; - page_size = CPU_HEAP_ALIGNMENT; + heap = &_Malloc_Heap; + RTEMS_Malloc_Heap = heap; + init_or_extend = _Heap_Initialize; + page_size = CPU_HEAP_ALIGNMENT; - for (i = 0; i < _Memory_Get_count( mem ); ++i) { - Memory_Area *area; - uintptr_t space_available; + for (i = 0; i < _Memory_Get_count( mem ); ++i) { + Memory_Area *area; + uintptr_t space_available; - area = _Memory_Get_area( mem, i ); - space_available = ( *init_or_extend )( - heap, - _Memory_Get_free_begin( area ), - _Memory_Get_free_size( area ), - page_size - ); + area = _Memory_Get_area( mem, i ); + space_available = ( *init_or_extend )( + heap, + _Memory_Get_free_begin( area ), + _Memory_Get_free_size( area ), + page_size + ); - if ( space_available > 0 ) { - _Memory_Consume( area, _Memory_Get_free_size( area ) ); - init_or_extend = extend; - } + if ( space_available > 0 ) { + _Memory_Consume( area, _Memory_Get_free_size( area ) ); + init_or_extend = extend; } + } - if ( init_or_extend == _Heap_Initialize ) { - _Internal_error( INTERNAL_ERROR_NO_MEMORY_FOR_HEAP ); - } + if ( init_or_extend == _Heap_Initialize ) { + _Internal_error( INTERNAL_ERROR_NO_MEMORY_FOR_HEAP ); } + + return heap; } #else -void RTEMS_Malloc_Initialize( +Heap_Control *RTEMS_Malloc_Initialize( const Memory_Information *mem, Heap_Initialization_or_extend_handler extend ) { /* FIXME: Dummy function */ + return NULL; } #endif + +Heap_Control *_Workspace_Malloc_initialize_separate( void ) +{ + return RTEMS_Malloc_Initialize( _Memory_Get(), _Heap_Extend ); +} diff --git a/cpukit/libcsupport/src/mallocheap.c b/cpukit/libcsupport/src/mallocheap.c new file mode 100644 index 0000000000..006362f209 --- /dev/null +++ b/cpukit/libcsupport/src/mallocheap.c @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file + * + * @ingroup MallocSupport + * + * @brief This source file provides the C Program Heap control along with the + * system initialization handler. + */ + +/* + * Copyright (C) 2020 embedded brains GmbH (http://www.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. + * + * 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/malloc.h> +#include <rtems/sysinit.h> +#include <rtems/score/wkspacedata.h> + +Heap_Control *RTEMS_Malloc_Heap; + +static void _Malloc_Initialize( void ) +{ + RTEMS_Malloc_Heap = ( *_Workspace_Malloc_initializer )(); +} + +RTEMS_SYSINIT_ITEM( + _Malloc_Initialize, + RTEMS_SYSINIT_MALLOC, + RTEMS_SYSINIT_ORDER_MIDDLE +); |