RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

score/src/pheap*: Remove unreferenced methods

Browse Source 
* _Protected_heap_Get_block_size
  * _Protected_heap_Iterate
  * _Protected_heap_Resize_block

Closes #4909.
This commit is contained in:
Joel Sherrill
2023-05-22 08:58:27 -05:00
parent bdb4bc436f
commit 63415655e3
5 changed files with 0 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
cpukit/include/rtems/score/protectedheap.h
View File

@@ -162,59 +162,6 @@ static inline void *_Protected_heap_Allocate(
return _Protected_heap_Allocate_aligned_with_boundary( heap, size, 0, 0 );
}
/**
* @brief Returns the size of the allocatable memory area.
*
* The size value may be greater than the initially requested size in
* _Heap_Allocate_aligned_with_boundary().
*
* Inappropriate values for @a addr will not corrupt the heap, but may yield
* invalid size values.
*
* This method first locks the allocator and after the operation, unlocks it again.
*
* @param heap The heap to operate upon.
* @param addr The starting address of the allocatable memory area.
* @param[out] size Stores the size of the allocatable memory area after the method call.
*
* @retval true The operation was successful.
* @retval false The operation was not successful.
*/
bool _Protected_heap_Get_block_size(
Heap_Control *heap,
void *addr,
uintptr_t *size
);
/**
* @brief Resizes the block of the allocated memory area.
*
* Inappropriate values for @a addr may corrupt the heap.
*
* This method first locks the allocator and after the resize, unlocks it again.
*
* @param[in, out] heap The heap to operate upon.
* @param addr The starting address of the allocated memory area to be resized.
* @param size The least possible size for the new memory area. Resize may be
* impossible and depends on the current heap usage.
* @param[out] old_size Stores the size available for allocation in the current
* block before the resize after the method call.
* @param[out] new_size Stores the size available for allocation in the resized
* block after the method call. In the case of an unsuccessful resize,
* zero is returned in this parameter
*
* @retval HEAP_RESIZE_SUCCESSFUL The resize was successful.
* @retval HEAP_RESIZE_UNSATISFIED The least possible size @a size was too big.
* Resize not possible.
* @retval HEAP_RESIZE_FATAL_ERROR The block starting at @a addr is not part of
* the heap.
*/
bool _Protected_heap_Resize_block(
Heap_Control *heap,
void *addr,
uintptr_t size
);
/**
* @brief Frees the allocated memory area.
*
@@ -244,22 +191,6 @@ bool _Protected_heap_Free( Heap_Control *heap, void *addr );
*/
bool _Protected_heap_Walk( Heap_Control *heap, int source, bool dump );
/**
* @brief Iterates over all blocks of the heap.
*
* This method first locks the allocator and after the operation, unlocks it again.
*
* @param[in, out] heap The heap to iterate over.
* @param visitor This will be called for each heap block with
* the argument @a visitor_arg.
* @param[in, out] visitor_arg The argument for all calls of @a visitor.
*/
void _Protected_heap_Iterate(
Heap_Control *heap,
Heap_Block_visitor visitor,
void *visitor_arg
);
/**
* @brief Returns information about used and free blocks for the heap.
*

56
cpukit/score/src/pheapgetblocksize.c
View File

@@ -1,56 +0,0 @@
/* SPDX-License-Identifier: BSD-2-Clause */
/**
* @file
*
* @ingroup RTEMSScoreProtHeap
*
* @brief This source file contains the implementation of
* _Protected_heap_Get_block_size().
*/
/*
* COPYRIGHT (c) 1989-2007.
* On-Line Applications Research Corporation (OAR).
*
* 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/score/protectedheap.h>
bool _Protected_heap_Get_block_size(
Heap_Control *the_heap,
void *starting_address,
uintptr_t *size
)
{
bool status;
_RTEMS_Lock_allocator();
status = _Heap_Size_of_alloc_area( the_heap, starting_address, size );
_RTEMS_Unlock_allocator();
return status;
}

52
cpukit/score/src/pheapiterate.c
View File

@@ -1,52 +0,0 @@
/* SPDX-License-Identifier: BSD-2-Clause */
/**
* @file
*
* @ingroup RTEMSScoreProtHeap
*
* @brief This source file contains the implementation of
* _Protected_heap_Iterate().
*/
/*
* Copyright (c) 2011 embedded brains GmbH & Co. KG
*
* 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/score/protectedheap.h>
void _Protected_heap_Iterate(
Heap_Control *heap,
Heap_Block_visitor visitor,
void *visitor_arg
)
{
_RTEMS_Lock_allocator();
_Heap_Iterate( heap, visitor, visitor_arg );
_RTEMS_Unlock_allocator();
}

60
cpukit/score/src/pheapresizeblock.c
View File

@@ -1,60 +0,0 @@
/* SPDX-License-Identifier: BSD-2-Clause */
/**
* @file
*
* @ingroup RTEMSScoreProtHeap
*
* @brief This source file contains the implementation of
* _Protected_heap_Resize_block().
*/
/*
* COPYRIGHT (c) 1989-2007.
* On-Line Applications Research Corporation (OAR).
*
* 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/score/protectedheap.h>
bool _Protected_heap_Resize_block(
Heap_Control *the_heap,
void *starting_address,
uintptr_t size
)
{
Heap_Resize_status status;
uintptr_t old_mem_size;
uintptr_t avail_mem_size;
_RTEMS_Lock_allocator();
status = _Heap_Resize_block(
the_heap, starting_address, size, &old_mem_size, &avail_mem_size );
_RTEMS_Unlock_allocator();
return (status == HEAP_RESIZE_SUCCESSFUL);
}

3
spec/build/cpukit/librtemscpu.yml
View File

@@ -1482,12 +1482,9 @@ source:
- cpukit/score/src/pheapallocate.c
- cpukit/score/src/pheapextend.c
- cpukit/score/src/pheapfree.c
- cpukit/score/src/pheapgetblocksize.c
- cpukit/score/src/pheapgetfreeinfo.c
- cpukit/score/src/pheapgetinfo.c
- cpukit/score/src/pheapgetsize.c
- cpukit/score/src/pheapiterate.c
- cpukit/score/src/pheapresizeblock.c
- cpukit/score/src/pheapwalk.c
- cpukit/score/src/processormaskcopy.c
- cpukit/score/src/profilingisrentryexit.c