!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/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
 }

kernel/src/los_init.c

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