libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[msh]Optimize list_thread display (#7977)

This commit is contained in:
guo 2023-10-27 10:52:52 +08:00 committed by GitHub
parent f79ae29c70
commit f744d5e6fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
components/finsh/cmd.c
View File

@ -172,20 +172,20 @@ long list_thread(void)
maxlen = RT_NAME_MAX; maxlen = RT_NAME_MAX;
rt_kprintf("%-*.*s ", tcb_strlen, tcb_strlen, "rt_thread_t");
#ifdef RT_USING_SMP #ifdef RT_USING_SMP
rt_kprintf("%-*.*s cpu bind pri status sp stack size max used left tick error\n", maxlen, maxlen, item_title); rt_kprintf("%-*.*s cpu bind pri status sp stack size max used left tick error tcb addr\n", maxlen, maxlen, item_title);
object_split(tcb_strlen);
rt_kprintf(" ");
object_split(maxlen); object_split(maxlen);
rt_kprintf(" --- ---- --- ------- ---------- ---------- ------ ---------- ---\n"); rt_kprintf(" --- ---- --- ------- ---------- ---------- ------ ---------- -------");
rt_kprintf(" ");
object_split(tcb_strlen);
rt_kprintf("\n");
#else #else
rt_kprintf("%-*.*s pri status sp stack size max used left tick error\n", maxlen, maxlen, item_title); rt_kprintf("%-*.*s pri status sp stack size max used left tick error tcb addr\n", maxlen, maxlen, item_title);
object_split(tcb_strlen);
rt_kprintf(" ");
object_split(maxlen); object_split(maxlen);
rt_kprintf(" --- ------- ---------- ---------- ------ ---------- ---\n"); rt_kprintf(" --- ------- ---------- ---------- ------ ---------- -------");
rt_kprintf(" ");
object_split(tcb_strlen);
rt_kprintf("\n");
#endif /*RT_USING_SMP*/ #endif /*RT_USING_SMP*/
do do
@ -215,7 +215,6 @@ long list_thread(void)
rt_uint8_t stat; rt_uint8_t stat;
rt_uint8_t *ptr; rt_uint8_t *ptr;
rt_kprintf("%p ", thread);
#ifdef RT_USING_SMP #ifdef RT_USING_SMP
if (thread->oncpu != RT_CPU_DETACHED) if (thread->oncpu != RT_CPU_DETACHED)
rt_kprintf("%-*.*s %3d %3d %4d ", maxlen, RT_NAME_MAX, thread->parent.name, thread->oncpu, thread->bind_cpu, thread->current_priority); rt_kprintf("%-*.*s %3d %3d %4d ", maxlen, RT_NAME_MAX, thread->parent.name, thread->oncpu, thread->bind_cpu, thread->current_priority);
@ -236,22 +235,24 @@ long list_thread(void)
ptr = (rt_uint8_t *)thread->stack_addr + thread->stack_size - 1; ptr = (rt_uint8_t *)thread->stack_addr + thread->stack_size - 1;
while (*ptr == '#')ptr --; while (*ptr == '#')ptr --;
rt_kprintf(" 0x%08x 0x%08x %02d%% 0x%08x %03d\n", rt_kprintf(" 0x%08x 0x%08x %02d%% 0x%08x %s %p\n",
((rt_ubase_t)thread->sp - (rt_ubase_t)thread->stack_addr), ((rt_ubase_t)thread->sp - (rt_ubase_t)thread->stack_addr),
thread->stack_size, thread->stack_size,
((rt_ubase_t)ptr - (rt_ubase_t)thread->stack_addr) * 100 / thread->stack_size, ((rt_ubase_t)ptr - (rt_ubase_t)thread->stack_addr) * 100 / thread->stack_size,
thread->remaining_tick, thread->remaining_tick,
thread->error); rt_strerror(thread->error),
thread);
#else #else
ptr = (rt_uint8_t *)thread->stack_addr; ptr = (rt_uint8_t *)thread->stack_addr;
while (*ptr == '#') ptr ++; while (*ptr == '#') ptr ++;
rt_kprintf(" 0x%08x 0x%08x %02d%% 0x%08x %s\n", rt_kprintf(" 0x%08x 0x%08x %02d%% 0x%08x %s %p\n",
thread->stack_size + ((rt_ubase_t)thread->stack_addr - (rt_ubase_t)thread->sp), thread->stack_size + ((rt_ubase_t)thread->stack_addr - (rt_ubase_t)thread->sp),
thread->stack_size, thread->stack_size,
(thread->stack_size - ((rt_ubase_t) ptr - (rt_ubase_t) thread->stack_addr)) * 100 (thread->stack_size - ((rt_ubase_t) ptr - (rt_ubase_t) thread->stack_addr)) * 100
/ thread->stack_size, / thread->stack_size,
thread->remaining_tick, thread->remaining_tick,
rt_strerror(thread->error)); rt_strerror(thread->error),
thread);
#endif #endif
} }
} }

2
components/finsh/msh.c
View File

@ -66,7 +66,7 @@ int cmd_ps(int argc, char **argv)
list_module(); list_module();
else else
#endif #endif
list_thread(); list_thread();
return 0; return 0;
} }
MSH_CMD_EXPORT_ALIAS(cmd_ps, ps, List threads in the system.); MSH_CMD_EXPORT_ALIAS(cmd_ps, ps, List threads in the system.);