!1048 kconfig增加shell StackSize大小的设置

Merge pull request !1048 from 乔克叔叔/cherry-pick-1681111046

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 ...");

components/shell/Kconfig

@@ -19,6 +19,11 @@ config SHELL_PRIO
     range 1 31
     depends on SHELL
 
+config SHELL_STACK_SIZE
+    int "Shell Task Stack Size"
+    default 4096
+    depends on SHELL
+
 config SHELL_LK
     bool "Enable Shell lk"
     default y

components/shell/src/base/shmsg.c

@@ -258,7 +258,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LosShellInit(VOID)
     }
 
     task1.pfnTaskEntry = (TSK_ENTRY_FUNC)ShellTaskEntry;
-    task1.uwStackSize  = 0x1000;
+    task1.uwStackSize  = LOSCFG_SHELL_STACK_SIZE;
     task1.pcName       = "ShellTaskEntry";
     task1.usTaskPrio   = LOSCFG_SHELL_PRIO;
     ret = LOS_TaskCreate(&taskID1, &task1);

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;

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/include/los_config.h

@@ -679,6 +679,14 @@ extern UINT8 *m_aucSysMem0;
 #define LOSCFG_KERNEL_PM_IDLE                         0
 #endif
 
+/**
+ * @ingroup los_config
+ * Configuration item to set shell stack size.
+ */
+#ifndef LOSCFG_SHELL_STACK_SIZE
+#define LOSCFG_SHELL_STACK_SIZE                         0x1000
+#endif
+
 #ifdef __cplusplus
 #if __cplusplus
 }