summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShell <[email protected]>2024-05-21 08:56:35 +0800
committerGitHub <[email protected]>2024-05-21 08:56:35 +0800
commite82c53559b6e16acb5bdc9c9c9d51c8ddf84a86d (patch)
tree600671847e6af19422e22ec407e8cab46f138699
parent2f559906d6202c27142237ab4b1d893034a5b7c3 (diff)
[utest] add device find (#8959)
* [utest] add device find Signed-off-by: Shell <[email protected]> * fixup: add test * fixup: ptr aliasing * quality: meaning parameter --------- Signed-off-by: Shell <[email protected]>
-rw-r--r--.github/workflows/action_utest.yml1
-rw-r--r--examples/utest/configs/kernel/device.conf4
-rw-r--r--examples/utest/testcases/kernel/Kconfig4
-rw-r--r--examples/utest/testcases/kernel/SConscript3
-rw-r--r--examples/utest/testcases/kernel/device_tc.c59
-rw-r--r--src/object.c26
6 files changed, 87 insertions, 10 deletions
diff --git a/.github/workflows/action_utest.yml b/.github/workflows/action_utest.yml
index 99690a6e48..cb5d77cf6f 100644
--- a/.github/workflows/action_utest.yml
+++ b/.github/workflows/action_utest.yml
@@ -38,6 +38,7 @@ jobs:
- {UTEST: "kernel/irq", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/irq.conf", SD_FILE: "sd.bin", RUN: "yes"}
- {UTEST: "kernel/timer", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/timer.conf", SD_FILE: "sd.bin", RUN: "yes"}
- {UTEST: "kernel/thread", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/thread.conf", SD_FILE: "sd.bin", RUN: "yes"}
+ - {UTEST: "kernel/device", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/device.conf", SD_FILE: "sd.bin", RUN: "yes"}
- {UTEST: "kernel/atomic", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/atomic.conf", SD_FILE: "sd.bin", RUN: "yes"}
- {UTEST: "kernel/atomic_c11", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/atomic_c11.conf", SD_FILE: "sd.bin", RUN: "yes"}
- {UTEST: "components/utest", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "utest_self/self.conf", SD_FILE: "sd.bin", RUN: "yes"}
diff --git a/examples/utest/configs/kernel/device.conf b/examples/utest/configs/kernel/device.conf
new file mode 100644
index 0000000000..1b0bf5a59f
--- /dev/null
+++ b/examples/utest/configs/kernel/device.conf
@@ -0,0 +1,4 @@
+CONFIG_UTEST_DEVICE_TC=y
+# dependencies
+CONFIG_RT_USING_TIMER_SOFT=y
+CONFIG_RT_USING_THREAD=y
diff --git a/examples/utest/testcases/kernel/Kconfig b/examples/utest/testcases/kernel/Kconfig
index 072e1876a3..cc03ca0a4d 100644
--- a/examples/utest/testcases/kernel/Kconfig
+++ b/examples/utest/testcases/kernel/Kconfig
@@ -56,6 +56,10 @@ config UTEST_THREAD_TC
select RT_USING_TIMER_SOFT
select RT_USING_THREAD
+config UTEST_DEVICE_TC
+ bool "device test"
+ default n
+
config UTEST_ATOMIC_TC
bool "atomic test"
default n
diff --git a/examples/utest/testcases/kernel/SConscript b/examples/utest/testcases/kernel/SConscript
index 67ad659d1c..1ec8beedd2 100644
--- a/examples/utest/testcases/kernel/SConscript
+++ b/examples/utest/testcases/kernel/SConscript
@@ -41,6 +41,9 @@ if GetDepend(['UTEST_MAILBOX_TC']):
if GetDepend(['UTEST_THREAD_TC']):
src += ['thread_tc.c']
+if GetDepend(['UTEST_DEVICE_TC']):
+ src += ['device_tc.c']
+
if GetDepend(['UTEST_ATOMIC_TC']):
src += ['atomic_tc.c']
diff --git a/examples/utest/testcases/kernel/device_tc.c b/examples/utest/testcases/kernel/device_tc.c
new file mode 100644
index 0000000000..6b5a8dfd86
--- /dev/null
+++ b/examples/utest/testcases/kernel/device_tc.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2006-2024, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date Author Notes
+ * 2024-05-20 Shell the first version
+ */
+#include <rtthread.h>
+#include <stdlib.h>
+#include "utest.h"
+
+static void test_rt_device_find(void)
+{
+ char _device_name[RT_NAME_MAX + 1] = {0};
+ rt_device_t console;
+ rt_device_t device1, device2, device3;
+
+ console = rt_console_get_device();
+ uassert_not_null(console);
+ rt_memcpy(_device_name, console->parent.name, RT_NAME_MAX);
+
+ /* Test finding a device */
+ device1 = rt_device_find(_device_name);
+ uassert_true(device1 == console);
+
+ /* Test finding another device */
+ device2 = rt_device_find(RT_CONSOLE_DEVICE_NAME);
+ if (rt_strcmp(RT_CONSOLE_DEVICE_NAME, _device_name) == 0)
+ {
+ uassert_true(device2 == device1);
+ }
+ else
+ {
+ uassert_not_null(device2);
+ uassert_true(device2 != device1);
+ }
+
+ /* Test finding a device 3 */
+ device3 = rt_device_find(console->parent.name);
+ uassert_true(device1 == device3);
+}
+
+static rt_err_t utest_tc_init(void)
+{
+ return RT_EOK;
+}
+
+static rt_err_t utest_tc_cleanup(void)
+{
+ return RT_EOK;
+}
+
+static void testcase(void)
+{
+ UTEST_UNIT_RUN(test_rt_device_find);
+}
+UTEST_TC_EXPORT(testcase, "testcases.kernel.device.find", utest_tc_init, utest_tc_cleanup, 5);
diff --git a/src/object.c b/src/object.c
index ae62be1fa3..5c110f7b70 100644
--- a/src/object.c
+++ b/src/object.c
@@ -625,12 +625,19 @@ rt_err_t rt_object_for_each(rt_uint8_t type, rt_object_iter_t iter, void *data)
return RT_EOK;
}
+struct _obj_find_param
+{
+ const char *match_name;
+ rt_object_t matched_obj;
+};
+
static rt_err_t _match_name(struct rt_object *obj, void *data)
{
- const char *name = *(const char **)data;
+ struct _obj_find_param *param = data;
+ const char *name = param->match_name;
if (rt_strncmp(obj->name, name, RT_NAME_MAX) == 0)
{
- *(rt_object_t *)data = obj;
+ param->matched_obj = obj;
/* notify an early break of loop, but not on error */
return 1;
@@ -654,7 +661,11 @@ static rt_err_t _match_name(struct rt_object *obj, void *data)
*/
rt_object_t rt_object_find(const char *name, rt_uint8_t type)
{
- void *data = (void *)name;
+ struct _obj_find_param param =
+ {
+ .match_name = name,
+ .matched_obj = RT_NULL,
+ };
/* parameter check */
if (name == RT_NULL) return RT_NULL;
@@ -662,13 +673,8 @@ rt_object_t rt_object_find(const char *name, rt_uint8_t type)
/* which is invoke in interrupt status */
RT_DEBUG_NOT_IN_INTERRUPT;
- rt_object_for_each(type, _match_name, &data);
- if (data != name)
- {
- return data;
- }
-
- return RT_NULL;
+ rt_object_for_each(type, _match_name, &param);
+ return param.matched_obj;
}
/**