!1037 fix: 修复拼写错误

Merge pull request !1037 from Wang Jikai/master

arch/risc-v/riscv32/gcc/los_arch_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2020, Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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,6 +43,10 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
+#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 0)
+#error "LOSCFG_PLATFORM_HWI_WITH_ARG must be set to 1 !!!"
+#endif
+
 /**
  * @ingroup  los_arch_interrupt
  * Define the type of a hardware interrupt vector table function.

arch/risc-v/riscv32/gcc/los_interrupt.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2020, Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -167,6 +167,7 @@ LITE_OS_SEC_TEXT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
                                       HWI_PROC_FUNC hwiHandler,
                                       HwiIrqParam *irqParam)
 {
+    (VOID)hwiMode;
     UINT32 intSave;
 
     if (hwiHandler == NULL) {
@@ -283,7 +284,7 @@ STATIC VOID ExcInfoDisplayContext(const LosExcInfo *exc)
     ExcBackTrace(taskContext->s0);
 }
 
-STATIC VOID ExcInfoDisplay(const LosExcContext *excBufAddr)
+STATIC VOID ExcInfoDisplay(VOID)
 {
     PRINTK("\nException Information     \n");
 
@@ -305,6 +306,11 @@ STATIC VOID ExcInfoDisplay(const LosExcContext *excBufAddr)
 
 WEAK UINT32 HalUnalignedAccessFix(UINTPTR mcause, UINTPTR mepc, UINTPTR mtval, VOID *sp)
 {
+    (VOID)mcause;
+    (VOID)mepc;
+    (VOID)mtval;
+    (VOID)sp;
+
     /* Unaligned access fixes are not supported by default */
     PRINTK("Unaligned access fixes are not supported by default!\n");
     return LOS_NOK;
@@ -329,7 +335,7 @@ VOID HalExcEntry(const LosExcContext *excBufAddr)
         }
     }
 
