Skip to content

Commit 85b428d

Browse files
authored
[lwp]list_process can print tid (#8991)
* list_process can print tid * fix-ci * update list_process * Update lwp_pid.c
1 parent e0df85c commit 85b428d

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

components/lwp/lwp_pid.c

+13-12
Original file line numberDiff line numberDiff line change
@@ -1167,11 +1167,11 @@ static void print_thread_info(struct rt_thread* thread, int maxlen)
11671167

11681168
#ifdef RT_USING_SMP
11691169
if (RT_SCHED_CTX(thread).oncpu != RT_CPU_DETACHED)
1170-
rt_kprintf("%-*.*s %3d %3d ", maxlen, RT_NAME_MAX, thread->parent.name, RT_SCHED_CTX(thread).oncpu, RT_SCHED_PRIV(thread).current_priority);
1170+
rt_kprintf("%3d %3d ", RT_SCHED_CTX(thread).oncpu, RT_SCHED_PRIV(thread).current_priority);
11711171
else
1172-
rt_kprintf("%-*.*s N/A %3d ", maxlen, RT_NAME_MAX, thread->parent.name, RT_SCHED_PRIV(thread).current_priority);
1172+
rt_kprintf("N/A %3d ", RT_SCHED_PRIV(thread).current_priority);
11731173
#else
1174-
rt_kprintf("%-*.*s %3d ", maxlen, RT_NAME_MAX, thread->parent.name, RT_SCHED_PRIV(thread).current_priority);
1174+
rt_kprintf("%3d ", RT_SCHED_PRIV(thread).current_priority);
11751175
#endif /*RT_USING_SMP*/
11761176

11771177
stat = (RT_SCHED_CTX(thread).stat & RT_THREAD_STAT_MASK);
@@ -1195,14 +1195,15 @@ static void print_thread_info(struct rt_thread* thread, int maxlen)
11951195
ptr = (rt_uint8_t *)thread->stack_addr;
11961196
while (*ptr == '#')ptr++;
11971197

1198-
rt_kprintf(" 0x%08x 0x%08x %02d%% 0x%08x %03d\n",
1198+
rt_kprintf(" 0x%08x 0x%08x %02d%% 0x%08x %03d",
11991199
(thread->stack_size + (rt_uint32_t)(rt_size_t)thread->stack_addr - (rt_uint32_t)(rt_size_t)thread->sp),
12001200
thread->stack_size,
12011201
(thread->stack_size + (rt_uint32_t)(rt_size_t)thread->stack_addr - (rt_uint32_t)(rt_size_t)ptr) * 100
12021202
/ thread->stack_size,
12031203
RT_SCHED_PRIV(thread).remaining_tick,
12041204
thread->error);
12051205
#endif
1206+
rt_kprintf(" %-.*s\n",rt_strlen(thread->parent.name), thread->parent.name);
12061207
}
12071208

12081209
long list_process(void)
@@ -1219,13 +1220,13 @@ long list_process(void)
12191220

12201221
maxlen = RT_NAME_MAX;
12211222
#ifdef RT_USING_SMP
1222-
rt_kprintf("%-*.s %-*.s %-*.s cpu pri status sp stack size max used left tick error\n", 4, "PID", maxlen, "CMD", maxlen, item_title);
1223-
object_split(4);rt_kprintf(" ");object_split(maxlen);rt_kprintf(" ");object_split(maxlen);rt_kprintf(" ");
1224-
rt_kprintf( "--- --- ------- ---------- ---------- ------ ---------- ---\n");
1223+
rt_kprintf("%-*.s %-*.s %-*.s cpu pri status sp stack size max used left tick error %-*.s\n", 4, "PID", 4, "TID", maxlen, item_title, maxlen, "cmd");
1224+
object_split(4);rt_kprintf(" ");object_split(4);rt_kprintf(" ");object_split(maxlen);rt_kprintf(" ");
1225+
rt_kprintf( "--- --- ------- ---------- ---------- -------- ---------- -----");rt_kprintf(" ");object_split(maxlen);rt_kprintf("\n");
12251226
#else
1226-
rt_kprintf("%-*.s %-*.s %-*.s pri status sp stack size max used left tick error\n", 4, "PID", maxlen, "CMD", maxlen, item_title);
1227-
object_split(4);rt_kprintf(" ");object_split(maxlen);rt_kprintf(" ");object_split(maxlen);rt_kprintf(" ");
1228-
rt_kprintf( "--- ------- ---------- ---------- ------ ---------- ---\n");
1227+
rt_kprintf("%-*.s %-*.s %-*.s pri status sp stack size max used left tick error\n", 4, "PID", 4, "TID", maxlen, item_title, maxlen, "cmd");
1228+
object_split(4);rt_kprintf(" ");object_split(4);rt_kprintf(" ");object_split(maxlen);rt_kprintf(" ");
1229+
rt_kprintf( "--- ------- ---------- ---------- -------- ---------- -----");rt_kprintf(" ");object_split(maxlen);rt_kprintf("\n");
12291230
#endif /*RT_USING_SMP*/
12301231

12311232
count = rt_object_get_length(RT_Object_Class_Thread);
@@ -1257,7 +1258,7 @@ long list_process(void)
12571258

12581259
if (th.lwp == RT_NULL)
12591260
{
1260-
rt_kprintf(" %-*.*s ", maxlen, RT_NAME_MAX, "kernel");
1261+
rt_kprintf(" %-*.*s ", maxlen, RT_NAME_MAX, "kernel");
12611262
print_thread_info(&th, maxlen);
12621263
}
12631264
}
@@ -1276,7 +1277,7 @@ long list_process(void)
12761277
for (node = list->next; node != list; node = node->next)
12771278
{
12781279
thread = rt_list_entry(node, struct rt_thread, sibling);
1279-
rt_kprintf("%4d %-*.*s ", lwp_to_pid(lwp), maxlen, RT_NAME_MAX, lwp->cmd);
1280+
rt_kprintf("%4d %4d %-*.*s ", lwp_to_pid(lwp), thread->tid, maxlen, RT_NAME_MAX, lwp->cmd);
12801281
print_thread_info(thread, maxlen);
12811282
}
12821283
}

0 commit comments

Comments
 (0)