summaryrefslogtreecommitdiffstats
path: root/testsuites/libtests/malloc04/init.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--testsuites/libtests/malloc04/init.c62
1 files changed, 44 insertions, 18 deletions
diff --git a/testsuites/libtests/malloc04/init.c b/testsuites/libtests/malloc04/init.c
index 51d318850b..a9894d59fd 100644
--- a/testsuites/libtests/malloc04/init.c
+++ b/testsuites/libtests/malloc04/init.c
@@ -1,10 +1,29 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
/*
* COPYRIGHT (c) 1989-2011.
* On-Line Applications Research Corporation (OAR).
*
- * 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.
+ * 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
@@ -78,16 +97,23 @@ rtems_task Init(
)
{
Heap_Control *real_heap;
- Memory_Area area;
- Memory_Information mem = {
- .count = 1,
- .areas = &area
- };
+ const Memory_Information *mem;
+ Memory_Area *area;
+ size_t i;
void *p;
TEST_BEGIN();
+ mem = _Memory_Get();
+
+ for ( i = 0; i < _Memory_Get_count( mem ); ++i ) {
+ area = _Memory_Get_area( mem, i );
+ _Memory_Initialize( area, NULL, NULL );
+ }
+
+ area = _Memory_Get_area( mem, 0 );
+
/* Safe information on real heap */
real_heap = malloc_get_heap_pointer();
malloc_set_heap_pointer( &TempHeap );
@@ -98,8 +124,8 @@ rtems_task Init(
sbrk_count = 0;
offset = 256;
- _Memory_Initialize_by_size( &area, &Malloc_Heap[ 0 ], offset );
- RTEMS_Malloc_Initialize( &mem, NULL );
+ _Memory_Initialize_by_size( area, &Malloc_Heap[ 0 ], offset );
+ _Malloc_Initialize();
errno = 0;
p = malloc( 256 );
@@ -113,8 +139,8 @@ rtems_task Init(
sbrk_count = 0;
offset = 256;
- _Memory_Initialize_by_size( &area, &Malloc_Heap[ 0 ], offset );
- RTEMS_Malloc_Initialize( &mem, NULL );
+ _Memory_Initialize_by_size( area, &Malloc_Heap[ 0 ], offset );
+ _Malloc_Initialize();
p = malloc(1);
rtems_test_assert( p != NULL );
@@ -128,8 +154,8 @@ rtems_task Init(
sbrk_count = 0;
offset = 256;
- _Memory_Initialize_by_size( &area, &Malloc_Heap[ 0 ], offset );
- RTEMS_Malloc_Initialize( &mem, NULL );
+ _Memory_Initialize_by_size( area, &Malloc_Heap[ 0 ], offset );
+ _Malloc_Initialize();
errno = 0;
p = malloc( sizeof( Malloc_Heap ) );
@@ -141,8 +167,8 @@ rtems_task Init(
sbrk_count = 0;
offset = 256;
- _Memory_Initialize_by_size( &area, &Malloc_Heap[ 0 ], offset );
- RTEMS_Malloc_Initialize( &mem, NULL );
+ _Memory_Initialize_by_size( area, &Malloc_Heap[ 0 ], offset );
+ _Malloc_Initialize();
p = malloc( 128 );
rtems_test_assert( p != NULL );
@@ -156,8 +182,8 @@ rtems_task Init(
sbrk_count = -1;
offset = 256;
- _Memory_Initialize_by_size( &area, &Malloc_Heap[ 0 ], offset );
- RTEMS_Malloc_Initialize( &mem, NULL );
+ _Memory_Initialize_by_size( area, &Malloc_Heap[ 0 ], offset );
+ _Malloc_Initialize();
errno = 0;
p = malloc( 256 );