[smart] fix console setup and CPU usage tracing

This patch introduces following features:
- Updated default console setup to dynamically select an appropriate tty
  device based on the configured console device name.
- Added CPU usage tracing functionality, enabled by default, for
  applications like 'top'.

Signed-off-by: Shell <[email protected]>

Author: polarvid

components/lwp/Kconfig

@@ -12,9 +12,9 @@ if RT_USING_LWP
 
     if LWP_DEBUG
         config LWP_DEBUG_INIT
-        select RT_USING_HOOKLIST
-        bool "Enable debug mode of init process"
-        default n
+            select RT_USING_HOOKLIST
+            bool "Enable debug mode of init process"
+            default n
     endif
 
     config RT_LWP_MAX_NR
@@ -33,6 +33,13 @@ if RT_USING_LWP
         int "The input buffer size of lwp console device"
         default 1024
 
+    config LWP_TRACING_CPU_USAGE
+        select RT_USING_HOOK
+        bool "Enable cpu usage tracing"
+        help
+            Enable cpu usage tracing for application like top.
+        default y
+
     config LWP_TID_MAX_NR
         int "The maximum number of lwp thread id"
         default 64

components/lwp/lwp.c

@@ -17,7 +17,7 @@
  */
 
 #define DBG_TAG "lwp"
-#define DBG_LVL DBG_WARNING
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
 #include <rthw.h>
@@ -69,11 +69,41 @@ extern char working_directory[];
  */
 static rt_err_t lwp_default_console_setup(void)
 {
-    rt_device_t bakdev = rt_device_find("ttyS0");
+    rt_device_t bakdev;
     rt_err_t rc;
+    char *ttyname;
+    char *bakdev_name = RT_CONSOLE_DEVICE_NAME;
+
+    if (bakdev_name)
+    {
+        int uart_id;
+        size_t tail_len = 0;
+        if (sscanf(bakdev_name, "uart%d", &uart_id))
+        {
+            while (uart_id > 0)
+            {
+                tail_len += 2;
+                uart_id >>= 4;
+            }
+            tail_len += sizeof("ttyS");
+            ttyname = rt_malloc(tail_len);
+            snprintf(ttyname, tail_len, "ttyS%d", uart_id);
+            bakdev = rt_device_find(ttyname);
+        }
+    }
+
+    if (!bakdev)
+    {
+        LOG_W("No compatible tty device found for /dev/%s", bakdev_name);
+
+        /* fall back */
+        ttyname = "ttyS0";
+        bakdev = rt_device_find(ttyname);
+    }
 
     if (bakdev)
     {
+        LOG_I("Using /dev/%s as default console", ttyname);
         lwp_console_register_backend(bakdev, LWP_CONSOLE_LOWEST_PRIOR);
         rc = RT_EOK;
     }
@@ -85,6 +115,15 @@ static rt_err_t lwp_default_console_setup(void)
     return rc;
 }
 
+static void _update_process_times(void);
+static int _set_usage_hook(void)
+{
+#ifdef LWP_TRACING_CPU_USAGE
+    rt_tick_sethook(_update_process_times);
+#endif /* LWP_TRACING_CPU_USAGE */
+    return RT_EOK;
+}
+
 static int lwp_component_init(void)
 {
     int rc;
@@ -104,6 +143,10 @@ static int lwp_component_init(void)
     {
         LOG_E("%s: lwp_futex_init() failed", __func__);
     }
+    else if ((rc = _set_usage_hook()) != RT_EOK)
+    {
+        LOG_E("%s: _set_usage_hook() failed", __func__);
+    }
     else if ((rc = lwp_default_console_setup()) != RT_EOK)
     {
         LOG_E("%s: lwp_default_console_setup() failed", __func__);
@@ -1583,7 +1626,9 @@ rt_err_t lwp_backtrace_frame(rt_thread_t uthread, struct rt_hw_backtrace_frame *
     return rc;
 }
 
-void rt_update_process_times(void)
+#ifdef LWP_TRACING_CPU_USAGE
+
+static void _update_process_times(void)
 {
     struct rt_thread *thread;
 #ifdef RT_USING_SMP
@@ -1616,3 +1661,5 @@ void rt_update_process_times(void)
 #endif
     }
 }
+
+#endif /* LWP_TRACING_CPU_USAGE */

components/lwp/terminal/terminal.h

@@ -212,9 +212,8 @@ void tty_rel_gone(struct lwp_tty *tp);
 #define tty_lock_notrecused(tp) (rt_mutex_get_hold(tty_getlock(tp)) == 1)
 #define tty_assert_locked(tp)   RT_ASSERT(tty_lock_owned(tp))
 #define tty_lock_assert(tp, option)                        \
-    (((option) == (MA_OWNED | MA_NOTRECURSED))             \
-         ? (tty_lock_owned(tp) && tty_lock_notrecused(tp)) \
-         : rt_assert_handler("Operation not allowed", __func__, __LINE__))
+    RT_ASSERT(((option) == (MA_OWNED | MA_NOTRECURSED)) && \
+    (tty_lock_owned(tp) && tty_lock_notrecused(tp)))
 
 /* System messages. */
 int tty_checkoutq(struct lwp_tty *tp);

components/lwp/terminal/tty_device.c

@@ -25,7 +25,7 @@ static char *alloc_device_name(const char *name)
 {
     char *tty_dev_name;
     long name_buf_len = (sizeof(TTY_NAME_PREFIX) - 1) /* raw prefix */
-                        + rt_strlen(name)             /* custom name */
+                        + rt_strlen(name)        /* custom name */
                         + 1;                          /* tailing \0 */
 
     tty_dev_name = rt_malloc(name_buf_len);