优化线程列表输出，增加CPU使用率跟踪功能，调整输出格式

Author: meng-plus

components/finsh/cmd.c

@@ -62,7 +62,7 @@ MSH_CMD_EXPORT(version, show RT-Thread version information);
 
 rt_inline void object_split(int len)
 {
-    while (len--) rt_kprintf("-");
+    while (len--) rt_kputs("-");
 }
 
 typedef struct
@@ -174,23 +174,41 @@ long list_thread(void)
     maxlen = RT_NAME_MAX;
 
 #ifdef RT_USING_SMP
-    rt_kprintf("%-*.*s cpu bind pri  status      sp     stack size max used left tick   error  tcb addr   usage\n", maxlen, maxlen, item_title);
+    rt_kprintf("%-*.*s cpu bind pri  status      sp     stack size max used left tick   error  tcb addr    ", maxlen, maxlen, item_title);
+#ifdef RT_USING_CPU_USAGE_TRACER
+    rt_kputs("usage count    last time");
+#endif
+    rt_kputs("\n");
     object_split(maxlen);
-    rt_kprintf(" --- ---- ---  ------- ---------- ----------  ------  ---------- -------");
-    rt_kprintf(" ");
+    rt_kputs(" --- ---- ---  ------- ---------- ----------  ------  ---------- ------- ");
     object_split(tcb_strlen);
-    rt_kprintf(" ");
+    rt_kputs(" ");
+#ifdef RT_USING_CPU_USAGE_TRACER
     object_split(usage_strlen);
-    rt_kprintf("\n");
+    rt_kputs(" ");
+    object_split(8);
+    rt_kputs(" ");
+    object_split(10);
+#endif
+    rt_kputs("\n");
 #else
-    rt_kprintf("%-*.*s pri  status      sp     stack size max used left tick   error  tcb addr   usage\n", maxlen, maxlen, item_title);
+    rt_kprintf("%-*.*s pri  status      sp     stack size max used left tick   error  tcb addr   ", maxlen, maxlen, item_title);
+#ifdef RT_USING_CPU_USAGE_TRACER
+    rt_kputs("usage count    last time");
+#endif
+    rt_kputs("\n");
     object_split(maxlen);
-    rt_kprintf(" ---  ------- ---------- ----------  ------  ---------- -------");
-    rt_kprintf(" ");
+    rt_kputs(" ---  ------- ---------- ----------  ------  ---------- ------- ");
     object_split(tcb_strlen);
-    rt_kprintf(" ");
+    rt_kputs(" ");
+#ifdef RT_USING_CPU_USAGE_TRACER
     object_split(usage_strlen);
-    rt_kprintf("\n");
+    rt_kputs(" ");
+    object_split(8);
+    rt_kputs(" ");
+    object_split(10);
+#endif
+    rt_kputs("\n");
 #endif /*RT_USING_SMP*/
 
     do
@@ -201,9 +219,9 @@ long list_thread(void)
             for (i = 0; i < find_arg.nr_out; i++)
             {
                 struct rt_object *obj;
-                struct rt_thread thread_info, *thread;
+                struct rt_thread  thread_info, *thread;
 
-                obj = rt_list_entry(obj_list[i], struct rt_object, list);
+                obj   = rt_list_entry(obj_list[i], struct rt_object, list);
                 level = rt_spin_lock_irqsave(&info->spinlock);
 
                 if ((obj->type & ~RT_Object_Class_Static) != find_arg.type)
@@ -217,7 +235,7 @@ long list_thread(void)
 
                 thread = (struct rt_thread *)obj;
                 {
-                    rt_uint8_t stat;
+                    rt_uint8_t  stat;
                     rt_uint8_t *ptr;
 
 #ifdef RT_USING_SMP
@@ -256,26 +274,24 @@ long list_thread(void)
                                rt_strerror(thread->error),
                                thread);
 #ifdef RT_USING_CPU_USAGE_TRACER
-                    rt_kprintf(" %3d%%\n", rt_thread_get_usage(thread));
-#else
-                    rt_kprintf("  N/A\n");
+                    rt_kprintf(" %3d%%%8d%10d", rt_thread_get_usage(thread), thread->ctx_count, thread->ctx_last_time);
 #endif
+                    rt_kprintf("  \n");
 #else
                     ptr = (rt_uint8_t *)thread->stack_addr;
                     while (*ptr == '#') ptr ++;
                     rt_kprintf(" 0x%08x 0x%08x    %02d%%   0x%08x %s %p",
                                thread->stack_size + ((rt_ubase_t)thread->stack_addr - (rt_ubase_t)thread->sp),
                                thread->stack_size,
                                (thread->stack_size - ((rt_ubase_t) ptr - (rt_ubase_t) thread->stack_addr)) * 100
-                               / thread->stack_size,
+                                   / thread->stack_size,
                                RT_SCHED_PRIV(thread).remaining_tick,
                                rt_strerror(thread->error),
                                thread);
 #ifdef RT_USING_CPU_USAGE_TRACER
-                    rt_kprintf(" %3d%%\n", rt_thread_get_usage(thread));
-#else
-                    rt_kprintf("  N/A\n");
+                    rt_kprintf(" %3d%%%8d%10d", rt_thread_get_usage(thread), thread->ctx_count, thread->ctx_last_time);
 #endif
+                    rt_kputs("\n");
 #endif
                 }
             }

include/rtdef.h

@@ -940,6 +940,8 @@ struct rt_thread
 #ifdef RT_USING_CPU_USAGE_TRACER
     rt_ubase_t                  user_time;              /**< Ticks on user */
     rt_ubase_t                  system_time;            /**< Ticks on system */
+    rt_ubase_t                  ctx_last_time;          /**< Last context switch time */
+    rt_ubase_t                  ctx_count;              /**< Context switch count */
 #endif /* RT_USING_CPU_USAGE_TRACER */
 
 #ifdef RT_USING_MEM_PROTECTION

src/scheduler_up.c

@@ -355,10 +355,12 @@ void rt_schedule(void)
                     extern void rt_thread_handle_sig(rt_bool_t clean_state);
 
                     RT_OBJECT_HOOK_CALL(rt_scheduler_switch_hook, (from_thread));
-
+#ifdef RT_USING_CPU_USAGE_TRACER
+                    to_thread->ctx_count++;
+                    to_thread->ctx_last_time = rt_tick_get();
+#endif
                     rt_hw_context_switch((rt_uintptr_t)&from_thread->sp,
                             (rt_uintptr_t)&to_thread->sp);
-
                     /* enable interrupt */
                     rt_hw_interrupt_enable(level);
 
@@ -386,7 +388,10 @@ void rt_schedule(void)
                 else
                 {
                     LOG_D("switch in interrupt");
-
+#ifdef RT_USING_CPU_USAGE_TRACER
+                    to_thread->ctx_count++;
+                    to_thread->ctx_last_time = rt_tick_get();
+#endif
                     rt_hw_context_switch_interrupt((rt_uintptr_t)&from_thread->sp,
                             (rt_uintptr_t)&to_thread->sp, from_thread, to_thread);
                 }