!1039 挑单增加los错误码和posix错误码对接接口 到3.2

Merge pull request !1039 from wangchen/0317_re

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;
             }

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;
 }
 

kernel/src/los_init.c

@@ -114,6 +114,7 @@ LITE_OS_SEC_TEXT_INIT VOID LOS_Panic(const CHAR *fmt, ...)
     va_start(ap, fmt);
     PRINT_ERR(fmt, ap);
     va_end(ap);
+    OsDoExcHook(EXC_PANIC);
 #if (LOSCFG_BACKTRACE_TYPE != 0)
     LOS_BackTrace();
 #endif

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