diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-04-20 08:41:00 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-04-20 19:18:23 +0200 |
commit | d8a5e140ec44a5e45cf82d3759a339e9dedced56 (patch) | |
tree | b159ba580e893b698c029dcd586aa358734bbdc8 | |
parent | Remove superfluous <rtems/score/wkspace.h> includes (diff) | |
download | rtems-d8a5e140ec44a5e45cf82d3759a339e9dedced56.tar.bz2 |
libcsupport: Move rtems_calloc()
Move rtems_calloc() since it only depends on rtems_malloc(). This may
make it easier to customize the heap allocator.
Change licence to BSD-2-Clause according to file history.
Update #3053.
-rw-r--r-- | cpukit/Makefile.am | 1 | ||||
-rw-r--r-- | cpukit/libcsupport/src/malloc_deferred.c | 15 | ||||
-rw-r--r-- | cpukit/libcsupport/src/rtemscalloc.c | 57 | ||||
-rw-r--r-- | spec/build/cpukit/librtemscpu.yml | 1 |
4 files changed, 59 insertions, 15 deletions
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index d6b636bf2a..a8cce3c287 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -213,6 +213,7 @@ librtemscpu_a_SOURCES += libcsupport/src/realpath.c librtemscpu_a_SOURCES += libcsupport/src/_rename_r.c librtemscpu_a_SOURCES += libcsupport/src/resource_snapshot.c librtemscpu_a_SOURCES += libcsupport/src/rmdir.c +librtemscpu_a_SOURCES += libcsupport/src/rtemscalloc.c librtemscpu_a_SOURCES += libcsupport/src/rtems_heap_extend.c librtemscpu_a_SOURCES += libcsupport/src/rtems_heap_extend_via_sbrk.c librtemscpu_a_SOURCES += libcsupport/src/rtems_heap_greedy.c diff --git a/cpukit/libcsupport/src/malloc_deferred.c b/cpukit/libcsupport/src/malloc_deferred.c index f66dd54676..b319d1213e 100644 --- a/cpukit/libcsupport/src/malloc_deferred.c +++ b/cpukit/libcsupport/src/malloc_deferred.c @@ -112,19 +112,4 @@ void *rtems_malloc( size_t size ) return rtems_heap_allocate_aligned_with_boundary( size, 0, 0 ); } - -void *rtems_calloc( size_t nelem, size_t elsize ) -{ - size_t length; - void *p; - - length = nelem * elsize; - p = rtems_malloc( length ); - RTEMS_OBFUSCATE_VARIABLE( p ); - if ( RTEMS_PREDICT_FALSE( p == NULL ) ) { - return p; - } - - return memset( p, 0, length ); -} #endif diff --git a/cpukit/libcsupport/src/rtemscalloc.c b/cpukit/libcsupport/src/rtemscalloc.c new file mode 100644 index 0000000000..4e189e8367 --- /dev/null +++ b/cpukit/libcsupport/src/rtemscalloc.c @@ -0,0 +1,57 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file + * + * @ingroup libcsupport + * + * @brief This source file contains the implementation of rtems_calloc(). + */ + +/* + * Copyright (C) 2018 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 <string.h> + +void *rtems_calloc( size_t nelem, size_t elsize ) +{ + size_t length; + void *p; + + length = nelem * elsize; + p = rtems_malloc( length ); + RTEMS_OBFUSCATE_VARIABLE( p ); + if ( RTEMS_PREDICT_FALSE( p == NULL ) ) { + return p; + } + + return memset( p, 0, length ); +} diff --git a/spec/build/cpukit/librtemscpu.yml b/spec/build/cpukit/librtemscpu.yml index 6de764cd04..a3a9ee42e3 100644 --- a/spec/build/cpukit/librtemscpu.yml +++ b/spec/build/cpukit/librtemscpu.yml @@ -708,6 +708,7 @@ source: - cpukit/libcsupport/src/realpath.c - cpukit/libcsupport/src/resource_snapshot.c - cpukit/libcsupport/src/rmdir.c +- cpukit/libcsupport/src/rtemscalloc.c - cpukit/libcsupport/src/rtems_heap_extend.c - cpukit/libcsupport/src/rtems_heap_extend_via_sbrk.c - cpukit/libcsupport/src/rtems_heap_greedy.c |