[PATCH 3/8] libtest: Add primitive test case memory allocator

Sebastian Huber sebastian.huber at embedded-brains.de
Fri Nov 13 10:07:52 UTC 2020


This primitive test case memory allocator uses memory from the low-level
memory information provided by the BSP.  At the beginning of each test
case, the memory available to the test case is reinitialized.  This
allows the use of a simple allocate only allocator.
---
 cpukit/include/rtems/test.h          |  6 ++
 cpukit/libtest/t-test-rtems-memory.c | 86 ++++++++++++++++++++++++++++
 spec/build/cpukit/librtemstest.yml   |  1 +
 3 files changed, 93 insertions(+)
 create mode 100644 cpukit/libtest/t-test-rtems-memory.c

diff --git a/cpukit/include/rtems/test.h b/cpukit/include/rtems/test.h
index 7d8b131286..ae81aac4d0 100644
--- a/cpukit/include/rtems/test.h
+++ b/cpukit/include/rtems/test.h
@@ -2463,6 +2463,12 @@ void T_report_hash_sha256(T_event, const char *);
 void T_check_heap(T_event, const char *);
 
 #ifdef __rtems__
+void T_memory_action(T_event, const char *);
+
+void *T_memory_allocate(size_t);
+
+void T_memory_deallocate(void *);
+
 void T_check_task_context(T_event, const char *);
 
 void T_check_file_descriptors(T_event, const char *);
diff --git a/cpukit/libtest/t-test-rtems-memory.c b/cpukit/libtest/t-test-rtems-memory.c
new file mode 100644
index 0000000000..92d21a7ccd
--- /dev/null
+++ b/cpukit/libtest/t-test-rtems-memory.c
@@ -0,0 +1,86 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
+/*
+ * Copyright (C) 2020 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.
+ *
+ * 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.
+ */
+
+#include <rtems/test.h>
+
+#include <rtems/score/memory.h>
+#include <rtems/sysinit.h>
+
+static Memory_Area T_memory_areas[1];
+
+static Memory_Information T_memory_information =
+    MEMORY_INFORMATION_INITIALIZER(T_memory_areas);
+
+static void
+T_memory_initialize(void)
+{
+	const Memory_Information *mem;
+	Memory_Area *area;
+	void *begin;
+	uintptr_t size;
+
+	mem = _Memory_Get();
+	area = _Memory_Get_area(mem, 0);
+	begin = _Memory_Get_free_begin(area);
+	size = _Memory_Get_free_size(area) / 2;
+	_Memory_Consume(area, size);
+	_Memory_Initialize_by_size(&T_memory_areas[0], begin, size);
+}
+
+RTEMS_SYSINIT_ITEM(T_memory_initialize, RTEMS_SYSINIT_WORKSPACE,
+    RTEMS_SYSINIT_ORDER_FIRST);
+
+void *
+T_memory_allocate(size_t size)
+{
+	return _Memory_Allocate(&T_memory_information, size,
+	    CPU_HEAP_ALIGNMENT);
+}
+
+void
+T_memory_deallocate(void *ptr)
+{
+	(void)ptr;
+}
+
+void
+T_memory_action(T_event event, const char *name)
+{
+	Memory_Area *area;
+
+	(void)name;
+
+	switch (event) {
+	case T_EVENT_CASE_BEGIN:
+		area = &T_memory_areas[0];
+		_Memory_Set_free_begin(area,
+		    RTEMS_DECONST(void *, _Memory_Get_begin(area)));
+		break;
+	default:
+		break;
+	};
+}
diff --git a/spec/build/cpukit/librtemstest.yml b/spec/build/cpukit/librtemstest.yml
index ee116fba49..ae5ffeeb9b 100644
--- a/spec/build/cpukit/librtemstest.yml
+++ b/spec/build/cpukit/librtemstest.yml
@@ -30,6 +30,7 @@ source:
 - cpukit/libtest/t-test-rtems-fds.c
 - cpukit/libtest/t-test-rtems-heap.c
 - cpukit/libtest/t-test-rtems-measure.c
+- cpukit/libtest/t-test-rtems-memory.c
 - cpukit/libtest/t-test-rtems-posix-keys.c
 - cpukit/libtest/t-test-rtems-objs.c
 - cpukit/libtest/t-test-time.c
-- 
2.26.2



More information about the devel mailing list