-    ExcInfoDisplay(excBufAddr);
+    ExcInfoDisplay();
 
     if (LOS_TaskIsRunning()) {
         PRINTK("----------------All Task information ------------\n");

components/net/lwip-2.1/enhancement/src/fixme.c

@@ -125,7 +125,7 @@ int ip6addr_aton(const char *cp, ip6_addr_t *addr)
     int squash_pos = ipv6_blocks;
     int i;
     const unsigned char *sc = (const unsigned char *)cp;
-    const char *ss = cp-1;
+    const unsigned char *ss = (const unsigned char *)(cp - 1);
 
     for (; ; sc++) {
         if (current_block_index >= ipv6_blocks) {
@@ -142,7 +142,7 @@ int ip6addr_aton(const char *cp, ip6_addr_t *addr)
             break;
         } else if (*sc == ':') {
             if (sc - ss == 1) {
-                if (sc != cp || sc[1] != ':') {
+                if (sc != (const unsigned char *)cp || sc[1] != ':') {
                     return 0; // address begins with a single ':' or contains ":::"
                 } // else address begins with one valid "::"
             } else {
@@ -163,7 +163,7 @@ int ip6addr_aton(const char *cp, ip6_addr_t *addr)
 #if LWIP_IPV4
         } else if (*sc == '.' && current_block_index < ipv6_blocks - 1) {
             ip4_addr_t ip4;
-            int ret = ip4addr_aton(ss+1, &ip4);
+            int ret = ip4addr_aton((const char *)(ss + 1), &ip4);
             if (!ret) {
                 return 0;
             }

components/net/lwip-2.1/porting/src/api_shell.c

@@ -79,7 +79,7 @@ struct ifconfig_option {
     unsigned char ethaddr[6];
     u16_t mtu;
     /* when using telnet, print to the telnet socket will result in system  */
-    /* deadlock. So we cahe the prinf data to a buf, and when the tcpip      */
+    /* deadlock. So we cache the prinf data to a buf, and when the tcpip      */
     /* callback returns, then print the data out to the telnet socket       */
     sys_sem_t cb_completed;
     char cb_print_buf[PRINT_BUF_LEN];
@@ -319,7 +319,7 @@ LWIP_STATIC int OsPingFunc(u32_t *parg)
     u32_t succ_cnt = 0;
     u32_t failed_cnt = 0;
     struct timespec start, end;
-    long timout_ms;
+    long timeout_ms;
     struct pollfd pfd;
     long rtt;
     int ret = 0;
@@ -431,17 +431,17 @@ LWIP_STATIC int OsPingFunc(u32_t *parg)
                 ((ICMPH_TYPE(iecho_resp) == ICMP_ECHO) && (iphdr_resp->src.addr == to.sin_addr.s_addr))) {
                 /* second type timeout event */
                 (void)clock_gettime(CLOCK_MONOTONIC_RAW, &end);
-                timout_ms = ((end.tv_sec - start.tv_sec) * OS_SYS_MS_PER_SECOND + \
+                timeout_ms = ((end.tv_sec - start.tv_sec) * OS_SYS_MS_PER_SECOND + \
                              (end.tv_nsec - start.tv_nsec) / OS_SYS_NS_PER_MS);
-                timout_ms = LWIP_SHELL_CMD_PING_TIMEOUT - timout_ms;
+                timeout_ms = LWIP_SHELL_CMD_PING_TIMEOUT - timeout_ms;
             } else {
-                timout_ms = 0;
+                timeout_ms = 0;
                 break;
             }
-        } while (timout_ms >= 0);
+        } while (timeout_ms >= 0);
 
         /* all timeout events are true timeout */
-        if ((timout_ms < 0) || (timeout_flag == TRUE)) {
+        if ((timeout_ms < 0) || (timeout_flag == TRUE)) {
             failed_cnt++;
             i++;
             PRINTK("\nPing: destination unreachable ...");

kal/libc/newlib/porting/include/semaphore.h

@@ -49,6 +49,7 @@ typedef struct {
 int    sem_init(sem_t *sem, int shared, unsigned value);
 int    sem_destroy(sem_t *sem);
 int    sem_wait(sem_t *sem);
+int    sem_trywait(sem_t *sem);
 int    sem_post(sem_t *sem);
 int    sem_timedwait(sem_t *__restrict sem, const struct timespec *__restrict timeout);
 int    sem_getvalue(sem_t *__restrict sem, int *__restrict currVal);

kal/libc/newlib/porting/include/sys/features.h

@@ -50,6 +50,7 @@
 #define _POSIX_THREAD_PRIORITY_SCHEDULING
 #define _UNIX98_THREAD_MUTEX_ATTRIBUTES
 #define _POSIX_THREAD_PROCESS_SHARED
+#define _POSIX_PRIORITY_SCHEDULING
 
 #include_next <sys/features.h>
 

kal/posix/BUILD.gn

@@ -35,6 +35,7 @@ kernel_module(module_name) {
   sources = [
     "src/errno.c",
     "src/libc.c",
+    "src/map_error.c",
   ]
   configs += [ "$LITEOSTOPDIR:warn_config" ]
 

kal/posix/src/map_error.c

@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2023-2023 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.
+ */
+
+#include "los_mux.h"
+#include "los_queue.h"
+#include "los_sem.h"
+#include "los_task.h"
+#include <errno.h>
+
+INT32 map_errno(UINT32 err)
+{
+    if (err == LOS_OK) {
+        return 0;
+    }
+    switch (err) {
+        case LOS_ERRNO_QUEUE_INVALID:
+        case LOS_ERRNO_QUEUE_WRITE_PTR_NULL:
+        case LOS_ERRNO_QUEUE_WRITESIZE_ISZERO:
+        case LOS_ERRNO_QUEUE_SIZE_TOO_BIG:
+        case LOS_ERRNO_QUEUE_CREAT_PTR_NULL:
+        case LOS_ERRNO_QUEUE_PARA_ISZERO:
+        case LOS_ERRNO_QUEUE_WRITE_SIZE_TOO_BIG:
+        case LOS_ERRNO_TSK_ID_INVALID:
+        case LOS_ERRNO_TSK_PTR_NULL:
+        case LOS_ERRNO_TSK_NAME_EMPTY:
+        case LOS_ERRNO_TSK_ENTRY_NULL:
+        case LOS_ERRNO_TSK_PRIOR_ERROR:
+        case LOS_ERRNO_TSK_STKSZ_TOO_LARGE:
+        case LOS_ERRNO_TSK_STKSZ_TOO_SMALL:
+        case LOS_ERRNO_TSK_NOT_CREATED:
+        case OS_ERROR:
+        case LOS_ERRNO_SEM_INVALID:
+        case LOS_ERRNO_SEM_UNAVAILABLE:
+            errno = EINVAL;
+            break;
+        case LOS_ERRNO_QUEUE_ISFULL:
+        case LOS_ERRNO_QUEUE_ISEMPTY:
+            errno = EAGAIN;
+            break;
+        case LOS_ERRNO_QUEUE_CREATE_NO_MEMORY:
+        case LOS_ERRNO_TSK_TCB_UNAVAILABLE:
+        case LOS_ERRNO_SEM_ALL_BUSY:
+            errno = ENOSPC;
+            break;
+        case LOS_ERRNO_QUEUE_TIMEOUT:
+        case LOS_ERRNO_SEM_TIMEOUT:
+            errno = ETIMEDOUT;
+            break;
+        case LOS_ERRNO_QUEUE_CB_UNAVAILABLE:
+            errno = ENFILE;
+            break;
+        case LOS_ERRNO_QUEUE_READ_IN_INTERRUPT:
+        case LOS_ERRNO_QUEUE_WRITE_IN_INTERRUPT:
+        case LOS_ERRNO_SEM_PEND_INTERR:
+            errno = EINTR;
+            break;
+        case LOS_ERRNO_TSK_NO_MEMORY:
+        case LOS_ERRNO_SEM_OVERFLOW:
+            errno = ENOMEM;
+            break;
+        case LOS_ERRNO_SEM_PENDED:
+            errno = EBUSY;
+            break;
+        case LOS_ERRNO_SEM_PEND_IN_LOCK:
+            errno = EPERM;
+            break;
+        default:
+            errno = EINVAL;
+            break;
+    }
+    return errno;
+}
+

kal/posix/src/map_error.h

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2023-2023 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.
+ */
+
+#ifndef _POSIX_MAP_ERROR_H
+#define _POSIX_MAP_ERROR_H
+
+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
+INT32 map_errno(UINT32 err);
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
+#endif

kal/posix/src/pthread.c

@@ -40,6 +40,7 @@
 #include "los_config.h"
 #include "los_task.h"
 #include "los_debug.h"
+#include "map_error.h"
 
 #define PTHREAD_DEFAULT_NAME     "pthread"
 #define PTHREAD_DEFAULT_NAME_LEN 8
@@ -207,9 +208,10 @@ int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
         return ret;
     }
 
-    if (LOS_TaskCreateOnly(&taskID, &taskInitParam) != LOS_OK) {
+    ret = LOS_TaskCreateOnly(&taskID, &taskInitParam);
+    if (ret != LOS_OK) {
         free((VOID *)(UINTPTR)taskInitParam.uwArg);
-        return EINVAL;
+        return map_errno(ret);
     }
 
     PthreadData *pthreadData = (PthreadData *)taskInitParam.uwArg;
@@ -221,10 +223,10 @@ int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
     LOS_ListAdd(&g_pthreadListHead, &pthreadData->threadList);
     LOS_IntRestore(intSave);
 
-    (void)LOS_TaskResume(taskID);
-
     *thread = (pthread_t)taskID;
 
+    (void)LOS_TaskResume(taskID);
+
     return 0;
 }
 

kal/posix/src/pthread_cond.c

@@ -303,7 +303,6 @@ int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
         PRINT_ERR("%s: %d failed\n", __FUNCTION__, __LINE__);
     }
 
-    (VOID)LOS_EventClear(&(cond->event), 0);
     ret = (INT32)LOS_EventRead(&(cond->event), 0x0f, LOS_WAITMODE_OR | LOS_WAITMODE_CLR, (UINT32)absTicks);
 
     if (pthread_mutex_lock(mutex) != 0) {

kernel/src/los_init.c

@@ -37,6 +37,7 @@
 #include "los_mux.h"
 #include "los_queue.h"
 #include "los_sem.h"
+#include "securec.h"
 
 #if (LOSCFG_PLATFORM_HWI == 1)
 #include "los_interrupt.h"
@@ -95,6 +96,8 @@
 #include "los_trace_pri.h"
 #endif
 
+#define BUFSIZE 256
+
 /*****************************************************************************
  Function    : LOS_Reboot
  Description : system exception, die in here, wait for watchdog.
@@ -110,10 +113,15 @@ LITE_OS_SEC_TEXT_INIT VOID LOS_Reboot(VOID)
 
 LITE_OS_SEC_TEXT_INIT VOID LOS_Panic(const CHAR *fmt, ...)
 {
+    char buf[BUFSIZE] = { 0 };
     va_list ap;
     va_start(ap, fmt);
-    PRINT_ERR(fmt, ap);
+    int len = vsnprintf_s(buf, sizeof(buf), BUFSIZE - 1, fmt, ap);
     va_end(ap);
+    if (len > 0) {
+        PRINT_ERR("%s\n", buf);
+    }
+    OsDoExcHook(EXC_PANIC);
 #if (LOSCFG_BACKTRACE_TYPE != 0)
     LOS_BackTrace();
 #endif

kernel/src/los_task.c

@@ -256,9 +256,9 @@ UINT32 OsGetTaskWaterLine(UINT32 taskID)
 }
 
 #if (LOSCFG_BASE_CORE_CPUP == 1)
-LITE_OS_SEC_TEXT_MINOR UINT32 OsGetAllTskCpupInfo(CPUP_INFO_S **cpuLessOneSec,
-                                                  CPUP_INFO_S **cpuTenSec,
-                                                  CPUP_INFO_S **cpuOneSec)
+STATIC UINT32 GetAllTskCpupInfo(CPUP_INFO_S **cpuLessOneSec,
+                                CPUP_INFO_S **cpuTenSec,
+                                CPUP_INFO_S **cpuOneSec)
 {
     if ((cpuLessOneSec == NULL) || (cpuTenSec == NULL) || (cpuOneSec == NULL)) {
         return OS_ERROR;
@@ -304,7 +304,26 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsGetAllTskCpupInfo(CPUP_INFO_S **cpuLessOneSec,
 }
 #endif
 
-LITE_OS_SEC_TEXT_MINOR VOID OsPrintAllTskInfoHeader(VOID)
+STATIC VOID PrintTskInfo(const LosTaskCB *taskCB)
+{
+    UINT32 semID;
+
+    if (taskCB->taskStatus & OS_TASK_STATUS_EXIT) {
+        PRINTK("%4u%9u%10s%#10x%#10x%#11x%#11x%#10x%#7x",
+               taskCB->taskID, taskCB->priority, OsConvertTskStatus(taskCB->taskStatus),
+               taskCB->stackSize, 0, 0, 0, 0, 0);
+        return;
+    }
+
+    semID = (taskCB->taskSem == NULL) ? OS_NULL_SHORT : (((LosSemCB *)taskCB->taskSem)->semID);
+    PRINTK("%4u%9u%10s%#10x%#10x%#11x%#11x%#10x%#7x",
+           taskCB->taskID, taskCB->priority, OsConvertTskStatus(taskCB->taskStatus),
+           taskCB->stackSize, OsGetTaskWaterLine(taskCB->taskID),
+           (UINT32)(UINTPTR)taskCB->stackPointer, taskCB->topOfStack, taskCB->eventMask, semID);
+    return;
+}
+
+STATIC VOID PrintTskInfoHeader(VOID)
 {
     PRINTK("\r\n TID  Priority   Status StackSize WaterLine StackPoint TopOfStack EventMask  SemID");
 #if (LOSCFG_TASK_MEM_USED == 1)
@@ -341,7 +360,6 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsGetAllTskInfo(VOID)
 #if (LOSCFG_KERNEL_PRINTF != 0)
     LosTaskCB    *taskCB = (LosTaskCB *)NULL;
     UINT32       loopNum;
-    UINT32       semID;
 #if (LOSCFG_BASE_CORE_CPUP == 1)
     CPUP_INFO_S *cpuLessOneSec = (CPUP_INFO_S *)NULL;
     CPUP_INFO_S *cpuTenSec = (CPUP_INFO_S *)NULL;
@@ -354,12 +372,12 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsGetAllTskInfo(VOID)
 #endif
 
 #if (LOSCFG_BASE_CORE_CPUP == 1)
-    if (OsGetAllTskCpupInfo(&cpuLessOneSec, &cpuTenSec, &cpuOneSec) != LOS_OK) {
+    if (GetAllTskCpupInfo(&cpuLessOneSec, &cpuTenSec, &cpuOneSec) != LOS_OK) {
         return OS_ERROR;
     }
-#endif
+#endif /* LOSCFG_BASE_CORE_CPUP */
 
-    OsPrintAllTskInfoHeader();
+    PrintTskInfoHeader();
 
     for (loopNum = 0; loopNum < g_taskMaxNum; loopNum++) {
         taskCB = (((LosTaskCB *)g_taskCBArray) + loopNum);
@@ -367,11 +385,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsGetAllTskInfo(VOID)
             continue;
         }
 
-        semID = (taskCB->taskSem == NULL) ? OS_NULL_SHORT : (((LosSemCB *)taskCB->taskSem)->semID);
-        PRINTK("%4u%9u%10s%#10x%#10x%#11x%#11x%#10x%#7x",
-               taskCB->taskID, taskCB->priority, OsConvertTskStatus(taskCB->taskStatus),
-               taskCB->stackSize, OsGetTaskWaterLine(taskCB->taskID),
-               (UINT32)(UINTPTR)taskCB->stackPointer, taskCB->topOfStack, taskCB->eventMask, semID);
+        PrintTskInfo(taskCB);
 #if (LOSCFG_TASK_MEM_USED == 1)
         PRINTK("%#10x", g_taskMemUsed[loopNum]);
 #endif

testsuites/BUILD.gn

@@ -27,6 +27,7 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
 import("//kernel/liteos_m/liteos.gni")
 
 config("include") {
@@ -36,6 +37,8 @@ config("include") {
   if (defined(LOSCFG_KERNEL_TEST_FULL)) {
     defines += [ "LOS_KERNEL_TEST_FULL=1" ]
   }
+  cflags = warn_config_cflags
+  asmflags = warn_config_asmflags
 }
 
 module_switch = defined(LOSCFG_TEST)

testsuites/sample/kernel/queue/It_los_queue_static_001.c

@@ -39,7 +39,7 @@ static UINT32 Testcase(VOID)
     CHAR buff2[QUEUE_SHORT_BUFFER_LENGTH] = "";
     CHAR buff3[QUEUE_SHORT_BUFFER_LENGTH] = {0};
 
-    ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, &g_testQueueID01, buff3, 0, QUEUE_BASE_MSGSIZE);
+    ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, &g_testQueueID01, (UINT8 *)buff3, 0, QUEUE_BASE_MSGSIZE);
     ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
 
     ret = LOS_QueueWrite(g_testQueueID01, &buff1, QUEUE_BASE_MSGSIZE, 0);

testsuites/sample/kernel/queue/It_los_queue_static_002.c

@@ -43,7 +43,7 @@ static UINT32 Testcase(VOID)
 
     g_testQueueID01 = QUEUW_INVALID_VALUE;
 
-    ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, &g_testQueueID01, buff3, 0, 0);
+    ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, &g_testQueueID01, (UINT8 *)buff3, 0, 0);
     ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_QUEUE_PARA_ISZERO, ret, EXIT);
 
     ret = LOS_QueueWrite(g_testQueueID01, &buff1, QUEUE_BASE_MSGSIZE, 0);

testsuites/sample/kernel/queue/It_los_queue_static_003.c

@@ -39,7 +39,7 @@ static UINT32 Testcase(VOID)
     CHAR buff2[QUEUE_SHORT_BUFFER_LENGTH] = "";
     CHAR buff3[QUEUE_SHORT_BUFFER_LENGTH] = {0};
 
-    ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, &g_testQueueID01, buff3, 0, 1);
+    ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, &g_testQueueID01, (UINT8 *)buff3, 0, 1);
     ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
 
     ret = LOS_QueueWrite(g_testQueueID01, &buff1, QUEUE_BASE_MSGSIZE, 0);

testsuites/sample/kernel/queue/It_los_queue_static_006.c

@@ -43,7 +43,7 @@ static UINT32 Testcase(VOID)
 
     g_testQueueID01 = QUEUW_INVALID_VALUE;
 
-    ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, NULL, buff3, 0, QUEUE_BASE_MSGSIZE);
+    ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, NULL, (UINT8 *)buff3, 0, QUEUE_BASE_MSGSIZE);
     ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_QUEUE_CREAT_PTR_NULL, ret, EXIT);
 
     ret = LOS_QueueWrite(g_testQueueID01, &buff1, QUEUE_BASE_MSGSIZE, 0);

