diff --git a/BUILD.gn b/BUILD.gn index e8d9b447..9cd2131e 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -290,6 +290,7 @@ group("modules") { "security", "shell", "syscall", + "testsuites/kernel:kernel_test", ] deps += [ @@ -318,10 +319,12 @@ group("liteos_a") { deps = [ ":apps", ":kernel", - ":make", ":tests", "//prebuilts/lite/sysroot/build:strip", ] + if (liteos_skip_make == false) { + deps += [ ":make" ] + } } executable("liteos") { diff --git a/kernel/Kconfig b/kernel/Kconfig index d1c1195b..dd81007d 100644 --- a/kernel/Kconfig +++ b/kernel/Kconfig @@ -67,6 +67,12 @@ config PAGE_TABLE_FINE_LOCK help This option will enable fine lock for page table. +config ENABLE_KERNEL_TEST + bool "Enable kernel test" + default n + help + This option will enable kernel test. + ######################### config options of extended ##################### source "kernel/extended/Kconfig" diff --git a/kernel/base/core/los_task.c b/kernel/base/core/los_task.c index 47566f14..9a047e2b 100644 --- a/kernel/base/core/los_task.c +++ b/kernel/base/core/los_task.c @@ -900,6 +900,9 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_TaskDelete(UINT32 taskID) LOS_ERREND: SCHEDULER_UNLOCK(intSave); + if (ret == LOS_OK) { + LOS_Schedule(); + } return ret; } diff --git a/kernel/common/los_config.c b/kernel/common/los_config.c index b575e618..b022bab8 100644 --- a/kernel/common/los_config.c +++ b/kernel/common/los_config.c @@ -52,9 +52,6 @@ #include "los_tick.h" #include "los_vm_boot.h" #include "los_smp.h" -#ifdef LOSCFG_ENABLE_KERNEL_TEST -#include "los_test_pri.h" -#endif STATIC SystemRebootFunc g_rebootHook = NULL; @@ -289,17 +286,14 @@ STATIC VOID SystemInit(VOID) extern VOID SystemInit(VOID); #endif +#ifndef LOSCFG_ENABLE_KERNEL_TEST STATIC UINT32 OsSystemInitTaskCreate(VOID) { UINT32 taskID; TSK_INIT_PARAM_S sysTask; (VOID)memset_s(&sysTask, sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); -#ifndef LOSCFG_ENABLE_KERNEL_TEST sysTask.pfnTaskEntry = (TSK_ENTRY_FUNC)SystemInit; -#else - sysTask.pfnTaskEntry = (TSK_ENTRY_FUNC)TestSystemInit; -#endif sysTask.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; sysTask.pcName = "SystemInit"; sysTask.usTaskPrio = LOSCFG_BASE_CORE_TSK_DEFAULT_PRIO; @@ -323,3 +317,4 @@ STATIC UINT32 OsSystemInit(VOID) } LOS_MODULE_INIT(OsSystemInit, LOS_INIT_LEVEL_KMOD_TASK); +#endif diff --git a/testsuites/BUILD.gn b/testsuites/BUILD.gn index 17bddbfe..c09cb41c 100644 --- a/testsuites/BUILD.gn +++ b/testsuites/BUILD.gn @@ -29,9 +29,13 @@ import("//kernel/liteos_a/liteos.gni") -group("testsuites") { - deps = [ - #"kernel", - "unittest", - ] +declare_args() { + liteos_kernel_unittest = true +} + +group("testsuites") { + deps = [] + if (liteos_kernel_unittest) { + deps += [ "unittest" ] + } } diff --git a/testsuites/kernel/BUILD.gn b/testsuites/kernel/BUILD.gn index ee97651b..77430a90 100644 --- a/testsuites/kernel/BUILD.gn +++ b/testsuites/kernel/BUILD.gn @@ -27,122 +27,73 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/component/lite_component.gni") +import("//kernel/liteos_a/liteos.gni") -static_library("test_base") { - sources = [ - "src/ChipTest.c", - "src/iCunit.c", - "src/osTest.c", - "src/testrun_shellcmd.c", - "src/testusb_shellcmd.c", - ] +declare_args() { + LOSCFG_ENABLE_KERNEL_TEST = false + LOSCFG_TEST_KERNEL_BASE = true + LOSCFG_TEST_KERNEL_EXTEND_CPUP = false + LOSCFG_TEST_POSIX = false +} +config("liteos_kernel_test_public") { + cflags = [ "-Wno-error" ] include_dirs = [ - "../kernel/base/includ", - "../kernel/include", - "../kernel/extended/include", - "include", - "../fs/vfs", - "../fs/proc/include", - "../fs/jffs2/include", - "../fs/nfs/include", - "../bsd/compat/linuxkpi/include", + "//kernel/liteos_a/kernel/include", + "//kernel/liteos_a/kernel/base/include", + "//kernel/liteos_a/kernel/common", + "//kernel/liteos_a/arch/arm/arm/include", + "//kernel/liteos_a/arch/arm/include", + "//kernel/liteos_a/extended/include", + "//third_party/musl/porting/liteos_a/kernel/include", + "//third_party/bounds_checking_function/include/", + "//kernel/liteos_a/lib/libscrew/include", + "//kernel/liteos_a/fs/vfs", + "//kernel/liteos_a/fs/proc/include", + "//kernel/liteos_a/fs/jffs2/include", + "//kernel/liteos_a/fs/nfs/include", + "//kernel/liteos_a/bsd/compat/linuxkpi/include", + "//kernel/liteos_a/testsuites/kernel/include", ] - public_configs = [ ":public" ] -} - -config("public") { - include_dirs = [ "include" ] -} - -lite_component("test") { - features = [ ":test_base" ] - - # KERNEL BASE TEST - if (LOSCFG_TEST_KERNEL_BASE_IPC) { - features += [ "sample/kernel_base/ipc:test_ipc" ] - } - if (LOSCFG_TEST_KERNEL_BASE_CORE) { - features += [ "sample/kernel_base/core:test_core" ] - } - if (LOSCFG_TEST_KERNEL_BASE_MP) { - features += [ "sample/kernel_base/mp:test_mp" ] - } - if (LOSCFG_TEST_KERNEL_BASE_MEM) { - features += [ "sample/kernel_base/mem:test_mem" ] - } - if (LOSCFG_TEST_KERNEL_BASE_MISC) { - features += [ "sample/kernel_base/misc:test_misc" ] - } - if (LOSCFG_TEST_KERNEL_BASE_OM) { - features += [ "sample/kernel_base/om:test_om" ] - } - if (LOSCFG_TEST_KERNEL_BASE_ATOMIC) { - features += [ "sample/kernel_base/atomic:test_atomic" ] - } - - # KERNEL EXTEND TEST - if (LOSCFG_TEST_KERNEL_EXTEND_CPP) { - features += [ "sample/kernel_extend/cpp:test_cpp" ] + if (LOSCFG_TEST_KERNEL_BASE) { + cflags += [ "-DLOSCFG_TEST_KERNEL_BASE=1" ] } if (LOSCFG_TEST_KERNEL_EXTEND_CPUP) { - features += [ "sample/kernel_extend/cpup:test_cpup" ] + cflags += [ "-DLOSCFG_TEST_KERNEL_EXTEND_CPUP=1" ] } - if (LOSCFG_TEST_KERNEL_EXTEND_MMU) { - features += [ "sample/kernel_extend/mmu:test_mmu" ] - } - - # COMPAT TEST if (LOSCFG_TEST_POSIX) { - features += [ - "sample/posix:test_posix", - # "sample/posix/smp:test_posix_smp", - ] - } - - # if (LOSCFG_TEST_POSIX_MEM) { - # features += [ "sample/posix/mem:test_posix_mem" ] - # } - # if (LOSCFG_TEST_POSIX_MQUEUE) { - # features += [ "sample/posix/mqueue:test_posix_mqueue" ] - # } - # if (LOSCFG_TEST_POSIX_MUTEX) { - # features += [ "sample/posix/mutex:test_posix_mutex" ] - # } - # if (LOSCFG_TEST_POSIX_PTHREAD) { - # features += [ "sample/posix/pthread:test_posix_pthread" ] - # } - # if (LOSCFG_TEST_POSIX_SCHED) { - # features += [ "sample/posix/sched:test_posix_sched" ] - # } - # if (LOSCFG_TEST_POSIX_SEM) { - # features += [ "sample/posix/sem:test_posix_sem" ] - # } - # if (LOSCFG_TEST_POSIX_SWTMR) { - # features += [ "sample/posix/swtmr:test_posix_swtmr" ] - # } - if (LOSCFG_TEST_LINUX) { - features += [ "sample/linux:test_linux" ] - } - - #if (LOSCFG_TEST_LINUX_HRTIMER) { - # features += [ "sample/linux/hrtimer:test_linux_hrtimer" ] - #} - - # LIBC TEST - if (LOSCFG_TEST_LIBC) { - features += [ "sample/libc:test_libc" ] - } - - # LIBM TEST - if (LOSCFG_TEST_LIBM) { - features += [ "sample/libm:test_libm" ] - } - - # SHELL TEST - if (LOSCFG_TEST_SHELL) { - features += [ "sample/shell:test_shell" ] + cflags += [ "-DLOSCFG_TEST_POSIX=1" ] } } + +group("kernel_test") { + deps = [] + + if (LOSCFG_ENABLE_KERNEL_TEST) { + deps += [ ":test_base" ] + + if (LOSCFG_TEST_KERNEL_BASE) { + deps += [ "sample/kernel_base:kernel_base" ] + } + + # KERNEL EXTEND TEST + if (LOSCFG_TEST_KERNEL_EXTEND_CPUP) { + deps += [ "sample/kernel_extend/cpup:test_cpup" ] + } + + # COMPAT TEST + if (LOSCFG_TEST_POSIX) { + deps += [ "sample/posix:test_posix" ] + } + } +} + +kernel_module("test_base") { + sources = [ + "src/iCunit.c", + "src/osTest.c", + ] + + public_configs = [ ":liteos_kernel_test_public" ] +} diff --git a/testsuites/kernel/Makefile b/testsuites/kernel/Makefile index c3e417a5..6112372c 100644 --- a/testsuites/kernel/Makefile +++ b/testsuites/kernel/Makefile @@ -35,12 +35,7 @@ MODULE_NAME := ktest LOCAL_INCLUDE := -I $(LITEOSTESTTOPDIR)/kernel/include LOCAL_SRCS := $(wildcard src/osTest.c) \ - $(wildcard src/runstop_osTest.c) \ - $(wildcard src/scatter_osTest.c) \ $(wildcard src/iCunit.c) \ - $(wildcard src/ChipTest.c) \ - $(wildcard src/testusb_shellcmd.c) \ - $(wildcard src/testrun_shellcmd.c) LOCAL_FLAGS := $(LOCAL_INCLUDE) -Wno-error -I $(LITEOSTOPDIR)/../../$(LOSCFG_BOARD_CONFIG_PATH)/include \ -I $(LITEOSTOPDIR)/fs/fat/os_adapt diff --git a/testsuites/kernel/include/osTest.h b/testsuites/kernel/include/osTest.h index 522a53d4..e4ec630e 100644 --- a/testsuites/kernel/include/osTest.h +++ b/testsuites/kernel/include/osTest.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. - * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. + * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: @@ -36,7 +36,6 @@ #define SWTMR_TEST #endif -#include "test_menuconfig.h" #include "stdarg.h" #include "los_config.h" #include "iCunit.h" @@ -74,6 +73,7 @@ #include "los_process_pri.h" #include "pthread.h" +#define LOSCFG_TEST 1 #ifdef LOSCFG_PLATFORM_HI3516DV300 #define TEST3516DV300 #elif LOSCFG_PLATFORM_HI3518EV300 @@ -90,7 +90,7 @@ extern "C" { do { \ memset(&testTask, 0, sizeof(TSK_INIT_PARAM_S)); \ testTask.pfnTaskEntry = (TSK_ENTRY_FUNC)entry; \ - testTask.uwStackSize = LOS_TASK_MIN_STACK_SIZE; \ + testTask.uwStackSize = 0x1000; \ testTask.pcName = task_name; \ testTask.usTaskPrio = prio; \ testTask.uwResved = LOS_TASK_STATUS_DETACHED; \ @@ -108,8 +108,8 @@ extern "C" { #define JFFS_BASE_MTD_LEN 0x600000 -#define TASK_PRIO_TEST 25 -#define TASK_PRIO_TEST_TASK 4 +#define TASK_PRIO_TEST (LOS_TaskPriGet(LOS_CurTaskIDGet())) // 25 +#define TASK_PRIO_TEST_TASK 25 #define TASK_PRIO_TEST_SWTMR 4 #ifdef LOSCFG_AARCH64 #define TASK_STACK_SIZE_TEST (LOS_TASK_MIN_STACK_SIZE * 3) @@ -117,6 +117,7 @@ extern "C" { #define TASK_STACK_SIZE_TEST LOS_TASK_MIN_STACK_SIZE #endif #define LOS_MS_PER_TICK (OS_SYS_MS_PER_SECOND / LOSCFG_BASE_CORE_TICK_PER_SECOND) +#define LOS_US_PER_TICK (OS_SYS_US_PER_SECOND / LOSCFG_BASE_CORE_TICK_PER_SECOND) #define HWI_NUM_INTVALID OS_HWI_MAX_NUM #define writel(g_value, address) WRITE_UINT32(g_value, address) @@ -313,7 +314,7 @@ extern void msleep(unsigned int msecs); extern unsigned int sleep(unsigned int seconds); extern int usleep(unsigned useconds); -#define OS_TASK_STATUS_DETACHED OS_TASK_FLAG_DETACHED +#define OS_TASK_STATUS_DETACHED 0 extern UINT32 LOS_MemTotalUsedGet(VOID *pool); extern VOID ptestTickConsume(VOID); extern UINT32 TEST_TskDelete(UINT32 taskID); @@ -342,6 +343,8 @@ extern void TestSystemInit(void); extern void TEST_DT_COMMON(void); extern VOID dprintf(const char *fmt, ...); +extern UINT32 OsSwtmrTaskIdByCpuId(UINT16 cpuId); + #define BIG_FD 512 typedef struct testrunParam { CHAR testcase_sequence[16]; @@ -365,6 +368,8 @@ typedef struct testrunParam { extern void InitRebootHook(void); +#define LOSCFG_TEST_SMOKE +#define LOSCFG_TEST_FULL #ifdef __cplusplus #if __cplusplus } diff --git a/testsuites/kernel/sample/kernel_base/BUILD.gn b/testsuites/kernel/sample/kernel_base/BUILD.gn new file mode 100644 index 00000000..8fc1e6f8 --- /dev/null +++ b/testsuites/kernel/sample/kernel_base/BUILD.gn @@ -0,0 +1,37 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved. +# +# 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. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# 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 HOLDER 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. + +import("//kernel/liteos_a/liteos.gni") + +group("kernel_base") { + deps = [ + "core:test_core", + "ipc:test_ipc", + ] +} diff --git a/testsuites/kernel/sample/kernel_base/core/BUILD.gn b/testsuites/kernel/sample/kernel_base/core/BUILD.gn index 7302e05f..e62d5315 100644 --- a/testsuites/kernel/sample/kernel_base/core/BUILD.gn +++ b/testsuites/kernel/sample/kernel_base/core/BUILD.gn @@ -27,37 +27,238 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -static_library("test_core") { +import("//kernel/liteos_a/liteos.gni") + +kernel_module("test_core") { sources = [ - "hwi/It_smp_hwi.c", - "hwi_nesting/It_hwi_nesting.c", "swtmr/It_los_swtmr.c", + "swtmr/full/It_los_swtmr_001.c", + "swtmr/full/It_los_swtmr_002.c", + "swtmr/full/It_los_swtmr_003.c", + "swtmr/full/It_los_swtmr_005.c", + "swtmr/full/It_los_swtmr_006.c", + "swtmr/full/It_los_swtmr_007.c", + "swtmr/full/It_los_swtmr_008.c", + "swtmr/full/It_los_swtmr_009.c", + "swtmr/full/It_los_swtmr_010.c", + "swtmr/full/It_los_swtmr_011.c", + "swtmr/full/It_los_swtmr_012.c", + "swtmr/full/It_los_swtmr_013.c", + "swtmr/full/It_los_swtmr_014.c", + "swtmr/full/It_los_swtmr_015.c", + "swtmr/full/It_los_swtmr_016.c", + "swtmr/full/It_los_swtmr_017.c", + "swtmr/full/It_los_swtmr_018.c", + "swtmr/full/It_los_swtmr_019.c", + "swtmr/full/It_los_swtmr_020.c", + "swtmr/full/It_los_swtmr_021.c", + "swtmr/full/It_los_swtmr_030.c", + "swtmr/full/It_los_swtmr_036.c", + "swtmr/full/It_los_swtmr_037.c", + "swtmr/full/It_los_swtmr_042.c", + "swtmr/full/It_los_swtmr_044.c", + "swtmr/full/It_los_swtmr_045.c", + "swtmr/full/It_los_swtmr_046.c", + "swtmr/full/It_los_swtmr_047.c", + "swtmr/full/It_los_swtmr_048.c", + "swtmr/full/It_los_swtmr_049.c", + "swtmr/full/It_los_swtmr_050.c", + "swtmr/full/It_los_swtmr_051.c", + "swtmr/full/It_los_swtmr_052.c", + "swtmr/full/It_los_swtmr_054.c", + "swtmr/full/It_los_swtmr_055.c", + "swtmr/full/It_los_swtmr_056.c", + "swtmr/full/It_los_swtmr_057.c", + "swtmr/full/It_los_swtmr_059.c", + "swtmr/full/It_los_swtmr_061.c", + "swtmr/full/It_los_swtmr_062.c", + "swtmr/full/It_los_swtmr_063.c", + "swtmr/full/It_los_swtmr_066.c", + "swtmr/full/It_los_swtmr_067.c", + "swtmr/full/It_los_swtmr_068.c", + "swtmr/full/It_los_swtmr_069.c", + "swtmr/full/It_los_swtmr_070.c", + "swtmr/full/It_los_swtmr_071.c", + "swtmr/full/It_los_swtmr_075.c", + "swtmr/full/It_los_swtmr_076.c", + "swtmr/full/It_los_swtmr_077.c", + "swtmr/full/It_los_swtmr_078.c", + "swtmr/smoke/It_los_swtmr_053.c", + "swtmr/smoke/It_los_swtmr_058.c", + "swtmr/smp/It_smp_los_swtmr_001.c", + "swtmr/smp/It_smp_los_swtmr_002.c", + "swtmr/smp/It_smp_los_swtmr_003.c", + "swtmr/smp/It_smp_los_swtmr_004.c", + "swtmr/smp/It_smp_los_swtmr_005.c", + "swtmr/smp/It_smp_los_swtmr_006.c", + "swtmr/smp/It_smp_los_swtmr_007.c", + "swtmr/smp/It_smp_los_swtmr_008.c", + "swtmr/smp/It_smp_los_swtmr_009.c", + "swtmr/smp/It_smp_los_swtmr_010.c", + "swtmr/smp/It_smp_los_swtmr_011.c", + "swtmr/smp/It_smp_los_swtmr_012.c", + "swtmr/smp/It_smp_los_swtmr_013.c", + "swtmr/smp/It_smp_los_swtmr_014.c", + "swtmr/smp/It_smp_los_swtmr_015.c", + "swtmr/smp/It_smp_los_swtmr_016.c", + "swtmr/smp/It_smp_los_swtmr_017.c", + "swtmr/smp/It_smp_los_swtmr_018.c", + "swtmr/smp/It_smp_los_swtmr_019.c", + "swtmr/smp/It_smp_los_swtmr_020.c", + "swtmr/smp/It_smp_los_swtmr_021.c", + "swtmr/smp/It_smp_los_swtmr_022.c", + "swtmr/smp/It_smp_los_swtmr_023.c", + "swtmr/smp/It_smp_los_swtmr_024.c", + "swtmr/smp/It_smp_los_swtmr_025.c", + "swtmr/smp/It_smp_los_swtmr_026.c", + "swtmr/smp/It_smp_los_swtmr_027.c", + "swtmr/smp/It_smp_los_swtmr_028.c", + "swtmr/smp/It_smp_los_swtmr_029.c", + "swtmr/smp/It_smp_los_swtmr_030.c", + "swtmr/smp/It_smp_los_swtmr_031.c", + "swtmr/smp/It_smp_los_swtmr_032.c", + "swtmr/smp/It_smp_los_swtmr_033.c", + "swtmr/smp/It_smp_los_swtmr_034.c", + "swtmr/smp/It_smp_los_swtmr_035.c", "task/It_los_task.c", + "task/smoke/It_los_task_045.c", + "task/smoke/It_los_task_046.c", + "task/smoke/It_los_task_049.c", + "task/smoke/It_los_task_081.c", + "task/smoke/It_los_task_089.c", + "task/smoke/It_los_task_097.c", + "task/smoke/It_los_task_099.c", + "task/smoke/It_los_task_101.c", + "task/smoke/It_los_task_105.c", + "task/smoke/It_los_task_timeslice_001.c", + "task/smp/It_smp_los_task_001.c", + "task/smp/It_smp_los_task_002.c", + "task/smp/It_smp_los_task_003.c", + "task/smp/It_smp_los_task_004.c", + "task/smp/It_smp_los_task_021.c", + "task/smp/It_smp_los_task_022.c", + "task/smp/It_smp_los_task_023.c", + "task/smp/It_smp_los_task_024.c", + "task/smp/It_smp_los_task_025.c", + "task/smp/It_smp_los_task_026.c", + "task/smp/It_smp_los_task_027.c", + "task/smp/It_smp_los_task_028.c", + "task/smp/It_smp_los_task_029.c", + "task/smp/It_smp_los_task_030.c", + "task/smp/It_smp_los_task_032.c", + "task/smp/It_smp_los_task_033.c", + "task/smp/It_smp_los_task_034.c", + "task/smp/It_smp_los_task_035.c", + "task/smp/It_smp_los_task_036.c", + "task/smp/It_smp_los_task_037.c", + "task/smp/It_smp_los_task_040.c", + "task/smp/It_smp_los_task_042.c", + "task/smp/It_smp_los_task_043.c", + "task/smp/It_smp_los_task_044.c", + "task/smp/It_smp_los_task_046.c", + "task/smp/It_smp_los_task_047.c", + "task/smp/It_smp_los_task_048.c", + "task/smp/It_smp_los_task_049.c", + "task/smp/It_smp_los_task_050.c", + "task/smp/It_smp_los_task_052.c", + "task/smp/It_smp_los_task_053.c", + "task/smp/It_smp_los_task_054.c", + "task/smp/It_smp_los_task_055.c", + "task/smp/It_smp_los_task_056.c", + "task/smp/It_smp_los_task_057.c", + "task/smp/It_smp_los_task_058.c", + "task/smp/It_smp_los_task_059.c", + "task/smp/It_smp_los_task_060.c", + "task/smp/It_smp_los_task_061.c", + "task/smp/It_smp_los_task_062.c", + "task/smp/It_smp_los_task_063.c", + "task/smp/It_smp_los_task_064.c", + "task/smp/It_smp_los_task_065.c", + "task/smp/It_smp_los_task_066.c", + "task/smp/It_smp_los_task_067.c", + "task/smp/It_smp_los_task_068.c", + "task/smp/It_smp_los_task_069.c", + "task/smp/It_smp_los_task_070.c", + "task/smp/It_smp_los_task_071.c", + "task/smp/It_smp_los_task_072.c", + "task/smp/It_smp_los_task_073.c", + "task/smp/It_smp_los_task_074.c", + "task/smp/It_smp_los_task_075.c", + "task/smp/It_smp_los_task_076.c", + "task/smp/It_smp_los_task_077.c", + "task/smp/It_smp_los_task_078.c", + "task/smp/It_smp_los_task_079.c", + "task/smp/It_smp_los_task_081.c", + "task/smp/It_smp_los_task_084.c", + "task/smp/It_smp_los_task_087.c", + "task/smp/It_smp_los_task_088.c", + "task/smp/It_smp_los_task_089.c", + "task/smp/It_smp_los_task_090.c", + "task/smp/It_smp_los_task_091.c", + "task/smp/It_smp_los_task_092.c", + "task/smp/It_smp_los_task_093.c", + "task/smp/It_smp_los_task_094.c", + "task/smp/It_smp_los_task_095.c", + "task/smp/It_smp_los_task_096.c", + "task/smp/It_smp_los_task_098.c", + "task/smp/It_smp_los_task_099.c", + "task/smp/It_smp_los_task_100.c", + "task/smp/It_smp_los_task_101.c", + "task/smp/It_smp_los_task_102.c", + "task/smp/It_smp_los_task_103.c", + "task/smp/It_smp_los_task_105.c", + "task/smp/It_smp_los_task_106.c", + "task/smp/It_smp_los_task_107.c", + "task/smp/It_smp_los_task_108.c", + "task/smp/It_smp_los_task_109.c", + "task/smp/It_smp_los_task_110.c", + "task/smp/It_smp_los_task_112.c", + "task/smp/It_smp_los_task_113.c", + "task/smp/It_smp_los_task_114.c", + "task/smp/It_smp_los_task_115.c", + "task/smp/It_smp_los_task_117.c", + "task/smp/It_smp_los_task_126.c", + "task/smp/It_smp_los_task_127.c", + "task/smp/It_smp_los_task_128.c", + "task/smp/It_smp_los_task_129.c", + "task/smp/It_smp_los_task_130.c", + "task/smp/It_smp_los_task_131.c", + "task/smp/It_smp_los_task_132.c", + "task/smp/It_smp_los_task_133.c", + "task/smp/It_smp_los_task_134.c", + "task/smp/It_smp_los_task_135.c", + "task/smp/It_smp_los_task_136.c", + "task/smp/It_smp_los_task_137.c", + "task/smp/It_smp_los_task_138.c", + "task/smp/It_smp_los_task_139.c", + "task/smp/It_smp_los_task_141.c", + "task/smp/It_smp_los_task_142.c", + "task/smp/It_smp_los_task_143.c", + "task/smp/It_smp_los_task_144.c", + "task/smp/It_smp_los_task_145.c", + "task/smp/It_smp_los_task_146.c", + "task/smp/It_smp_los_task_147.c", + "task/smp/It_smp_los_task_148.c", + "task/smp/It_smp_los_task_149.c", + "task/smp/It_smp_los_task_150.c", + "task/smp/It_smp_los_task_151.c", + "task/smp/It_smp_los_task_152.c", + "task/smp/It_smp_los_task_153.c", + "task/smp/It_smp_los_task_154.c", + "task/smp/It_smp_los_task_155.c", + "task/smp/It_smp_los_task_156.c", + "task/smp/It_smp_los_task_157.c", + "task/smp/It_smp_los_task_158.c", + "task/smp/It_smp_los_task_159.c", + "task/smp/It_smp_los_task_160.c", + "task/smp/It_smp_los_task_161.c", ] - if (LOSCFG_TEST_SMOKE) { - sources += [ - "swtmr/smoke/It_los_swtmr_053.c", - "swtmr/smoke/It_los_swtmr_058.c", - "task/smoke/It_los_task_045.c", - "task/smoke/It_los_task_046.c", - "task/smoke/It_los_task_049.c", - "task/smoke/It_los_task_081.c", - "task/smoke/It_los_task_089.c", - "task/smoke/It_los_task_097.c", - "task/smoke/It_los_task_099.c", - "task/smoke/It_los_task_101.c", - "task/smoke/It_los_task_105.c", - "task/smoke/It_los_task_timeslice_001.c", - ] - } include_dirs = [ - "../../../include/", "task", "swtmr", - "hwi", - "hwi_nesting", ] - cflags = [ "-Wno-error" ] + public_configs = + [ "//kernel/liteos_a/testsuites/kernel:liteos_kernel_test_public" ] } diff --git a/testsuites/kernel/sample/kernel_base/core/swtmr/It_los_swtmr.c b/testsuites/kernel/sample/kernel_base/core/swtmr/It_los_swtmr.c index f49d472c..44c53550 100644 --- a/testsuites/kernel/sample/kernel_base/core/swtmr/It_los_swtmr.c +++ b/testsuites/kernel/sample/kernel_base/core/swtmr/It_los_swtmr.c @@ -41,14 +41,6 @@ EVENT_CB_S g_eventCB1, g_eventCB2, g_eventCB3; VOID ItSuiteLosSwtmr(VOID) { - int ret = LOS_SetProcessScheduler(LOS_GetCurrProcessID(), LOS_SCHED_RR, TASK_PRIO_TEST_SWTMR); - if (ret != LOS_OK) { - dprintf("%s set test process schedule failed! %d\n", ret); - } - ret = LOS_SetTaskScheduler(LOS_CurTaskIDGet(), LOS_SCHED_RR, TASK_PRIO_TEST_SWTMR); - if (ret != LOS_OK) { - dprintf("%s set test task schedule failed! %d\n", ret); - } #if defined(LOSCFG_TEST_SMOKE) ItLosSwtmr053(); ItLosSwtmr058(); @@ -75,10 +67,8 @@ VOID ItSuiteLosSwtmr(VOID) ItSmpLosSwtmr019(); ItSmpLosSwtmr020(); ItSmpLosSwtmr021(); - ItSmpLosSwtmr022(); ItSmpLosSwtmr023(); ItSmpLosSwtmr024(); - ItSmpLosSwtmr025(); ItSmpLosSwtmr026(); ItSmpLosSwtmr027(); ItSmpLosSwtmr028(); @@ -86,7 +76,6 @@ VOID ItSuiteLosSwtmr(VOID) ItSmpLosSwtmr030(); ItSmpLosSwtmr031(); ItSmpLosSwtmr032(); - ItSmpLosSwtmr033(); ItSmpLosSwtmr034(); ItSmpLosSwtmr035(); #endif @@ -112,16 +101,10 @@ VOID ItSuiteLosSwtmr(VOID) ItLosSwtmr019(); ItLosSwtmr020(); ItLosSwtmr021(); - ItLosSwtmr022(); ItLosSwtmr030(); - ItLosSwtmr033(); ItLosSwtmr036(); ItLosSwtmr037(); - ItLosSwtmr039(); - ItLosSwtmr040(); - ItLosSwtmr041(); ItLosSwtmr042(); - ItLosSwtmr043(); ItLosSwtmr044(); ItLosSwtmr045(); ItLosSwtmr046(); @@ -136,12 +119,9 @@ VOID ItSuiteLosSwtmr(VOID) ItLosSwtmr056(); ItLosSwtmr057(); ItLosSwtmr059(); - ItLosSwtmr060(); ItLosSwtmr061(); ItLosSwtmr062(); ItLosSwtmr063(); - ItLosSwtmr064(); - ItLosSwtmr065(); ItLosSwtmr066(); ItLosSwtmr067(); ItLosSwtmr068(); @@ -179,14 +159,6 @@ VOID ItSuiteLosSwtmr(VOID) ItLosSwtmr080(); ItLosSwtmr023(); #endif - ret = LOS_SetProcessScheduler(LOS_GetCurrProcessID(), LOS_SCHED_RR, 20); // 20, set a reasonable priority. - if (ret != LOS_OK) { - dprintf("%s set test process schedule failed! %d\n", ret); - } - ret = LOS_SetTaskScheduler(LOS_CurTaskIDGet(), LOS_SCHED_RR, TASK_PRIO_TEST); - if (ret != LOS_OK) { - dprintf("%s set test task schedule failed! %d\n", ret); - } } #ifdef __cplusplus diff --git a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_036.c b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_036.c index 61b8667d..f027814e 100644 --- a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_036.c +++ b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_036.c @@ -36,20 +36,22 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ + +static UINT32 g_testSwtmrCount; static VOID SwtmrF01(UINT32 arg) { if (arg != 0xffff) { return; } - g_testCount++; + g_testSwtmrCount++; return; } static UINT32 Testcase(VOID) { UINT32 ret; UINT16 swTmrID; - g_testCount = 0; + g_testSwtmrCount = 0; ret = LOS_SwtmrCreate(1, LOS_SWTMR_MODE_ONCE, SwtmrF01, &swTmrID, 0xffff); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); @@ -62,7 +64,8 @@ static UINT32 Testcase(VOID) ret = LOS_TaskDelay(10); // 10, set delay time ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT); + ICUNIT_GOTO_EQUAL(g_testSwtmrCount, 1, g_testSwtmrCount, EXIT); + #if SELF_DELETED ret = LOS_SwtmrDelete(swTmrID); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_002.c b/testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_002.c index c62c2c92..87029a71 100644 --- a/testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_002.c +++ b/testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_002.c @@ -82,11 +82,14 @@ static UINT32 Testcase(void) TEST_TASK_PARAM_INIT(testTask, "it_swtmr_002_task", TaskF01, TASK_PRIO_TEST_SWTMR + 1); // not set cpuaffi testTask.auwArgs[0] = g_swtmrHandle[i]; + testTask.usCpuAffiMask = CPUID_TO_AFFI_MASK(i); ret = LOS_TaskCreate(&testid, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); } + UINT64 startTime = LOS_CurrNanosec(); LOS_TaskDelay(g_testPeriod * g_testTimes + 5); // g_testPeriod * g_testTimes + 5, set delay time + UINT64 usedTime = LOS_CurrNanosec() - startTime; ICUNIT_ASSERT_EQUAL(g_testCount, g_testTimes * LOSCFG_KERNEL_CORE_NUM, g_testCount); diff --git a/testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_003.c b/testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_003.c index 51f45b59..28d1e937 100644 --- a/testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_003.c +++ b/testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_003.c @@ -71,7 +71,8 @@ static UINT32 Testcase(void) CPUID_TO_AFFI_MASK(ArchCurrCpuid())); ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - LOS_TaskDelay(g_testPeriod + 1); + + LOS_TaskDelay(g_testPeriod + 10); // period is 10 ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT); diff --git a/testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_024.c b/testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_024.c index ccfcbe06..496966fe 100644 --- a/testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_024.c +++ b/testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_024.c @@ -88,13 +88,15 @@ static UINT32 Testcase(void) ret = LOS_SwtmrCreate(g_testPeriod, LOS_SWTMR_MODE_PERIOD, (SWTMR_PROC_FUNC)SwtmrF01, &g_swTmrID, 0); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - TEST_TASK_PARAM_INIT(testTask, "it_swtmr_024_task1", TaskF01, - TASK_PRIO_TEST_SWTMR + 1); // not set cpuaffi + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_swtmr_024_task1", TaskF01, + TASK_PRIO_TEST_SWTMR + 1, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); + testTask.uwResved = LOS_TASK_ATTR_JOINABLE; ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - TEST_TASK_PARAM_INIT(testTask, "it_swtmr_024_task2", TaskF02, - TASK_PRIO_TEST_SWTMR + 1); // not set cpuaffi + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_swtmr_024_task2", TaskF02, + TASK_PRIO_TEST_SWTMR + 1, CPUID_TO_AFFI_MASK((ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM)); + testTask.uwResved = LOS_TASK_ATTR_JOINABLE; ret = LOS_TaskCreate(&g_testTaskID02, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); @@ -102,6 +104,12 @@ static UINT32 Testcase(void) ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT); + ret = LOS_TaskJoin(g_testTaskID01, NULL); + ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); + + ret = LOS_TaskJoin(g_testTaskID02, NULL); + ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); + LOS_SwtmrDelete(g_swTmrID); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_025.c b/testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_025.c index 69d3f1ee..0377b465 100644 --- a/testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_025.c +++ b/testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_025.c @@ -38,10 +38,10 @@ extern "C" { #endif /* __cpluscplus */ static UINT32 g_szId[LOSCFG_KERNEL_CORE_NUM] = {0}; - +static UINT32 g_testSwtmtCount = 0; static VOID SwtmrF01(void) { - LOS_AtomicInc(&g_testCount); + LOS_AtomicInc(&g_testSwtmtCount); } static void TaskF01(UINT32 index) @@ -61,26 +61,31 @@ static UINT32 Testcase(void) UINT32 ret; UINT32 currCpuid; UINT32 i; - - g_testCount = 0; + UINT32 taskID[LOSCFG_KERNEL_CORE_NUM]; + g_testSwtmtCount = 0; g_testPeriod = 10; // period is 10 for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) { TEST_TASK_PARAM_INIT_AFFI(testTask, "it_swtmr_025_task1", TaskF01, TASK_PRIO_TEST_SWTMR + 1, CPUID_TO_AFFI_MASK(i)); testTask.auwArgs[0] = i; - ret = LOS_TaskCreate(&g_testTaskID01, &testTask); + testTask.uwResved = LOS_TASK_ATTR_JOINABLE; + ret = LOS_TaskCreate(&taskID[i], &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); } - LOS_TaskDelay(1); - for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) { - LOS_SwtmrStart(g_szId[i]); + ret = LOS_TaskJoin(taskID[i], NULL); + ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); } - LOS_TaskDelay(g_testPeriod); + for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) { + ret = LOS_SwtmrStart(g_szId[i]); + ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); + } - ICUNIT_GOTO_EQUAL(g_testCount, LOSCFG_KERNEL_CORE_NUM, g_testCount, EXIT); + LOS_TaskDelay(g_testPeriod + 5); /* 5 ticks */ + + ICUNIT_GOTO_EQUAL(g_testSwtmtCount, LOSCFG_KERNEL_CORE_NUM, g_testSwtmtCount, EXIT); for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) { ret = LOS_SwtmrDelete(g_szId[i]); diff --git a/testsuites/kernel/sample/kernel_base/core/task/It_los_task.c b/testsuites/kernel/sample/kernel_base/core/task/It_los_task.c index fb194fa1..c48f04e3 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/It_los_task.c +++ b/testsuites/kernel/sample/kernel_base/core/task/It_los_task.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. - * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. + * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: @@ -43,27 +43,15 @@ volatile INT32 g_timesliceTestCount = 0; void ItSuiteLosTask(void) { - int ret = LOS_SetProcessScheduler(LOS_GetCurrProcessID(), LOS_SCHED_RR, TASK_PRIO_TEST_TASK); - if (ret != LOS_OK) { - dprintf("%s set test process schedule failed! %d\n", ret); - } - ret = LOS_SetTaskScheduler(LOS_CurTaskIDGet(), LOS_SCHED_RR, TASK_PRIO_TEST_TASK); - if (ret != LOS_OK) { - dprintf("%s set test task schedule failed! %d\n", ret); - } #if defined(LOSCFG_TEST_SMOKE) ItLosTask045(); ItLosTask046(); - ItLosTask049(); - ItLosTask081(); ItLosTask089(); ItLosTask097(); ItLosTask101(); - ItLosTask105(); ItLosTask099(); ItLosTaskTimeslice001(); #ifdef LOSCFG_KERNEL_SMP - // reserved 20 for smoke test ItSmpLosTask001(); /* Task Affinity */ ItSmpLosTask002(); /* Task Deletion Across Cores */ ItSmpLosTask003(); /* Task Suspend Across Cores */ @@ -72,138 +60,6 @@ void ItSuiteLosTask(void) #endif #if defined(LOSCFG_TEST_FULL) - ItLosTask001(); - ItLosTask002(); - ItLosTask004(); - ItLosTask007(); - ItLosTask008(); - ItLosTask009(); - ItLosTask010(); - ItLosTask011(); - ItLosTask012(); - ItLosTask013(); - ItLosTask014(); - ItLosTask015(); - ItLosTask016(); - ItLosTask017(); - ItLosTask018(); - ItLosTask019(); - ItLosTask020(); - ItLosTask021(); - ItLosTask022(); - ItLosTask023(); - ItLosTask024(); - ItLosTask025(); - ItLosTask026(); - ItLosTask027(); - ItLosTask028(); - ItLosTask029(); - ItLosTask031(); - ItLosTask032(); - ItLosTask033(); - ItLosTask034(); - ItLosTask035(); - ItLosTask036(); - ItLosTask037(); - ItLosTask038(); - ItLosTask039(); -#ifndef TESTHI1980IMU - ItLosTask040(); -#endif - ItLosTask041(); - ItLosTask042(); - ItLosTask043(); - ItLosTask047(); - ItLosTask048(); - ItLosTask050(); - ItLosTask051(); - ItLosTask052(); - ItLosTask053(); - ItLosTask054(); - ItLosTask055(); - ItLosTask056(); - ItLosTask057(); - ItLosTask058(); - ItLosTask060(); - ItLosTask061(); - ItLosTask063(); - ItLosTask064(); - ItLosTask065(); - ItLosTask066(); - ItLosTask067(); - ItLosTask068(); - ItLosTask069(); - ItLosTask071(); - ItLosTask072(); - ItLosTask073(); - ItLosTask074(); -#ifndef LOSCFG_KERNEL_SMP - ItLosTask075(); -#endif - ItLosTask076(); - ItLosTask077(); - ItLosTask078(); - ItLosTask079(); - ItLosTask080(); // LOS_TaskYeild is not allowed in irq - ItLosTask082(); - ItLosTask090(); - ItLosTask092(); - ItLosTask093(); - ItLosTask094(); - ItLosTask095(); - ItLosTask096(); - ItLosTask098(); - ItLosTask100(); - ItLosTask102(); - ItLosTask103(); - ItLosTask104(); - ItLosTask106(); - ItLosTask107(); - ItLosTask108(); - ItLosTask109(); - ItLosTask110(); - ItLosTask111(); - ItLosTask112(); - ItLosTask113(); - ItLosTask114(); - ItLosTask115(); - ItLosTask116(); // Not used the API LOS_CurTaskPriSet to change the task priority for the software timer - ItLosTask119(); - ItLosTask120(); - ItLosTask121(); - ItLosTask122(); - ItLosTask123(); - ItLosTask124(); - ItLosTask125(); - ItLosTask126(); - ItLosTask127(); - ItLosTask128(); - ItLosTask129(); - ItLosTask130(); - ItLosTask131(); - ItLosTask132(); - ItLosTask133(); - ItLosTask134(); - ItLosTask135(); - ItLosTask136(); -#ifndef LOSCFG_ARCH_FPU_DISABLE - ItLosTask141(); /* fpu regs check in task switch */ - ItLosTask142(); /* fpu regs check in irq context switch */ -#endif - ItLosTaskTimeslice002(); - ItLosTaskTimeslice003(); - ItLosTaskTimeslice004(); -#ifdef LOSCFG_KERNEL_SMP -#ifndef LOSCFG_ARCH_FPU_DISABLE - - ItSmpLosFloatSwitch001(); - ItSmpLosFloatSwitch002(); - ItSmpLosFloatSwitch003(); - ItSmpLosFloatSwitch004(); - ItSmpLosFloatSwitch005(); - ItSmpLosFloatSwitch006(); - ItSmpLosFloatSwitch007(); -#endif // fixed ItSmpLosTask099(); ItSmpLosTask049(); @@ -211,7 +67,6 @@ void ItSuiteLosTask(void) ItSmpLosTask159(); ItSmpLosTask161(); ItSmpLosTask137(); - ItSmpLosTask158(); ItSmpLosTask021(); ItSmpLosTask022(); ItSmpLosTask023(); @@ -235,7 +90,6 @@ void ItSuiteLosTask(void) ItSmpLosTask047(); ItSmpLosTask048(); ItSmpLosTask050(); - ItSmpLosTask051(); ItSmpLosTask052(); ItSmpLosTask053(); ItSmpLosTask054(); @@ -263,7 +117,6 @@ void ItSuiteLosTask(void) ItSmpLosTask078(); ItSmpLosTask079(); ItSmpLosTask081(); - ItSmpLosTask082(); ItSmpLosTask084(); ItSmpLosTask087(); ItSmpLosTask088(); @@ -275,7 +128,6 @@ void ItSuiteLosTask(void) ItSmpLosTask094(); ItSmpLosTask095(); ItSmpLosTask096(); - ItSmpLosTask097(); ItSmpLosTask098(); ItSmpLosTask100(); ItSmpLosTask101(); @@ -323,21 +175,6 @@ void ItSuiteLosTask(void) ItSmpLosTask156(); ItSmpLosTask157(); #endif -#endif - -#ifdef LOSCFG_KERNEL_SMP - HalIrqSetAffinity(HWI_NUM_TEST, 1); - HalIrqSetAffinity(HWI_NUM_TEST1, 1); - HalIrqSetAffinity(HWI_NUM_TEST3, 1); -#endif - ret = LOS_SetProcessScheduler(LOS_GetCurrProcessID(), LOS_SCHED_RR, 20); // 20, set a reasonable priority. - if (ret != LOS_OK) { - dprintf("%s set test process schedule failed! %d\n", ret); - } - ret = LOS_SetTaskScheduler(LOS_CurTaskIDGet(), LOS_SCHED_RR, TASK_PRIO_TEST); - if (ret != LOS_OK) { - dprintf("%s set test task schedule failed! %d\n", ret); - } } #ifdef __cplusplus #if __cplusplus diff --git a/testsuites/kernel/sample/kernel_base/core/task/It_los_task.h b/testsuites/kernel/sample/kernel_base/core/task/It_los_task.h index 7f47bb5f..ab1e54f4 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/It_los_task.h +++ b/testsuites/kernel/sample/kernel_base/core/task/It_los_task.h @@ -39,6 +39,7 @@ #include "los_list.h" #include "los_process_pri.h" #include "los_percpu_pri.h" +#include "los_swtmr_pri.h" #ifdef __cplusplus #if __cplusplus diff --git a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_045.c b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_045.c index b8894d8c..6cc62a2e 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_045.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_045.c @@ -67,7 +67,7 @@ static UINT32 Testcase(void) ret = LOS_SwtmrStart(swTmrID); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - ret = LOS_TaskDelay(10); // 10, set delay time. + ret = LOS_TaskDelay(100); // 100, set delay time. ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); ICUNIT_ASSERT_EQUAL(g_testCount, 1, g_testCount); diff --git a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_049.c b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_049.c index 3742a238..f1cb1b56 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_049.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_049.c @@ -38,6 +38,7 @@ extern "C" { #endif /* __cpluscplus */ static TSK_INFO_S g_taskInfo; +static UINT16 g_testPrio; static void TaskF01(void) { UINT32 ret; @@ -56,7 +57,7 @@ static void TaskF01(void) ICUNIT_GOTO_STRING_EQUAL(g_taskInfo.acName, "Tsk049A", g_taskInfo.acName, EXIT1); ICUNIT_GOTO_EQUAL(g_taskInfo.uwTaskID, g_testTaskID01, g_taskInfo.uwTaskID, EXIT1); // 2, assert usTaskPrio change. - ICUNIT_GOTO_EQUAL(g_taskInfo.usTaskPrio, TASK_PRIO_TEST_TASK - 2, g_taskInfo.usTaskPrio, EXIT1); + ICUNIT_GOTO_EQUAL(g_taskInfo.usTaskPrio, g_testPrio - 2, g_taskInfo.usTaskPrio, EXIT1); ICUNIT_GOTO_EQUAL(OS_TASK_STATUS_RUNNING & g_taskInfo.usTaskStatus, OS_TASK_STATUS_RUNNING, OS_TASK_STATUS_RUNNING & g_taskInfo.usTaskStatus, EXIT1); ICUNIT_GOTO_EQUAL(g_taskInfo.uwBottomOfStack, g_taskInfo.uwSP + g_taskInfo.uwCurrUsed, g_taskInfo.uwBottomOfStack, @@ -77,11 +78,12 @@ static UINT32 Testcase(void) UINT32 ret; TSK_INIT_PARAM_S task1 = { 0 }; + g_testPrio = TASK_PRIO_TEST_TASK; task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.pcName = "Tsk049A"; // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. - task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; + task1.usTaskPrio = g_testPrio - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; #ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); diff --git a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_097.c b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_097.c index dee48ee6..f7b83b3a 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_097.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_097.c @@ -102,9 +102,6 @@ static UINT32 Testcase(void) ret = LOS_TaskDelete(g_testTaskID01); ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_TSK_NOT_CREATED, ret, EXIT); - ret = LOS_TaskDelete(g_testTaskID02); - ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - return LOS_OK; EXIT: diff --git a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_101.c b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_101.c index d16703f0..223c11cb 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_101.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_101.c @@ -37,6 +37,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ +static UINT32 g_testPrio; static void TaskF01(void) { UINT32 ret; @@ -46,7 +47,7 @@ static void TaskF01(void) ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 1, g_testCount); ret = LOS_TaskPriGet(g_testTaskID01); - ICUNIT_ASSERT_EQUAL_VOID(ret, TASK_PRIO_TEST_TASK - 1, ret); + ICUNIT_ASSERT_EQUAL_VOID(ret, g_testPrio, ret); g_testCount++; } @@ -55,10 +56,11 @@ static UINT32 Testcase(void) { UINT32 ret; TSK_INIT_PARAM_S task1 = { 0 }; + g_testPrio = TASK_PRIO_TEST_TASK - 1; task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.pcName = "Tsk101A"; - task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; + task1.usTaskPrio = g_testPrio; task1.uwResved = LOS_TASK_STATUS_DETACHED; #ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); diff --git a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_timeslice_001.c b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_timeslice_001.c index bc5ad154..b5100a99 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_timeslice_001.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_timeslice_001.c @@ -67,7 +67,7 @@ static UINT32 Testcase(void) g_itTimesliceTestCount1 = 0; g_timesliceTestCount = 0; LOS_TaskLock(); - TSK_INIT_PARAM_S task; + TSK_INIT_PARAM_S task = { 0 }; task.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task.pcName = "TimesTsk001A"; diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_002.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_002.c index 0958e7bc..b7ae2ae4 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_002.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_002.c @@ -61,14 +61,14 @@ static UINT32 Testcase(void) LOS_TaskDelay(2); // 2, set delay time. ret = LOS_TaskDelete(testid); + ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); #ifndef LOSCFG_KERNEL_SMP_TASK_SYNC /* delay and check */ LOS_TaskDelay(10); // 10, set delay time. #endif - - ret = OS_TCB_FROM_TID(testid)->taskStatus; - ICUNIT_ASSERT_EQUAL(ret & OS_TASK_STATUS_UNUSED, OS_TASK_STATUS_UNUSED, ret); + ret = LOS_TaskDelete(testid); + ICUNIT_ASSERT_EQUAL(ret, LOS_ERRNO_TSK_NOT_CREATED, ret); return LOS_OK; } diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_003.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_003.c index cdf68a71..af402953 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_003.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_003.c @@ -60,10 +60,11 @@ static UINT32 Testcase(void) ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); LOS_TaskDelay(2); // 2, set delay time. - LOS_TaskSuspend(testid); + ret = LOS_TaskSuspend(testid); + ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); /* delay and check */ - LOS_TaskDelay(10); // 10, set delay time. + LOS_TaskDelay(100); // 10, set delay time. ret = OS_TCB_FROM_TID(testid)->taskStatus; ICUNIT_GOTO_EQUAL(ret & OS_TASK_STATUS_SUSPEND, OS_TASK_STATUS_SUSPEND, ret, EXIT); diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_004.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_004.c index 6204ca15..f1ed6a5b 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_004.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_004.c @@ -58,10 +58,6 @@ static UINT32 Testcase(void) while (g_testCount == 0) { } ICUNIT_ASSERT_EQUAL(g_testCount, 1, g_testCount); - LosTaskCB *runTask; - - runTask = OsCurrTaskGet(); - ICUNIT_ASSERT_EQUAL(strcmp(runTask->taskName, "IT_TST_INI"), 0, 1); return LOS_OK; diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_050.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_050.c index 28094b40..c744494d 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_050.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_050.c @@ -65,25 +65,22 @@ static UINT32 Testcase(void) ret = OS_TCB_FROM_TID(g_testTaskID01)->taskStatus; ICUNIT_GOTO_NOT_EQUAL(ret & OS_TASK_STATUS_RUNNING, 0, ret, EXIT); - ICUNIT_GOTO_NOT_EQUAL(ret & OS_TASK_STATUS_DETACHED, 0, ret, EXIT); ret = LOS_TaskSuspend(g_testTaskID01); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - TestBusyTaskDelay(10); // 10, set delay time + TestBusyTaskDelay(100); // 100, set delay time ret = OS_TCB_FROM_TID(g_testTaskID01)->taskStatus; ICUNIT_GOTO_NOT_EQUAL(ret & OS_TASK_STATUS_SUSPEND, 0, ret, EXIT); - ICUNIT_GOTO_NOT_EQUAL(ret & OS_TASK_STATUS_DETACHED, 0, ret, EXIT); ret = LOS_TaskResume(g_testTaskID01); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - TestBusyTaskDelay(10); // 10, set delay time + TestBusyTaskDelay(100); // 100, set delay time ret = OS_TCB_FROM_TID(g_testTaskID01)->taskStatus; ICUNIT_GOTO_NOT_EQUAL(ret & OS_TASK_STATUS_RUNNING, 0, ret, EXIT); - ICUNIT_GOTO_NOT_EQUAL(ret & OS_TASK_STATUS_DETACHED, 0, ret, EXIT); ret = LOS_TaskDelete(g_testTaskID01); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_051.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_051.c index f7379696..99a49c20 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_051.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_051.c @@ -101,7 +101,7 @@ static UINT32 Testcase(void) TestBusyTaskDelay(10); // 10, set delay time ret = OS_TCB_FROM_TID(g_testTaskID02)->taskStatus; - ICUNIT_GOTO_EQUAL(ret, OS_TASK_STATUS_SUSPEND | OS_TASK_STATUS_DETACHED, ret, EXIT); + ICUNIT_GOTO_EQUAL(ret & OS_TASK_STATUS_SUSPEND, OS_TASK_STATUS_SUSPEND, ret, EXIT); ICUNIT_GOTO_EQUAL(g_testCount, 4, g_testCount, EXIT); // 4, assert that g_testCount is equal to this. diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_081.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_081.c index 8c209973..07ff3f27 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_081.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_081.c @@ -49,7 +49,7 @@ static UINT32 Testcase(void) ret = LOS_TaskSuspend(gTestIdleTaskID); ICUNIT_ASSERT_EQUAL(ret, LOS_ERRNO_TSK_OPERATE_SYSTEM_TASK, ret); - gTestSwtmrTaskID = g_percpu[cpuid].swtmrTaskID; + gTestSwtmrTaskID = OsSwtmrTaskIdByCpuId(cpuid); ret = LOS_TaskSuspend(gTestSwtmrTaskID); ICUNIT_ASSERT_EQUAL(ret, LOS_ERRNO_TSK_OPERATE_SYSTEM_TASK, ret); diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_101.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_101.c index 7163f044..01d0f217 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_101.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_101.c @@ -97,7 +97,7 @@ static UINT32 Testcase(void) ICUNIT_GOTO_NOT_EQUAL((ret & OS_TASK_STATUS_READY), 0, ret, EXIT); /* check if other core is Task_locked */ - gTestTaskLock = g_percpu[(ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM)].taskLockCnt; + gTestTaskLock = OsSchedRunQueByID((ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM))->taskLockCnt; ICUNIT_ASSERT_NOT_EQUAL(gTestTaskLock, 0, gTestTaskLock); ret = LOS_TaskSuspend(g_testTaskID02); diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_114.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_114.c index 2ccb8961..7cad4642 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_114.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_114.c @@ -49,7 +49,7 @@ static UINT32 Testcase(void) ret = LOS_TaskDelete(gTestIdleTaskID); ICUNIT_ASSERT_EQUAL(ret, LOS_ERRNO_TSK_OPERATE_SYSTEM_TASK, ret); - gTestSwtmrTaskID = g_percpu[cpuid].swtmrTaskID; + gTestSwtmrTaskID = OsSwtmrTaskIdByCpuId(cpuid); ret = LOS_TaskDelete(gTestSwtmrTaskID); ICUNIT_ASSERT_EQUAL(ret, LOS_ERRNO_TSK_OPERATE_SYSTEM_TASK, ret); diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_115.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_115.c index 3b5a0a8f..2c1d8691 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_115.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_115.c @@ -44,12 +44,7 @@ static UINT32 Testcase(void) UINT32 gTestSwtmrTaskID; UINT32 cpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM); - gTestIdleTaskID = g_percpu[cpuid].idleTaskID; - - ret = LOS_TaskDelete(gTestIdleTaskID); - ICUNIT_ASSERT_EQUAL(ret, LOS_ERRNO_TSK_OPERATE_SYSTEM_TASK, ret); - - gTestSwtmrTaskID = g_percpu[cpuid].swtmrTaskID; + gTestSwtmrTaskID = OsSwtmrTaskIdByCpuId(cpuid); ret = LOS_TaskDelete(gTestSwtmrTaskID); ICUNIT_ASSERT_EQUAL(ret, LOS_ERRNO_TSK_OPERATE_SYSTEM_TASK, ret); diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_126.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_126.c index 2d3cf903..32236761 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_126.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_126.c @@ -30,6 +30,7 @@ */ #include "It_los_task.h" +#include "los_swtmr_pri.h" #ifdef __cplusplus #if __cplusplus @@ -53,7 +54,7 @@ static void HwiF01(void) LOS_AtomicInc(&g_testCount); - gTestSwtmrTaskID = g_percpu[cpuid].swtmrTaskID; + gTestSwtmrTaskID = OsSwtmrTaskIdByCpuId(cpuid); ret = LOS_TaskDelete(gTestSwtmrTaskID); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_ERRNO_TSK_YIELD_IN_INT, ret); diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_127.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_127.c index bcba1ca2..a0c53958 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_127.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_127.c @@ -44,12 +44,12 @@ static void HwiF01(void) UINT32 gTestSwtmrTaskID; UINT32 cpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM); - gTestIdleTaskID = g_percpu[cpuid].idleTaskID; + gTestIdleTaskID = OsSchedRunQueByID(cpuid)->idleTaskID; ret = LOS_TaskDelete(gTestIdleTaskID); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_ERRNO_TSK_YIELD_IN_INT, ret); - gTestSwtmrTaskID = g_percpu[cpuid].swtmrTaskID; + gTestSwtmrTaskID = OsSwtmrTaskIdByCpuId(cpuid); ret = LOS_TaskDelete(gTestSwtmrTaskID); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_ERRNO_TSK_YIELD_IN_INT, ret); diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_130.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_130.c index fdd52701..4bd26689 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_130.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_130.c @@ -62,16 +62,14 @@ static UINT32 Testcase(void) TSK_INIT_PARAM_S task1 = { 0 }; g_testCount = 0; - TEST_TASK_PARAM_INIT(task1, "it_smp_task_130", (TSK_ENTRY_FUNC)TaskF01, TASK_PRIO_TEST_TASK); + UINT16 prio = LOS_TaskPriGet(LOS_CurTaskIDGet()); + TEST_TASK_PARAM_INIT(task1, "it_smp_task_130", (TSK_ENTRY_FUNC)TaskF01, prio); int i; task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); ret = LOS_TaskCreate(&g_testTaskID01, &task1); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - ret = OS_TCB_FROM_TID(g_testTaskID01)->taskStatus; - ICUNIT_GOTO_NOT_EQUAL((ret & OS_TASK_STATUS_READY), 0, ret, EXIT); - /* Wait TaskF01 to yield, then testTask timeslice is LOSCFG_BASE_CORE_TIMESLICE_TIMEOUT */ if (g_testCount != 1) { LOS_TaskYield(); diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_158.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_158.c index 5a0158ca..fa4620b3 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_158.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_158.c @@ -73,7 +73,7 @@ static UINT32 Testcase(void) ICUNIT_GOTO_EQUAL(g_testCount, 0, g_testCount, EXIT); for (i = 0; i < 100; i++) { // 100, Number of cycles. - TestBusyTaskDelay(LOSCFG_BASE_CORE_TIMESLICE_TIMEOUT - 1); + TestBusyTaskDelay((LOSCFG_BASE_CORE_TIMESLICE_TIMEOUT / LOS_US_PER_TICK) - 1); /* if same priority task is executed£¬break loop */ if (g_testCount != i) { diff --git a/testsuites/kernel/sample/kernel_base/ipc/BUILD.gn b/testsuites/kernel/sample/kernel_base/ipc/BUILD.gn index df7789dd..4a55f1a1 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/BUILD.gn +++ b/testsuites/kernel/sample/kernel_base/ipc/BUILD.gn @@ -26,42 +26,86 @@ # 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. +import("//kernel/liteos_a/liteos.gni") -static_library("test_ipc") { - sources = [ - "event/It_los_event.c", - "mux/It_los_mux.c", - "queue/It_los_queue.c", - "sem/It_los_sem.c", +kernel_module("test_ipc") { + sources = [ "mux/It_los_mux.c" ] + + sources += [ + "mux/full/It_los_mutex_006.c", + "mux/full/It_los_mutex_007.c", + "mux/full/It_los_mutex_008.c", + "mux/full/It_los_mutex_009.c", + "mux/full/It_los_mutex_010.c", + "mux/full/It_los_mutex_011.c", + "mux/full/It_los_mutex_012.c", + "mux/full/It_los_mutex_013.c", + "mux/full/It_los_mutex_015.c", + "mux/full/It_los_mutex_016.c", + "mux/full/It_los_mutex_017.c", + "mux/full/It_los_mutex_018.c", + "mux/full/It_los_mutex_020.c", + "mux/full/It_los_mutex_021.c", + "mux/full/It_los_mutex_025.c", + "mux/full/It_los_mutex_026.c", + "mux/full/It_los_mutex_027.c", + "mux/full/It_los_mutex_028.c", + "mux/full/It_los_mutex_029.c", + "mux/full/It_los_mutex_031.c", + "mux/full/It_los_mutex_035.c", + "mux/full/It_los_mutex_036.c", + "mux/full/It_los_mutex_037.c", + "mux/full/It_los_mutex_038.c", + "mux/full/It_los_mutex_039.c", + "mux/full/It_los_mutex_040.c", + "mux/full/It_los_mutex_041.c", + "mux/full/It_los_mutex_042.c", + "mux/full/It_los_mutex_043.c", + "mux/smoke/It_los_mutex_001.c", + "mux/smoke/It_los_mutex_002.c", + "mux/smoke/It_los_mutex_003.c", + "mux/smoke/It_los_mutex_004.c", + "mux/smp/It_smp_los_mux_001.c", + "mux/smp/It_smp_los_mux_002.c", + "mux/smp/It_smp_los_mux_003.c", + "mux/smp/It_smp_los_mux_004.c", + "mux/smp/It_smp_los_mux_005.c", + "mux/smp/It_smp_los_mux_006.c", + "mux/smp/It_smp_los_mux_007.c", + "mux/smp/It_smp_los_mux_2001.c", + "mux/smp/It_smp_los_mux_2002.c", + "mux/smp/It_smp_los_mux_2003.c", + "mux/smp/It_smp_los_mux_2004.c", + "mux/smp/It_smp_los_mux_2005.c", + "mux/smp/It_smp_los_mux_2006.c", + "mux/smp/It_smp_los_mux_2007.c", + "mux/smp/It_smp_los_mux_2008.c", + "mux/smp/It_smp_los_mux_2009.c", + "mux/smp/It_smp_los_mux_2010.c", + "mux/smp/It_smp_los_mux_2011.c", + "mux/smp/It_smp_los_mux_2012.c", + "mux/smp/It_smp_los_mux_2013.c", + "mux/smp/It_smp_los_mux_2014.c", + "mux/smp/It_smp_los_mux_2015.c", + "mux/smp/It_smp_los_mux_2016.c", + "mux/smp/It_smp_los_mux_2017.c", + "mux/smp/It_smp_los_mux_2018.c", + "mux/smp/It_smp_los_mux_2021.c", + "mux/smp/It_smp_los_mux_2022.c", + "mux/smp/It_smp_los_mux_2024.c", + "mux/smp/It_smp_los_mux_2025.c", + "mux/smp/It_smp_los_mux_2026.c", + "mux/smp/It_smp_los_mux_2027.c", + "mux/smp/It_smp_los_mux_2028.c", + "mux/smp/It_smp_los_mux_2029.c", ] - - if (LOSCFG_TEST_SMOKE) { - sources += [ - "event/smoke/It_los_event_031.c", - "event/smoke/It_los_event_035.c", - "event/smoke/It_los_event_036.c", - "event/smoke/It_los_event_041.c", - "mux/smoke/It_los_mutex_001.c", - "mux/smoke/It_los_mutex_002.c", - "mux/smoke/It_los_mutex_003.c", - "mux/smoke/It_los_mutex_004.c", - "queue/smoke/It_los_queue_001.c", - "queue/smoke/It_los_queue_097.c", - "queue/smoke/It_los_queue_100.c", - "queue/smoke/It_los_queue_105.c", - "queue/smoke/It_los_queue_head_002.c", - "sem/smoke/It_los_sem_001.c", - "sem/smoke/It_los_sem_003.c", - "sem/smoke/It_los_sem_006.c", - ] - } include_dirs = [ - "../../../include/", "sem", "event", "mux", "queue", ] - cflags = [ "-Wno-error" ] + public_configs = + [ "//kernel/liteos_a/testsuites/kernel:liteos_kernel_test_public" ] } diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_007.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_007.c index 5f68d13a..4e5c132b 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_007.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_007.c @@ -85,7 +85,7 @@ static UINT32 Testcase(VOID) g_testCount = 0; task.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; - task.usTaskPrio = (TASK_PRIO_TEST - 1); + task.usTaskPrio = (TASK_PRIO_TEST_TASK - 1); task.pcName = "VMuteB2_1"; task.uwStackSize = 0x900; task.uwResved = 0; @@ -98,7 +98,7 @@ static UINT32 Testcase(VOID) TestExtraTaskDelay(2); // 2, delay for Timing control. task2.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF02; - task2.usTaskPrio = (TASK_PRIO_TEST - 2); // 2, set reasonable priority. + task2.usTaskPrio = (TASK_PRIO_TEST_TASK - 2); // 2, set reasonable priority. task2.pcName = "VMuteB2_2"; task2.uwStackSize = 0x900; task2.uwResved = 0; @@ -115,8 +115,7 @@ static UINT32 Testcase(VOID) ret = LOS_TaskDelete(g_testTaskID01); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - ret = LOS_TaskDelete(g_testTaskID02); - ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); + LOS_TaskDelete(g_testTaskID02); return LOS_OK; } @@ -130,4 +129,4 @@ VOID ItLosMux007(void) #if __cplusplus } #endif /* __cpluscplus */ -#endif /* __cpluscplus */ +#endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_009.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_009.c index 41f045b2..23c110f9 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_009.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_009.c @@ -58,7 +58,7 @@ static UINT32 Testcase(VOID) g_testCount = 0; task.pfnTaskEntry = (TSK_ENTRY_FUNC)TestHook091; - task.usTaskPrio = (TASK_PRIO_TEST - 1); + task.usTaskPrio = (TASK_PRIO_TEST_TASK - 1); task.pcName = "VMutexB4"; task.uwStackSize = TASK_STACK_SIZE_TEST; task.uwResved = 0; @@ -70,8 +70,7 @@ static UINT32 Testcase(VOID) ret = LOS_MuxDestroy(&g_mutexkernelTest); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - ret = LOS_TaskDelete(g_testTaskID01); - ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); + LOS_TaskDelete(g_testTaskID01); return LOS_OK; } diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_011.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_011.c index 0ad77c4d..fc64f0ab 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_011.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_011.c @@ -67,7 +67,7 @@ static UINT32 Testcase(VOID) g_testCount = 0; task.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; - task.usTaskPrio = (TASK_PRIO_TEST - 1); + task.usTaskPrio = (TASK_PRIO_TEST_TASK - 1); task.pcName = "VMutexB6"; task.uwStackSize = TASK_STACK_SIZE_TEST; task.uwResved = 0; @@ -84,9 +84,7 @@ static UINT32 Testcase(VOID) ret = LOS_MuxDestroy(&g_mutexkernelTest); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - - ret = LOS_TaskDelete(g_testTaskID01); - ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); + LOS_TaskDelete(g_testTaskID01); return LOS_OK; } @@ -100,4 +98,4 @@ VOID ItLosMux011(void) #if __cplusplus } #endif /* __cpluscplus */ -#endif /* __cpluscplus */ \ No newline at end of file +#endif /* __cpluscplus */ diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_012.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_012.c index fc154cdc..01d6a1c0 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_012.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_012.c @@ -71,7 +71,7 @@ static UINT32 Testcase(VOID) g_testCount = 0; task.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; - task.usTaskPrio = (TASK_PRIO_TEST - 1); + task.usTaskPrio = (TASK_PRIO_TEST_TASK - 1); task.pcName = "VMutexB7"; task.uwStackSize = TASK_STACK_SIZE_TEST; task.uwResved = 0; @@ -91,8 +91,7 @@ static UINT32 Testcase(VOID) ret = LOS_MuxDestroy(&g_mutexkernelTest); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - ret = LOS_TaskDelete(g_testTaskID01); - ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); + LOS_TaskDelete(g_testTaskID01); return LOS_OK; } @@ -107,4 +106,4 @@ VOID ItLosMux012(void) #if __cplusplus } #endif /* __cpluscplus */ -#endif /* __cpluscplus */ \ No newline at end of file +#endif /* __cpluscplus */ diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_015.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_015.c index 09337729..ebabcde4 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_015.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_015.c @@ -66,7 +66,7 @@ static VOID TaskF01(void) static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task = { 0 }; + TSK_INIT_PARAM_S task = {0}; ret = LosMuxCreate(&g_mutexkernelTest); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); @@ -74,7 +74,7 @@ static UINT32 Testcase(VOID) g_testCount = 0; task.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; - task.usTaskPrio = (TASK_PRIO_TEST - 1); + task.usTaskPrio = (TASK_PRIO_TEST_TASK - 1); task.pcName = "VMuteB010"; task.uwStackSize = TASK_STACK_SIZE_TEST; task.uwResved = 0; @@ -86,15 +86,14 @@ static UINT32 Testcase(VOID) ret = LOS_MuxUnlock(&g_mutexkernelTest); ICUNIT_ASSERT_EQUAL(ret, EPERM, ret); - LOS_TaskDelay(10); // 10, delay for Timing control. - TestExtraTaskDelay(5); // 5, delay for Timing control. + LOS_TaskDelay(15); // 15, delay for Timing control. ICUNIT_ASSERT_EQUAL(g_testCount, 1, g_testCount); ret = LOS_MuxUnlock(&g_mutexkernelTest); ICUNIT_ASSERT_EQUAL(ret, EPERM, ret); - LOS_TaskDelay(10); // 10, delay for Timing control. + LOS_TaskDelay(20); // 20, delay for Timing control. ret = LOS_MuxUnlock(&g_mutexkernelTest); ICUNIT_ASSERT_EQUAL(ret, EPERM, ret); @@ -104,8 +103,7 @@ static UINT32 Testcase(VOID) ret = LOS_MuxDestroy(&g_mutexkernelTest); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - ret = LOS_TaskDelete(g_testTaskID01); - ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); + LOS_TaskDelete(g_testTaskID01); return LOS_OK; } diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_021.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_021.c index b91b06af..09869413 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_021.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_021.c @@ -60,14 +60,14 @@ static VOID TaskF01(void) VOID TaskF02(void) { UINT32 ret; - TSK_INIT_PARAM_S task1; + TSK_INIT_PARAM_S task1 = {0}; g_testCount++; task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "LosMB2_2"; task1.uwStackSize = TASK_STACK_SIZE_TEST; - task1.usTaskPrio = TASK_PRIO_TEST - 3; // 3, set reasonable priority. + task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; // 3, set reasonable priority. task1.uwResved = 0; #ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); @@ -97,7 +97,7 @@ static UINT32 Testcase(VOID) ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); task.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF02; - task.usTaskPrio = (TASK_PRIO_TEST - 1); + task.usTaskPrio = (TASK_PRIO_TEST_TASK - 1); task.pcName = "LosMB2_1"; task.uwStackSize = 0x900; task.uwResved = 0; @@ -116,8 +116,8 @@ static UINT32 Testcase(VOID) ret = LOS_TaskDelete(g_testTaskID02); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - ret = LOS_TaskDelete(g_testTaskID01); - ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); + + LOS_TaskDelete(g_testTaskID01); return LOS_OK; } @@ -131,4 +131,4 @@ VOID ItLosMux021(void) #if __cplusplus } #endif /* __cpluscplus */ -#endif /* __cpluscplus */ \ No newline at end of file +#endif /* __cpluscplus */ diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_026.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_026.c index edb52dfe..d4d4707c 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_026.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_026.c @@ -52,7 +52,8 @@ static VOID TaskDFunc(VOID) ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); g_testCount++; - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 2, OsCurrTaskGet()->priority); // 2, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 2, priority); // 2, here assert the result. ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 9, g_testCount); // 9, here assert the result. g_testCount++; @@ -73,7 +74,8 @@ static VOID TaskCFunc(VOID) ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); g_testCount++; - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 3, OsCurrTaskGet()->priority); // 3, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 3, priority); // 3, here assert the result. ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 11, g_testCount); // 11, here assert the result. g_testCount++; @@ -96,7 +98,8 @@ static VOID TaskBFunc(VOID) g_testCount++; - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 5, OsCurrTaskGet()->priority); // 5, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 5, priority); // 5, here assert the result. ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 13, g_testCount); // 13, here assert the result. g_testCount++; } @@ -104,7 +107,9 @@ static VOID TaskBFunc(VOID) static VOID TaskAFunc(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1, task2, task3; + TSK_INIT_PARAM_S task1 = { 0 }; + TSK_INIT_PARAM_S task2 = { 0 }; + TSK_INIT_PARAM_S task3 = { 0 }; g_testCount++; @@ -160,22 +165,25 @@ static VOID TaskAFunc(VOID) g_testCount++; ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 8, g_testCount); // 8, here assert the result. -#if 1 // post mutex 3 -> mutex2 -> mutex1 ret = LOS_MuxUnlock(&g_mutexTest3); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 10, g_testCount); // 10, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 3, priority); // 3, here assert the result. + ret = LOS_MuxUnlock(&g_mutexTest2); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 12, g_testCount); // 12, here assert the result. + priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 5, priority); // 5, here assert the result. ret = LOS_MuxUnlock(&g_mutexTest1); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 14, g_testCount); // 14, here assert the result. -#endif ret = LOS_MuxDestroy(&g_mutexTest1); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); @@ -187,20 +195,20 @@ static VOID TaskAFunc(VOID) ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 14, g_testCount); // 14, here assert the result. - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority); // 10, here assert the result. - ICUNIT_ASSERT_EQUAL_VOID(LOS_HighBitGet(OsCurrTaskGet()->priBitMap), LOS_INVALID_BIT_INDEX, - LOS_HighBitGet(OsCurrTaskGet()->priBitMap)); + priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result. } static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task; + TSK_INIT_PARAM_S task = { 0 }; g_testCount = 0; - ICUNIT_ASSERT_EQUAL(OsCurrTaskGet()->priority, 25, OsCurrTaskGet()->priority); // 25, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL(priority, 25, priority); // 25, here assert the result. ret = LosMuxCreate(&g_mutexTest1); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); @@ -216,8 +224,9 @@ static UINT32 Testcase(VOID) ret = LOS_TaskCreate(&g_testTaskID01, &task); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - ICUNIT_ASSERT_EQUAL(g_testCount, 14, g_testCount); // 14, here assert the result. - ICUNIT_ASSERT_EQUAL(OsCurrTaskGet()->priority, 25, OsCurrTaskGet()->priority); // 25, here assert the result. + ICUNIT_ASSERT_EQUAL(g_testCount, 14, g_testCount); // 14, here assert the result. + priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL(priority, 25, priority); // 25, here assert the result. return LOS_OK; } diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_027.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_027.c index 01db9295..f825b878 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_027.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_027.c @@ -52,8 +52,8 @@ static VOID TaskD1Func(VOID) g_testCount++; ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 5, g_testCount); // 5, here assert the result. - - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 2, OsCurrTaskGet()->priority); // 2, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 2, priority); // 2, here assert the result. g_testCount++; } @@ -72,7 +72,8 @@ static VOID TaskC1Func(VOID) ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 6, g_testCount); // 6, here assert the result. - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 3, OsCurrTaskGet()->priority); // 3, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 3, priority); // 3, here assert the result. g_testCount++; } @@ -91,14 +92,17 @@ static VOID TaskB1Func(VOID) ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 7, g_testCount); // 7, here assert the result. - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 5, OsCurrTaskGet()->priority); // 5, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 5, priority); // 5, here assert the result. g_testCount++; } static VOID TaskA1Func(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1, task2, task3; + TSK_INIT_PARAM_S task1 = {0}; + TSK_INIT_PARAM_S task2 = {0}; + TSK_INIT_PARAM_S task3 = {0}; g_testCount++; ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 1, g_testCount); @@ -147,9 +151,8 @@ static VOID TaskA1Func(VOID) ret = LOS_MuxDestroy(&g_mutexTest1); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority); // 10, here assert the result. - ICUNIT_ASSERT_EQUAL_VOID(LOS_HighBitGet(OsCurrTaskGet()->priBitMap), LOS_INVALID_BIT_INDEX, - LOS_HighBitGet(OsCurrTaskGet()->priBitMap)); + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result. ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 8, g_testCount); // 8, here assert the result. } @@ -157,7 +160,7 @@ static VOID TaskA1Func(VOID) static UINT32 Testcase(void) { UINT32 ret; - TSK_INIT_PARAM_S task; + TSK_INIT_PARAM_S task = {0}; g_testCount = 0; ret = LosMuxCreate(&g_mutexTest1); @@ -175,7 +178,8 @@ static UINT32 Testcase(void) ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); ICUNIT_ASSERT_EQUAL(g_testCount, 8, g_testCount); // 8, here assert the result. - ICUNIT_ASSERT_EQUAL(OsCurrTaskGet()->priority, 25, OsCurrTaskGet()->priority); // 25, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL(priority, 25, priority); // 25, here assert the result. return LOS_OK; } diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_028.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_028.c index 6e367d5a..52bbb8cc 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_028.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_028.c @@ -50,7 +50,8 @@ static VOID TaskD2Func(VOID) ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 6, g_testCount); // 6, here assert the result. - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority); // 10, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result. g_testCount++; } @@ -67,7 +68,8 @@ static VOID TaskC2Func(VOID) ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 5, g_testCount); // 5, here assert the result. - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority); // 10, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result. g_testCount++; } @@ -84,14 +86,17 @@ static VOID TaskB2Func(VOID) ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 4, g_testCount); // 4, here assert the result. - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority); // 10, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result. g_testCount++; } static VOID TaskA2Func(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1, task2, task3; + TSK_INIT_PARAM_S task1 = {0}; + TSK_INIT_PARAM_S task2 = {0}; + TSK_INIT_PARAM_S task3 = {0}; g_testCount++; ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 1, g_testCount); @@ -142,9 +147,8 @@ static VOID TaskA2Func(VOID) ret = LOS_MuxDestroy(&g_mutexTest1); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority); // 10, here assert the result. - ICUNIT_ASSERT_EQUAL_VOID(LOS_HighBitGet(OsCurrTaskGet()->priBitMap), LOS_INVALID_BIT_INDEX, - LOS_HighBitGet(OsCurrTaskGet()->priBitMap)); + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result. ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 8, g_testCount); // 8, here assert the result. g_testCount++; } @@ -153,7 +157,7 @@ static VOID TaskA2Func(VOID) static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task; + TSK_INIT_PARAM_S task = {0}; g_testCount = 0; ret = LosMuxCreate(&g_mutexTest1); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_029.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_029.c index a46e0e36..7037fb86 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_029.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_029.c @@ -53,14 +53,15 @@ static VOID TaskD3Func(VOID) g_testCount++; ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 6, g_testCount); // 6, here assert the result. - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 2, OsCurrTaskGet()->priority); // 2, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 2, priority); // 2, here assert the result. g_testCount++; } static VOID TaskC3Func(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; + TSK_INIT_PARAM_S task1 = {0}; g_testCount++; ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 3, g_testCount); // 3, here assert the result. @@ -94,7 +95,8 @@ static VOID TaskC3Func(VOID) ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 7, g_testCount); // 7, here assert the result. - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 3, OsCurrTaskGet()->priority); // 3, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 3, priority); // 3, here assert the result. g_testCount++; } @@ -111,14 +113,16 @@ static VOID TaskB3Func(VOID) ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 8, g_testCount); // 8, here assert the result. - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 5, OsCurrTaskGet()->priority); // 5, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 5, priority); // 5, here assert the result. g_testCount++; } static VOID TaskA3Func(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1, task2, task3; + TSK_INIT_PARAM_S task1 = {0}; + TSK_INIT_PARAM_S task2 = {0}; g_testCount++; ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 1, g_testCount); @@ -158,16 +162,15 @@ static VOID TaskA3Func(VOID) ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 9, g_testCount); // 9, here assert the result. - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority); // 10, here assert the result. - ICUNIT_ASSERT_EQUAL_VOID(LOS_HighBitGet(OsCurrTaskGet()->priBitMap), LOS_INVALID_BIT_INDEX, - LOS_HighBitGet(OsCurrTaskGet()->priBitMap)); + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result. g_testCount++; } static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task; + TSK_INIT_PARAM_S task = {0}; g_testCount = 0; ret = LosMuxCreate(&g_mutexTest1); @@ -185,7 +188,8 @@ static UINT32 Testcase(VOID) ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); ICUNIT_ASSERT_EQUAL(g_testCount, 10, g_testCount); // 10, here assert the result. - ICUNIT_ASSERT_EQUAL(OsCurrTaskGet()->priority, 25, OsCurrTaskGet()->priority); // 25, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL(priority, 25, priority); // 25, here assert the result. return LOS_OK; } diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_031.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_031.c index dde87d11..ccd01cb9 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_031.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_031.c @@ -52,7 +52,8 @@ static VOID TaskD5Func(VOID) ret = LOS_MuxUnlock(&g_mutexTest2); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 2, OsCurrTaskGet()->priority); // 2, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 2, priority); // 2, here assert the result. ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 5, g_testCount); // 5, here assert the result. g_testCount++; } @@ -72,7 +73,8 @@ static VOID TaskC5Func(VOID) ret = LOS_MuxUnlock(&g_mutexTest2); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 3, OsCurrTaskGet()->priority); // 3, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 3, priority); // 3, here assert the result. ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 6, g_testCount); // 6, here assert the result. g_testCount++; @@ -93,7 +95,8 @@ static VOID TaskB5Func(VOID) ret = LOS_MuxUnlock(&g_mutexTest1); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 5, OsCurrTaskGet()->priority); // 5, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 5, priority); // 5, here assert the result. g_testCount++; } @@ -150,17 +153,16 @@ static VOID TaskA5Func(VOID) g_testCount++; ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 5, g_testCount); // 5, here assert the result. - ret = LOS_MuxUnlock(&g_mutexTest1); - ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); - - ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 5, g_testCount); // 5, here assert the result. - ret = LOS_MuxUnlock(&g_mutexTest2); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); - ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority); // 10, here assert the result. - ICUNIT_ASSERT_EQUAL_VOID(LOS_HighBitGet(OsCurrTaskGet()->priBitMap), LOS_INVALID_BIT_INDEX, - LOS_HighBitGet(OsCurrTaskGet()->priBitMap)); + ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 7, g_testCount); // 5, here assert the result. + + ret = LOS_MuxUnlock(&g_mutexTest1); + ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); + + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result. ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 8, g_testCount); // 8, here assert the result. g_testCount++; } @@ -168,7 +170,7 @@ static VOID TaskA5Func(VOID) static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task; + TSK_INIT_PARAM_S task = {0}; g_testCount = 0; ret = LosMuxCreate(&g_mutexTest1); @@ -196,7 +198,8 @@ static UINT32 Testcase(VOID) ICUNIT_ASSERT_EQUAL(g_testCount, 9, g_testCount); // 9, here assert the result. - ICUNIT_ASSERT_EQUAL(OsCurrTaskGet()->priority, 25, OsCurrTaskGet()->priority); // 25, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL(priority, 25, priority); // 25, here assert the result. return LOS_OK; } diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_035.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_035.c index db1e4f62..f5290e71 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_035.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_035.c @@ -87,7 +87,7 @@ static VOID TaskService3Func(VOID) static VOID TaskMisc10Func(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1, task2, task3; + TSK_INIT_PARAM_S task1 = {0}; g_testCount++; ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 1, g_testCount); @@ -99,7 +99,7 @@ static VOID TaskMisc10Func(VOID) task1.usTaskPrio = 3; // 3, set reasonable priority. task1.pcName = "TaskService_3"; task1.uwStackSize = LOS_TASK_MIN_STACK_SIZE; - task1.uwResved = 0; + task1.uwResved = LOS_TASK_ATTR_JOINABLE; #ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -120,7 +120,7 @@ static VOID TaskMisc10Func(VOID) static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task; + TSK_INIT_PARAM_S task = {0}; g_testCount = 0; ret = LosMuxCreate(&g_mutexTest1); @@ -133,7 +133,7 @@ static UINT32 Testcase(VOID) task.usTaskPrio = 10; // 10, set reasonable priority. task.pcName = "TaskMisc_10"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; - task.uwResved = 0; + task.uwResved = LOS_TASK_ATTR_JOINABLE; #ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -145,7 +145,7 @@ static UINT32 Testcase(VOID) task.usTaskPrio = 2; // 2, set reasonable priority. task.pcName = "TaskFe_2"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; - task.uwResved = 0; + task.uwResved = LOS_TASK_ATTR_JOINABLE; #ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -163,6 +163,7 @@ static UINT32 Testcase(VOID) ret = LOS_MuxDestroy(&g_mutexTest2); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); + OsShellCmdTskInfoGet(0xffffffff, NULL, 0); // 10, here assert the result. ICUNIT_GOTO_EQUAL(LOS_TaskPriGet(g_testTaskID01), 10, LOS_TaskPriGet(g_testTaskID01), EXIT); // 3, here assert the result. @@ -170,11 +171,11 @@ static UINT32 Testcase(VOID) // 2, here assert the result. ICUNIT_GOTO_EQUAL(LOS_TaskPriGet(g_testTaskID03), 2, LOS_TaskPriGet(g_testTaskID03), EXIT); EXIT: - ret = LOS_TaskDelete(g_testTaskID01); + ret = LOS_TaskJoin(g_testTaskID01, NULL); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - ret = LOS_TaskDelete(g_testTaskID02); + ret = LOS_TaskJoin(g_testTaskID02, NULL); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - ret = LOS_TaskDelete(g_testTaskID03); + ret = LOS_TaskJoin(g_testTaskID03, NULL); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); return LOS_OK; diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_036.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_036.c index a050575e..1241fd36 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_036.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_036.c @@ -75,7 +75,7 @@ static VOID TaskService5Func(VOID) static VOID TaskMisc10Func(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1, task2, task3; + TSK_INIT_PARAM_S task1 = {0}; g_testCount++; ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 1, g_testCount); @@ -86,7 +86,7 @@ static VOID TaskMisc10Func(VOID) task1.usTaskPrio = 5; // 5, set reasonable priority. task1.pcName = "TaskService_5"; task1.uwStackSize = LOS_TASK_MIN_STACK_SIZE; - task1.uwResved = 0; + task1.uwResved = LOS_TASK_ATTR_JOINABLE; #ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -107,7 +107,7 @@ static VOID TaskMisc10Func(VOID) static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task; + TSK_INIT_PARAM_S task = {0}; g_testCount = 0; ret = LosMuxCreate(&g_mutexTest1); @@ -117,7 +117,7 @@ static UINT32 Testcase(VOID) task.usTaskPrio = 10; // 10, set reasonable priority. task.pcName = "TaskMisc_10"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; - task.uwResved = 0; + task.uwResved = LOS_TASK_ATTR_JOINABLE; #ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -131,7 +131,7 @@ static UINT32 Testcase(VOID) task.usTaskPrio = 4; // 4, set reasonable priority. task.pcName = "TaskFe_4"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; - task.uwResved = 0; + task.uwResved = LOS_TASK_ATTR_JOINABLE; #ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -153,11 +153,11 @@ static UINT32 Testcase(VOID) ICUNIT_GOTO_EQUAL(LOS_TaskPriGet(g_testTaskID03), 4, LOS_TaskPriGet(g_testTaskID03), EXIT); EXIT: - ret = LOS_TaskDelete(g_testTaskID01); + ret = LOS_TaskJoin(g_testTaskID01, NULL); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - ret = LOS_TaskDelete(g_testTaskID02); + ret = LOS_TaskJoin(g_testTaskID02, NULL); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - ret = LOS_TaskDelete(g_testTaskID03); + ret = LOS_TaskJoin(g_testTaskID03, NULL); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); return LOS_OK; } diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_037.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_037.c index e0cf203b..a1db4fce 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_037.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_037.c @@ -60,7 +60,6 @@ static VOID TaskFe4Func(VOID) static VOID TaskMisc10Func(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1, task2, task3; g_testCount++; for (INT32 i = 0; i < OS_MUX_NUM; i++) { @@ -77,7 +76,7 @@ static VOID TaskMisc10Func(VOID) static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task; + TSK_INIT_PARAM_S task = {0}; g_testCount = 0; g_testMux = LOS_MemAlloc(m_aucSysMem0, OS_MUX_NUM * sizeof(LosMux)); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_038.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_038.c index a4560186..5f079ef1 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_038.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_038.c @@ -60,7 +60,6 @@ static VOID TaskFe4Func(VOID) static VOID TaskMisc10Func(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1, task2, task3; g_testCount++; for (INT32 i = 0; i < OS_MUX_NUM; i++) { @@ -76,7 +75,7 @@ static VOID TaskMisc10Func(VOID) static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task; + TSK_INIT_PARAM_S task = {0}; g_testCount = 0; ret = LosMuxCreate(&g_testMux1); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_039.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_039.c index 63d13309..fc024814 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_039.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_039.c @@ -66,7 +66,6 @@ static VOID TaskFe4Func(VOID) static VOID TaskMisc10Func(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1, task2, task3; g_testCount++; @@ -87,7 +86,7 @@ static VOID TaskMisc10Func(VOID) static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task; + TSK_INIT_PARAM_S task = {0}; g_testCount = 0; ret = LosMuxCreate(&g_testMux1); @@ -158,7 +157,8 @@ EXIT: ret = LOS_MuxUnlock(&g_testMux2); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - ICUNIT_ASSERT_EQUAL(OsCurrTaskGet()->priority, TASK_PRIO_TEST, OsCurrTaskGet()->priority); + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL(priority, TASK_PRIO_TEST_TASK, priority); ret = LOS_MuxDestroy(&g_testMux1); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_040.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_040.c index e362c7fe..16f0a76c 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_040.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_040.c @@ -63,7 +63,7 @@ static VOID TaskFe7Func(VOID) ret = LOS_MuxLock(&g_testMux1, LOS_WAIT_FOREVER); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); - ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 19, g_testCount); // 19, here assert the result. + ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 21, g_testCount); // 21, here assert the result. g_testCount++; return; } @@ -79,13 +79,13 @@ static VOID TaskFe8Func(VOID) ret = LOS_MuxLock(&g_testMux3, LOS_WAIT_FOREVER); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); - ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 20, g_testCount); // 20, here assert the result. + ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 18, g_testCount); // 18, here assert the result. g_testCount++; ret = LOS_MuxLock(&g_testMux1, LOS_WAIT_FOREVER); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); - ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 21, g_testCount); // 21, here assert the result. + ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 22, g_testCount); // 22, here assert the result. g_testCount++; return; } @@ -100,7 +100,7 @@ static VOID TaskFe9Func(VOID) ret = LOS_MuxLock(&g_testMux2, LOS_WAIT_FOREVER); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); - ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 22, g_testCount); // 22, here assert the result. + ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 19, g_testCount); // 19, here assert the result. g_testCount++; ret = LOS_MuxLock(&g_testMux1, LOS_WAIT_FOREVER); @@ -114,7 +114,6 @@ static VOID TaskFe9Func(VOID) static VOID TaskMisc10Func(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1, task2, task3; g_testCount++; @@ -174,7 +173,7 @@ static VOID TaskMisc10Func(VOID) static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task; + TSK_INIT_PARAM_S task = {0}; g_testCount = 0; ret = LosMuxCreate(&g_testMux1); @@ -257,7 +256,7 @@ static UINT32 Testcase(VOID) ret = LOS_TaskDelete(g_testTaskID01); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - ICUNIT_GOTO_EQUAL(g_testCount, 18, g_testCount, EXIT); // 18, here assert the result. + ICUNIT_GOTO_EQUAL(g_testCount, 20, g_testCount, EXIT); // 20, here assert the result. g_testCount++; ret = LOS_MuxUnlock(&g_testMux1); @@ -286,7 +285,8 @@ EXIT: ret = LOS_MuxUnlock(&g_testMux4); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - ICUNIT_ASSERT_EQUAL(OsCurrTaskGet()->priority, TASK_PRIO_TEST, OsCurrTaskGet()->priority); + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_ASSERT_EQUAL(priority, TASK_PRIO_TEST_TASK, priority); ret = LOS_MuxDestroy(&g_testMux1); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_041.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_041.c index 4fb84b90..f36ffe68 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_041.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_041.c @@ -45,11 +45,9 @@ static UINT32 g_mainTaskID; static VOID TaskMisc10Func(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1, task2, task3; - LosTaskCB *taskCB = OS_TCB_FROM_TID(g_mainTaskID); g_testCount++; - ret = LOS_MuxLock(&g_testMux1, 10); // 10, init mutex. + ret = LOS_MuxLock(&g_testMux1, 100); // 100, init mutex. ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_ETIMEDOUT, ret); ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 3, g_testCount); // 3, here assert the result. @@ -58,14 +56,13 @@ static VOID TaskMisc10Func(VOID) return; } - static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S taskParam; + TSK_INIT_PARAM_S taskParam = {0}; g_testCount = 0; LosTaskCB *task = NULL; - UINT16 prio = OsCurrTaskGet()->priority; + UINT16 prio = LOS_TaskPriGet(OsCurrTaskGet()->taskID); g_mainTaskID = OsCurrTaskGet()->taskID; ret = LosMuxCreate(&g_testMux1); @@ -88,11 +85,12 @@ static UINT32 Testcase(VOID) ret = LOS_TaskCreate(&g_testTaskID01, &taskParam); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - ICUNIT_GOTO_EQUAL(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority, EXIT); // 10, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_GOTO_EQUAL(priority, 10, priority, EXIT); // 10, here assert the result. ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT); // 2, here assert the result. g_testCount++; - LOS_TaskDelay(11); // 11, set delay time. + LOS_TaskDelay(110); // 110, set delay time. ICUNIT_GOTO_EQUAL(g_testCount, 4, g_testCount, EXIT); // 4, here assert the result. g_testCount++; @@ -100,7 +98,8 @@ static UINT32 Testcase(VOID) ret = LOS_MuxUnlock(&g_testMux1); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - ICUNIT_GOTO_EQUAL(OsCurrTaskGet()->priority, prio, OsCurrTaskGet()->priority, EXIT); + priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_GOTO_EQUAL(priority, prio, priority, EXIT); EXIT: LOS_MuxUnlock(&g_testMux1); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_042.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_042.c index f0cdfc3d..2126ec0c 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_042.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_042.c @@ -61,14 +61,13 @@ static VOID TaskFe4Func(VOID) static VOID TaskMisc10Func(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1, task2, task3; - LosTaskCB *taskCB = OS_TCB_FROM_TID(g_mainTaskID); g_testCount++; - ret = LOS_MuxLock(&g_testMux1, 10); // 10, init mutex. + ret = LOS_MuxLock(&g_testMux1, 100); // 100, init mutex. ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_ETIMEDOUT, ret); - ICUNIT_ASSERT_EQUAL_VOID(taskCB->priority, 4, taskCB->priority); // 4, here assert the result. + UINT16 priority = LOS_TaskPriGet(g_mainTaskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 4, priority); // 4, here assert the result. ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 6, g_testCount); // 6, here assert the result. g_testCount++; @@ -79,10 +78,10 @@ static VOID TaskMisc10Func(VOID) static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S taskParam; + TSK_INIT_PARAM_S taskParam = {0}; g_testCount = 0; LosTaskCB *task = NULL; - UINT16 prio = OsCurrTaskGet()->priority; + UINT16 prio = LOS_TaskPriGet(OsCurrTaskGet()->taskID); g_mainTaskID = OsCurrTaskGet()->taskID; ret = LosMuxCreate(&g_testMux1); @@ -106,7 +105,8 @@ static UINT32 Testcase(VOID) ret = LOS_TaskCreate(&g_testTaskID01, &taskParam); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - ICUNIT_GOTO_EQUAL(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority, EXIT); // 10, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_GOTO_EQUAL(priority, 10, priority, EXIT); // 10, here assert the result. ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT); // 3, here assert the result. g_testCount++; @@ -122,11 +122,12 @@ static UINT32 Testcase(VOID) ret = LOS_TaskCreate(&g_testTaskID03, &taskParam); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - ICUNIT_GOTO_EQUAL(OsCurrTaskGet()->priority, 4, OsCurrTaskGet()->priority, EXIT); // 4, here assert the result. + priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_GOTO_EQUAL(priority, 4, priority, EXIT); // 4, here assert the result. ICUNIT_GOTO_EQUAL(g_testCount, 5, g_testCount, EXIT); // 5, here assert the result. g_testCount++; - LOS_TaskDelay(11); // 11, set delay time. + LOS_TaskDelay(200); // 200, set delay time. ICUNIT_GOTO_EQUAL(g_testCount, 7, g_testCount, EXIT); // 7, here assert the result. g_testCount++; @@ -134,7 +135,8 @@ static UINT32 Testcase(VOID) ret = LOS_MuxUnlock(&g_testMux1); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - ICUNIT_GOTO_EQUAL(OsCurrTaskGet()->priority, prio, OsCurrTaskGet()->priority, EXIT); + priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_GOTO_EQUAL(priority, prio, priority, EXIT); ret = LOS_MuxLock(&g_testMux1, LOS_WAIT_FOREVER); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_043.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_043.c index 41324aef..685e5aa3 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_043.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_043.c @@ -46,7 +46,6 @@ static UINT32 g_mainTaskID; static VOID TaskFe4Func(VOID) { UINT32 ret; - LosTaskCB *taskCB = OS_TCB_FROM_TID(g_mainTaskID); ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 4, g_testCount); // 4, here assert the result. g_testCount++; @@ -54,7 +53,8 @@ static VOID TaskFe4Func(VOID) ret = LOS_MuxLock(&g_testMux2, LOS_WAIT_FOREVER); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); - ICUNIT_ASSERT_EQUAL_VOID(taskCB->priority, 10, taskCB->priority); // 10, here assert the result. + UINT16 priority = LOS_TaskPriGet(g_mainTaskID); + ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result. ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 6, g_testCount); // 6, here assert the result. g_testCount++; @@ -67,8 +67,6 @@ static VOID TaskFe4Func(VOID) static VOID TaskMisc10Func(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1, task2, task3; - LosTaskCB *taskCB = OS_TCB_FROM_TID(g_mainTaskID); g_testCount++; ret = LOS_MuxLock(&g_testMux1, LOS_WAIT_FOREVER); @@ -86,12 +84,12 @@ static VOID TaskMisc10Func(VOID) static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S taskParam; + TSK_INIT_PARAM_S taskParam = { 0 }; g_testCount = 0; LosTaskCB *task = NULL; LosMuxAttr attr = { 0 }; - UINT16 prio = OsCurrTaskGet()->priority; + UINT16 prio = LOS_TaskPriGet(OsCurrTaskGet()->taskID); g_mainTaskID = OsCurrTaskGet()->taskID; ret = LosMuxCreate(&g_testMux1); @@ -127,7 +125,8 @@ static UINT32 Testcase(VOID) ret = LOS_TaskCreate(&g_testTaskID01, &taskParam); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - ICUNIT_GOTO_EQUAL(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority, EXIT); // 10, here assert the result. + UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_GOTO_EQUAL(priority, 10, priority, EXIT); // 10, here assert the result. ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT); // 3, here assert the result. g_testCount++; @@ -143,7 +142,8 @@ static UINT32 Testcase(VOID) ret = LOS_TaskCreate(&g_testTaskID03, &taskParam); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - ICUNIT_GOTO_EQUAL(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority, EXIT); // 10, here assert the result. + priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_GOTO_EQUAL(priority, 10, priority, EXIT); // 10, here assert the result. ICUNIT_GOTO_EQUAL(g_testCount, 5, g_testCount, EXIT); // 5, here assert the result. g_testCount++; @@ -156,7 +156,8 @@ static UINT32 Testcase(VOID) ret = LOS_MuxUnlock(&g_testMux1); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - ICUNIT_GOTO_EQUAL(OsCurrTaskGet()->priority, prio, OsCurrTaskGet()->priority, EXIT); + priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID); + ICUNIT_GOTO_EQUAL(priority, prio, priority, EXIT); ICUNIT_GOTO_EQUAL(g_testCount, 9, g_testCount, EXIT); // 9, here assert the result. diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_001.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_001.c index 679c594f..55b27696 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_001.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_001.c @@ -67,7 +67,7 @@ static UINT32 Testcase(VOID) task.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01; task.pcName = "Test Case 1"; task.uwStackSize = TASK_STACK_SIZE_TEST; - task.usTaskPrio = TASK_PRIO_TEST; + task.usTaskPrio = TASK_PRIO_TEST_TASK; task.uwResved = LOS_TASK_STATUS_DETACHED; task.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_002.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_002.c index a862d1da..7f8215d1 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_002.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_002.c @@ -64,7 +64,7 @@ static UINT32 Testcase(VOID) task.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01; task.pcName = "Test Case 1"; task.uwStackSize = TASK_STACK_SIZE_TEST; - task.usTaskPrio = TASK_PRIO_TEST; + task.usTaskPrio = TASK_PRIO_TEST_TASK; task.uwResved = LOS_TASK_STATUS_DETACHED; task.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_003.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_003.c index 9c5304ae..48dab1f0 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_003.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_003.c @@ -78,7 +78,7 @@ static UINT32 Testcase(VOID) task.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01; task.pcName = "Test Case 1"; task.uwStackSize = TASK_STACK_SIZE_TEST; - task.usTaskPrio = TASK_PRIO_TEST; + task.usTaskPrio = TASK_PRIO_TEST_TASK; task.uwResved = LOS_TASK_STATUS_DETACHED; task.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_004.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_004.c index c953130b..a7a0f1ff 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_004.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_004.c @@ -61,7 +61,7 @@ static UINT32 Testcase(VOID) task.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01; task.pcName = "Test Case 1"; task.uwStackSize = TASK_STACK_SIZE_TEST; - task.usTaskPrio = TASK_PRIO_TEST; + task.usTaskPrio = TASK_PRIO_TEST_TASK; task.uwResved = LOS_TASK_STATUS_DETACHED; task.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_005.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_005.c index 5af5b2c9..886278e9 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_005.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_005.c @@ -64,7 +64,7 @@ static UINT32 Testcase(VOID) task.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01; task.pcName = "Test Case 1"; task.uwStackSize = TASK_STACK_SIZE_TEST; - task.usTaskPrio = TASK_PRIO_TEST; + task.usTaskPrio = TASK_PRIO_TEST_TASK; task.uwResved = LOS_TASK_STATUS_DETACHED; task.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2001.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2001.c index c867725d..d9b9860b 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2001.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2001.c @@ -55,14 +55,14 @@ static VOID TaskF01(VOID) static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; ret = LosMuxCreate(&g_mutexkernelTest); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2002.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2002.c index 63f06ba0..16df543b 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2002.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2002.c @@ -55,7 +55,7 @@ static VOID TaskF01(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; @@ -64,7 +64,7 @@ static UINT32 Testcase(VOID) ret = LosMuxCreate(&g_mutexkernelTest); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2003.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2003.c index 7b374af5..94127af4 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2003.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2003.c @@ -55,7 +55,7 @@ static VOID HwiF01(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2004.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2004.c index 63b33689..67286fa6 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2004.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2004.c @@ -56,14 +56,14 @@ static VOID TaskF01(VOID) static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; ret = LosMuxCreate(&g_mutexkernelTest); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2005.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2005.c index 60dd6694..2794a3da 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2005.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2005.c @@ -82,7 +82,7 @@ static VOID TaskF02(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; @@ -91,12 +91,12 @@ static UINT32 Testcase(VOID) currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_005_task2", TaskF02, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_005_task2", TaskF02, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID02, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_005_task1", TaskF01, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_005_task1", TaskF01, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2006.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2006.c index dc871546..674998bf 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2006.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2006.c @@ -67,7 +67,7 @@ static VOID TaskF01(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; g_runFlag = 1; @@ -77,7 +77,7 @@ static UINT32 Testcase(VOID) currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_006_task1", TaskF01, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_006_task1", TaskF01, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2007.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2007.c index d5a33896..6a5f871b 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2007.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2007.c @@ -72,7 +72,7 @@ static VOID TaskF02(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; @@ -82,12 +82,12 @@ static UINT32 Testcase(VOID) currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM); // 2, set reasonable priority. - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_007_task1", TaskF01, TASK_PRIO_TEST - 2, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_007_task1", TaskF01, TASK_PRIO_TEST_TASK - 2, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_007_task2", TaskF02, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_007_task2", TaskF02, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID02, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2008.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2008.c index 069edf33..1c65cf77 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2008.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2008.c @@ -56,7 +56,7 @@ static VOID HwiF01(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2009.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2009.c index 195de233..4769261d 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2009.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2009.c @@ -72,7 +72,7 @@ static VOID HwiF01(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; @@ -86,7 +86,7 @@ static UINT32 Testcase(VOID) currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_009_task", TaskF01, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_009_task", TaskF01, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2010.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2010.c index cbc9a074..7debeca2 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2010.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2010.c @@ -58,7 +58,7 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; @@ -68,7 +68,7 @@ static UINT32 Testcase(VOID) ret = LOS_MuxLock(&g_mutexkernelTest, LOS_WAIT_FOREVER); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_010_task1", TaskF01, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_010_task1", TaskF01, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2011.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2011.c index bd21a827..c1f5ddc8 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2011.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2011.c @@ -79,7 +79,7 @@ static VOID TaskF01(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; @@ -88,7 +88,7 @@ static UINT32 Testcase(VOID) currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_011_task2", TaskF02, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_011_task2", TaskF02, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID02, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); @@ -97,7 +97,7 @@ static UINT32 Testcase(VOID) __asm__ volatile("nop"); } while (g_testCount != 1); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_011_task1", TaskF01, TASK_PRIO_TEST + 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_011_task1", TaskF01, TASK_PRIO_TEST_TASK + 1, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2012.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2012.c index 7eeff1b0..9650daa5 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2012.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2012.c @@ -96,7 +96,7 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; @@ -110,7 +110,7 @@ static UINT32 Testcase(VOID) HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2012_task1", TaskF02, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2012_task1", TaskF02, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID02, &testTask); @@ -119,7 +119,7 @@ static UINT32 Testcase(VOID) TestAssertBusyTaskDelay(100, 2); // 100, 2, delay for Timing control. ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT); // 2, here assert the result. - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2012_task2", TaskF01, TASK_PRIO_TEST + 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2012_task2", TaskF01, TASK_PRIO_TEST_TASK + 1, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2013.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2013.c index 7a3b4575..13561559 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2013.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2013.c @@ -75,7 +75,7 @@ static VOID TaskF02(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; @@ -87,14 +87,14 @@ static UINT32 Testcase(VOID) currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_013_task1", TaskF01, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_013_task1", TaskF01, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_013_task2", TaskF02, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_013_task2", TaskF02, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID02, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2014.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2014.c index 8ccdcd6d..4c25064f 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2014.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2014.c @@ -81,7 +81,7 @@ static VOID TaskF01(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; @@ -90,7 +90,7 @@ static UINT32 Testcase(VOID) currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_014_task2", TaskF02, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_014_task2", TaskF02, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID02, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); @@ -99,7 +99,7 @@ static UINT32 Testcase(VOID) __asm__ volatile("nop"); } while (g_testCount != 1); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_014_task1", TaskF01, TASK_PRIO_TEST + 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_014_task1", TaskF01, TASK_PRIO_TEST_TASK + 1, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2015.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2015.c index f57e6eac..a1d94ed9 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2015.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2015.c @@ -97,7 +97,7 @@ static VOID HwiF02(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; @@ -115,7 +115,7 @@ static UINT32 Testcase(VOID) HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu HalIrqSetAffinity(HWI_NUM_TEST1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2015_task2", TaskF02, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2015_task2", TaskF02, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID02, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); @@ -124,7 +124,7 @@ static UINT32 Testcase(VOID) __asm__ volatile("nop"); } while (g_testCount != 2); // 2, wait until g_testCount == 2. - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2015_task1", TaskF01, TASK_PRIO_TEST + 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2015_task1", TaskF01, TASK_PRIO_TEST_TASK + 1, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2016.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2016.c index f57bf84e..7b0444e3 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2016.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2016.c @@ -55,7 +55,7 @@ static VOID TaskF01(VOID) static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; @@ -65,7 +65,7 @@ static UINT32 Testcase(VOID) ret = LOS_MuxLock(&g_mutexkernelTest, LOS_WAIT_FOREVER); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2017.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2017.c index 728f25ce..43e52e94 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2017.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2017.c @@ -55,7 +55,7 @@ static VOID TaskF01(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; @@ -67,7 +67,7 @@ static UINT32 Testcase(VOID) currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); @@ -94,7 +94,7 @@ static UINT32 Testcase(VOID) ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT); EXIT: - LOS_TaskPriSet(g_testTskHandle, TASK_PRIO_TEST); // recovery test task's prio + LOS_TaskPriSet(g_testTskHandle, TASK_PRIO_TEST_TASK); // recovery test task's prio LOS_TaskDelete(g_testTaskID01); ret = LOS_MuxDestroy(&g_mutexkernelTest); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2018.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2018.c index 2d0a3287..0ecc5bca 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2018.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2018.c @@ -86,7 +86,7 @@ static VOID TaskF02(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; g_flag1 = 1; @@ -100,12 +100,12 @@ static UINT32 Testcase(VOID) currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2018_task1", TaskF01, TASK_PRIO_TEST + 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2018_task1", TaskF01, TASK_PRIO_TEST_TASK + 1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2018_task2", TaskF02, TASK_PRIO_TEST + 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2018_task2", TaskF02, TASK_PRIO_TEST_TASK + 1, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu, low prio ret = LOS_TaskCreate(&g_testTaskID02, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2021.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2021.c index 20fb6c50..919a0570 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2021.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2021.c @@ -59,7 +59,7 @@ static VOID TaskF01(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; @@ -71,7 +71,7 @@ static UINT32 Testcase(VOID) ret = LOS_MuxLock(&g_mutexkernelTest, LOS_WAIT_FOREVER); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_021_task", TaskF01, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_021_task", TaskF01, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2022.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2022.c index 7c6f7460..d9d13bff 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2022.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2022.c @@ -50,7 +50,7 @@ static VOID HwiF01(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2024.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2024.c index 31f903d5..6b922233 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2024.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2024.c @@ -62,7 +62,7 @@ static VOID TaskF02(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; @@ -74,7 +74,7 @@ static UINT32 Testcase(VOID) currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_014_task2", TaskF02, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_014_task2", TaskF02, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID02, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2025.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2025.c index eb007781..958a97d1 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2025.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2025.c @@ -55,7 +55,7 @@ static VOID HwiF01(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2026.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2026.c index 95fd8a97..8b410a54 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2026.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2026.c @@ -77,7 +77,7 @@ static VOID TaskF02(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid, i, uvIntSave; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; @@ -90,7 +90,7 @@ static UINT32 Testcase(VOID) currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM); // 3, set reasonable priority. - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2026_task2", TaskF02, TASK_PRIO_TEST - 3, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2026_task2", TaskF02, TASK_PRIO_TEST_TASK - 3, CPUID_TO_AFFI_MASK(currCpuid)); // let the task f02 pend mux first ret = LOS_TaskCreate(&g_testTaskID02, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); @@ -98,7 +98,7 @@ static UINT32 Testcase(VOID) TestAssertBusyTaskDelay(100, 1); // 100, delay for Timing control. ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2026_task1", TaskF01, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2026_task1", TaskF01, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2027.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2027.c index 9fa9a020..cf145ddb 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2027.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2027.c @@ -77,7 +77,7 @@ static VOID TaskF02(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid, i; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; g_runFlag = 1; @@ -90,12 +90,12 @@ static UINT32 Testcase(VOID) currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_sem_034_task1", TaskF01, TASK_PRIO_TEST - 2, // 2, set reasonable priority. + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_sem_034_task1", TaskF01, TASK_PRIO_TEST_TASK - 2, // 2, set reasonable priority. CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID02, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_sem_034_task2", TaskF02, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_sem_034_task2", TaskF02, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2028.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2028.c index b513a57c..5b0abe3d 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2028.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2028.c @@ -65,7 +65,7 @@ static VOID TaskF01(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid, i, j; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; for (i = 0; i < LOOP; i++) { g_testCount = 0; @@ -78,7 +78,7 @@ static UINT32 Testcase(VOID) currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_mux_028_task", TaskF01, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_mux_028_task", TaskF01, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); @@ -108,7 +108,7 @@ static UINT32 Testcase(VOID) } EXIT: - LOS_TaskPriSet(g_testTskHandle, TASK_PRIO_TEST); // recovery test task's prio + LOS_TaskPriSet(g_testTskHandle, TASK_PRIO_TEST_TASK); // recovery test task's prio LOS_TaskDelete(g_testTaskID01); LOS_MuxDestroy(&g_mutexkernelTest); return LOS_OK; diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2029.c b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2029.c index e66a65f0..6e7dae6e 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2029.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2029.c @@ -76,7 +76,7 @@ static VOID TaskF02(VOID) static UINT32 Testcase(VOID) { UINT32 ret, currCpuid, i, j; - TSK_INIT_PARAM_S testTask; + TSK_INIT_PARAM_S testTask = {0}; g_testCount = 0; currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM); @@ -89,12 +89,12 @@ static UINT32 Testcase(VOID) ret = LOS_MuxLock(&g_mutexkernelTest, LOS_WAIT_FOREVER); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_smp_event_037_task1", TaskF01, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_smp_event_037_task1", TaskF01, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu ret = LOS_TaskCreate(&g_testTaskID01, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - TEST_TASK_PARAM_INIT_AFFI(testTask, "it_smp_event_037_task2", TaskF02, TASK_PRIO_TEST - 1, + TEST_TASK_PARAM_INIT_AFFI(testTask, "it_smp_event_037_task2", TaskF02, TASK_PRIO_TEST_TASK - 1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu ret = LOS_TaskCreate(&g_testTaskID02, &testTask); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); @@ -123,8 +123,6 @@ static UINT32 Testcase(VOID) PRINT_DEBUG("g_testCount = %d ,g_ret = 0x%x\n", g_testCount, g_ret); - ret = OS_TCB_FROM_TID(g_testTaskID02)->taskStatus; - ICUNIT_GOTO_NOT_EQUAL(ret & OS_TASK_STATUS_UNUSED, 0, ret, EXIT); LOS_MuxDestroy(&g_mutexkernelTest); } EXIT: diff --git a/testsuites/kernel/src/osTest.c b/testsuites/kernel/src/osTest.c index 1e5458b5..38437458 100644 --- a/testsuites/kernel/src/osTest.c +++ b/testsuites/kernel/src/osTest.c @@ -46,6 +46,7 @@ #include "los_mux_pri.h" #include "los_queue_pri.h" #include "los_swtmr_pri.h" +#include "los_init.h" #ifdef __cplusplus #if __cplusplus @@ -234,6 +235,7 @@ UINT32 SwtmrCountGetTest(VOID) (VOID)LOS_IntRestore(intSave); return swTmrCnt; } + #ifdef TEST1980 VOID TestHwiTrigger(unsigned int irq) { @@ -294,7 +296,6 @@ VOID TestBusyTaskDelay(UINT32 tick) if (runtime <= TestTickCountByCurrCpuid()) { break; } - WFI; } } @@ -307,7 +308,6 @@ VOID TestAssertBusyTaskDelay(UINT32 timeout, UINT32 flag) if ((runtime <= TestTickCountGet()) || (g_testCount == flag)) { break; } - WFI; } } @@ -372,33 +372,12 @@ NOK: } #endif - -VOID TestKernelBaseCore(VOID) -{ -#if defined(LOSCFG_TEST_KERNEL_BASE_CORE) - ItSuiteLosTask(); - ItSuiteLosSwtmr(); - ItSuiteSmpHwi(); - ItSuiteHwiNesting(); -#endif -} - -VOID TestKernelBaseIpc(VOID) -{ -#if defined(LOSCFG_TEST_KERNEL_BASE_IPC) - ItSuiteLosEvent(); - ItSuiteLosMux(); - ItSuiteLosSem(); - ItSuiteLosQueue(); -#endif -} - VOID TestKernelBase(VOID) { - #if defined(LOSCFG_TEST_KERNEL_BASE) - TestKernelBaseCore(); - TestKernelBaseIpc(); + ItSuiteLosTask(); + ItSuiteLosSwtmr(); + ItSuiteLosMux(); #endif } @@ -450,20 +429,10 @@ VOID TestReset(VOID) #endif } -VOID TestTaskEntry(UINT32 param1, UINT32 param2, UINT32 param3, UINT32 param4) +VOID TestTaskEntry(VOID) { UINT32 i; - INT32 ret = LOS_SetProcessScheduler(LOS_GetCurrProcessID(), LOS_SCHED_RR, 20); // 20, set a reasonable priority. - if (ret != LOS_OK) { - dprintf("%s set test process schedule failed! %d\n", ret); - } - - ret = LOS_SetTaskScheduler(LOS_CurTaskIDGet(), LOS_SCHED_RR, TASK_PRIO_TEST); - if (ret != LOS_OK) { - dprintf("%s set test task schedule failed! %d\n", ret); - } - g_testCircleCount = 0; dprintf("\t\n --- Test start--- \n"); @@ -474,7 +443,6 @@ VOID TestTaskEntry(UINT32 param1, UINT32 param2, UINT32 param3, UINT32 param4) LOS_MemAlloc(OS_SYS_MEM_ADDR, status.uwTotalFreeSize - memusedfirst); #endif -#if defined(LOSCFG_TEST) for (i = 0; i < 1; i++) { g_testCircleCount++; ICunitInit(); @@ -483,7 +451,7 @@ VOID TestTaskEntry(UINT32 param1, UINT32 param2, UINT32 param3, UINT32 param4) TestKernelBase(); TestPosix(); -#if (TEST_MODULE_CHECK == 1) && defined(LOSCFG_TEST) +#if (TEST_MODULE_CHECK == 1) for (int i = 0; i < g_modelNum - 1; i++) { if (g_executModelNum[i] != 0) { dprintf("\nExecuted Model: %s, Executed Model_Num: %d ,failed_count: %d , sucess_count :%d", @@ -512,29 +480,27 @@ VOID TestTaskEntry(UINT32 param1, UINT32 param2, UINT32 param3, UINT32 param4) g_passResult); } LOS_Msleep(200); // 200, delay. -#endif dprintf("\t\n --- Test End--- \n"); } -void TestSystemInit(void) +static void TestSystemInit(void) { - INT32 pid; - LosProcessCB *testProcess = NULL; + TSK_INIT_PARAM_S sysTask; - InitRebootHook(); - - pid = LOS_Fork(0, "IT_TST_INI", (TSK_ENTRY_FUNC)TestTaskEntry, 0x30000); - if (pid < 0) { - return; - } - - testProcess = OS_PCB_FROM_PID(pid); - g_testTskHandle = testProcess->threadGroupID; + (VOID)memset_s(&sysTask, sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + sysTask.pfnTaskEntry = (TSK_ENTRY_FUNC)TestTaskEntry; + sysTask.uwStackSize = 0x3000; /* 0x3000: stack size */ + sysTask.pcName = "TestTask"; + sysTask.usTaskPrio = TASK_PRIO_TEST_TASK; + sysTask.uwResved = LOS_TASK_ATTR_JOINABLE; #ifdef LOSCFG_KERNEL_SMP - ((LosTaskCB *)OS_TCB_FROM_TID(g_testTskHandle))->cpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); + sysTask.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif + LOS_TaskCreate(&g_testTskHandle, &sysTask); } +LOS_MODULE_INIT(TestSystemInit, LOS_INIT_LEVEL_KMOD_TASK); + #ifdef __cplusplus #if __cplusplus }