testsuites/sample/posix/mqueue/It_posix_queue.h

@@ -108,6 +108,7 @@ extern VOID ItSuitePosixMqueue(VOID);
 extern UINT32 PosixPthreadInit(pthread_attr_t *attr, int pri);
 extern UINT32 PosixPthreadDestroy(pthread_attr_t *attr, pthread_t thread);
 extern VOID TestAssertWaitDelay(UINT32 *testCount, UINT32 flag);
+extern void TestExtraTaskDelay(UINT32 tick);
 
 VOID ItPosixQueue001(VOID);
 VOID ItPosixQueue002(VOID);

testsuites/sample/posix/pthread/It_posix_pthread.h

@@ -64,7 +64,6 @@
 #define PTHREAD_EXISTED_SEM_NUM SEM_EXISTED_NUM
 
 /* We are testing conformance to IEEE Std 1003.1, 2003 Edition */
-#define _POSIX_C_SOURCE 200112L
 
 #define PRIORITY_OTHER (-1)
 #define PRIORITY_FIFO 20

testsuites/unittest/posix/BUILD.gn

@@ -71,8 +71,8 @@ static_library("posix_test") {
 
   if (!defined(LOSCFG_COMPILER_ICCARM)) {
     cflags = [
-      "-Wno-error",
       "-Wno-unused-function",
+      "-Wno-int-conversion",
     ]
   } else {
     cflags = [ "--no_warnings" ]

testsuites/unittest/posix/src/ctype/tolower_test.c

@@ -76,7 +76,7 @@ LITE_TEST_CASE(PosixCTypeTolowerTest, testCTypeTolower001, Function | MediumTest
     if (ret == 'a') {
         LOG("[DEMO] posix ctype test case 1:tolower(%c)==%c ok.\n", a, ret);
     } else {
-        LOG("[DEMO] posix ctype test case 1:tolower(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 1:tolower(%c)!=%c  fail.\n", a, ret);
     }
     TEST_ASSERT_TRUE(ret == 'a');
     return 0;
@@ -94,7 +94,7 @@ LITE_TEST_CASE(PosixCTypeTolowerTest, testCTypeTolower002, Function | MediumTest
     if (ret == 'a') {
         LOG("[DEMO] posix ctype test case 2:tolower(%c)==%c ok.\n", a, ret);
     } else {
-        LOG("[DEMO] posix ctype test case 2:tolower(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 2:tolower(%c)!=%c  fail.\n", a, ret);
     }
     TEST_ASSERT_TRUE(ret == 'a');
     return 0;
@@ -112,7 +112,7 @@ LITE_TEST_CASE(PosixCTypeTolowerTest, testCTypeTolower003, Function | MediumTest
     if (ret == 'z') {
         LOG("[DEMO] posix ctype test case 3:tolower(%c)==%c ok.\n", a, ret);
     } else {
-        LOG("[DEMO] posix ctype test case 3:tolower(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 3:tolower(%c)!=%c  fail.\n", a, ret);
     }
     TEST_ASSERT_TRUE(ret == 'z');
     return 0;
@@ -130,7 +130,7 @@ LITE_TEST_CASE(PosixCTypeTolowerTest, testCTypeTolower004, Function | MediumTest
     if (ret == 'z') {
         LOG("[DEMO] posix ctype test case 4:tolower(%c)==%c ok.\n", a, ret);
     } else {
-        LOG("[DEMO] posix ctype test case 4:tolower(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 4:tolower(%c)!=%c  fail.\n", a, ret);
     }
     TEST_ASSERT_TRUE(ret == 'z');
     return 0;
@@ -148,7 +148,7 @@ LITE_TEST_CASE(PosixCTypeTolowerTest, testCTypeTolower005, Function | MediumTest
     if (ret == '1') {
         LOG("[DEMO] posix ctype test case 5(except):tolower(%c)==%c ok.\n", a, ret);
     } else {
-        LOG("[DEMO] posix ctype test case 5(except):tolower(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 5(except):tolower(%c)!=%c  fail.\n", a, ret);
     }
     TEST_ASSERT_TRUE(ret == '1');
     return 0;

testsuites/unittest/posix/src/ctype/toupper_test.c

@@ -76,7 +76,7 @@ LITE_TEST_CASE(PosixCTypeToupperTest, testCTypeToupper001, Function | MediumTest
     if (ret == 'A') {
         LOG("[DEMO] posix ctype test case 1:toupper(%c)==%c ok.\n", a, ret);
     } else {
-        LOG("[DEMO] posix ctype test case 1:toupper(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 1:toupper(%c)!=%c  fail.\n", a, ret);
     }
     TEST_ASSERT_TRUE(ret == 'A');
     return 0;
@@ -94,7 +94,7 @@ LITE_TEST_CASE(PosixCTypeToupperTest, testCTypeToupper002, Function | MediumTest
     if (ret == 'A') {
         LOG("[DEMO] posix ctype test case 2:toupper(%c)==%c ok.\n", a, ret);
     } else {
-        LOG("[DEMO] posix ctype test case 2:toupper(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 2:toupper(%c)!=%c  fail.\n", a, ret);
     }
     TEST_ASSERT_TRUE(ret == 'A');
     return 0;
@@ -112,7 +112,7 @@ LITE_TEST_CASE(PosixCTypeToupperTest, testCTypeToupper003, Function | MediumTest
     if (ret == 'Z') {
         LOG("[DEMO] posix ctype test case 3:toupper(%c)==%c ok.\n", a, ret);
     } else {
-        LOG("[DEMO] posix ctype test case 3:toupper(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 3:toupper(%c)!=%c  fail.\n", a, ret);
     }
     TEST_ASSERT_TRUE(ret == 'Z');
     return 0;
@@ -130,7 +130,7 @@ LITE_TEST_CASE(PosixCTypeToupperTest, testCTypeToupper004, Function | MediumTest
     if (ret == 'Z') {
         LOG("[DEMO] posix ctype test case 4:toupper(%c)==%c ok.\n", a, ret);
     } else {
-        LOG("[DEMO] posix ctype test case 4:toupper(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 4:toupper(%c)!=%c  fail.\n", a, ret);
     }
     TEST_ASSERT_TRUE(ret == 'Z');
     return 0;
@@ -148,7 +148,7 @@ LITE_TEST_CASE(PosixCTypeToupperTest, testCTypeToupper005, Function | MediumTest
     if (ret == '1') {
         LOG("[DEMO] posix ctype test case 5(except):toupper(%c)==%c ok.\n", a, ret);
     } else {
-        LOG("[DEMO] posix ctype test case 5(except):toupper(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 5(except):toupper(%c)!=%c  fail.\n", a, ret);
     }
     TEST_ASSERT_TRUE(ret == '1');
     return 0;

testsuites/unittest/posix/src/semaphore/semaphore_func_test.c

@@ -71,7 +71,7 @@ static BOOL PosixSemaphoreFuncTestSuiteTearDown(void)
 // get cur-time plus ms
 struct timespec GetDelayedTime(unsigned int ms)
 {
-    LOG("GetDelayedTime ms = %lu", ms);
+    LOG("GetDelayedTime ms = %u", ms);
     struct timespec ts = { 0 };
     const unsigned int nsecPerSec = 1000000000;
     const unsigned int nsecPerMs = 1000000;
@@ -91,7 +91,7 @@ int GetTimeDiff(struct timespec ts1, struct timespec ts2)
     const int nsecPerMs = 1000000;
     int ms = (ts1.tv_sec - ts2.tv_sec) * nsecPerSec + (ts1.tv_nsec - ts2.tv_nsec);
     ms = ms / nsecPerMs;
-    LOG("different result: %ld (ms)", ms);
+    LOG("different result: %d (ms)", ms);
     return ms;
 }
 
@@ -109,7 +109,7 @@ LITE_TEST_CASE(PosixSemaphoreFuncTestSuite, testIpcSem_Timedwait001, Function |
     TEST_ASSERT_EQUAL_INT(0, sem_init((sem_t *)&sem, 0, 0));
 
     ts = GetDelayedTime(100);
-    LOG("predicted time:%lld, %d", ts.tv_sec, ts.tv_nsec);
+    LOG("predicted time:%lld, %ld", ts.tv_sec, ts.tv_nsec);
     if (sem_timedwait((sem_t *)&sem, &ts) == -1) {
         TEST_ASSERT_EQUAL_INT(ETIMEDOUT, errno);
     } else {
@@ -117,7 +117,7 @@ LITE_TEST_CASE(PosixSemaphoreFuncTestSuite, testIpcSem_Timedwait001, Function |
     }
 
     clock_gettime(CLOCK_REALTIME, &tsNow);
-    LOG("tsNow %lld, %d", tsNow.tv_sec, tsNow.tv_nsec);
+    LOG("tsNow %lld, %ld", tsNow.tv_sec, tsNow.tv_nsec);
     int timeDiff = GetTimeDiff(tsNow, ts); // calculate time different
     LOG("timeDiff %d", timeDiff);
     TEST_ASSERT_LESS_THAN_INT(20, abs(timeDiff));
@@ -141,26 +141,26 @@ LITE_TEST_CASE(PosixSemaphoreFuncTestSuite, testIpcSem_Timedwait002, Function |
     TEST_ASSERT_EQUAL_INT(0, sem_init((sem_t *)&sem, 0, 1));
 
     ts = GetDelayedTime(100);
-    LOG("\n ts %lld, %d", ts.tv_sec, ts.tv_nsec);
+    LOG("\n ts %lld, %ld", ts.tv_sec, ts.tv_nsec);
     clock_gettime(CLOCK_REALTIME, &tsBegin);
     int ret = sem_timedwait((sem_t *)&sem, &ts);
     clock_gettime(CLOCK_REALTIME, &tsNow);
 
     TEST_ASSERT_EQUAL_INT(0, ret);
 
-    LOG("\n tsBegin %ld, %ld, tsNow %ld, %ld", tsBegin.tv_sec, tsBegin.tv_nsec, tsNow.tv_sec, tsNow.tv_nsec);
+    LOG("\n tsBegin %lld, %ld, tsNow %lld, %ld", tsBegin.tv_sec, tsBegin.tv_nsec, tsNow.tv_sec, tsNow.tv_nsec);
     int timeDiff = GetTimeDiff(tsNow, tsBegin); // calculate time different
     LOG("\n timeDiff %d", timeDiff);
     TEST_ASSERT_LESS_THAN_INT(20, timeDiff);
 
     // try get semaphore again
     ts = GetDelayedTime(100);
-    LOG("\n ts %d, %d", ts.tv_sec, ts.tv_nsec);
+    LOG("\n ts %lld, %ld", ts.tv_sec, ts.tv_nsec);
     ret = sem_timedwait((sem_t *)&sem, &ts);
     clock_gettime(CLOCK_REALTIME, &tsNow);
     TEST_ASSERT_EQUAL_INT(-1, ret);
     TEST_ASSERT_EQUAL_INT(ETIMEDOUT, errno);
-    LOG("\n tsNow %ld, %ld", tsNow.tv_sec, tsNow.tv_nsec);
+    LOG("\n tsNow %lld, %ld", tsNow.tv_sec, tsNow.tv_nsec);
     timeDiff = GetTimeDiff(tsNow, tsBegin); // calculate time different
     LOG("\n wait timeDiff %d", timeDiff);
 

testsuites/unittest/posix/src/time/time_func_test_01.c

@@ -101,7 +101,7 @@ static int KeepRun(int msec)
     struct timespec time1 = { 0, 0 };
     struct timespec time2 = { 0, 0 };
     clock_gettime(CLOCK_MONOTONIC, &time1);
-    LOG("KeepRun start : tv_sec=%ld, tv_nsec=%ld\n", time1.tv_sec, time1.tv_nsec);
+    LOG("KeepRun start : tv_sec=%lld, tv_nsec=%ld\n", time1.tv_sec, time1.tv_nsec);
     int loop = 0;
     int ran = 0;
     while (ran < msec) {
@@ -111,7 +111,7 @@ static int KeepRun(int msec)
         ran += (time2.tv_nsec - time1.tv_nsec) / NANOSECONDS_PER_MILLISECOND;
     }
 
-    LOG("KeepRun end : tv_sec=%ld, tv_nsec=%ld\n", time2.tv_sec, time2.tv_nsec);
+    LOG("KeepRun end : tv_sec=%lld, tv_nsec=%ld\n", time2.tv_sec, time2.tv_nsec);
     return loop;
 }
 

utils/los_debug.h

@@ -74,6 +74,7 @@ typedef struct {
 typedef enum {
     EXC_REBOOT,
     EXC_ASSERT,
+    EXC_PANIC,
     EXC_STACKOVERFLOW,
     EXC_INTERRUPT,
     EXC_TYPE_END