@@ -1167,11 +1167,11 @@ static void print_thread_info(struct rt_thread* thread, int maxlen)
1167
1167
1168
1168
#ifdef RT_USING_SMP
1169
1169
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 );
1171
1171
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 );
1173
1173
#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 );
1175
1175
#endif /*RT_USING_SMP*/
1176
1176
1177
1177
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)
1195
1195
ptr = (rt_uint8_t * )thread -> stack_addr ;
1196
1196
while (* ptr == '#' )ptr ++ ;
1197
1197
1198
- rt_kprintf (" 0x%08x 0x%08x %02d%% 0x%08x %03d\n " ,
1198
+ rt_kprintf (" 0x%08x 0x%08x %02d%% 0x%08x %03d" ,
1199
1199
(thread -> stack_size + (rt_uint32_t )(rt_size_t )thread -> stack_addr - (rt_uint32_t )(rt_size_t )thread -> sp ),
1200
1200
thread -> stack_size ,
1201
1201
(thread -> stack_size + (rt_uint32_t )(rt_size_t )thread -> stack_addr - (rt_uint32_t )(rt_size_t )ptr ) * 100
1202
1202
/ thread -> stack_size ,
1203
1203
RT_SCHED_PRIV (thread ).remaining_tick ,
1204
1204
thread -> error );
1205
1205
#endif
1206
+ rt_kprintf (" %-.*s\n" ,rt_strlen (thread -> parent .name ), thread -> parent .name );
1206
1207
}
1207
1208
1208
1209
long list_process (void )
@@ -1219,13 +1220,13 @@ long list_process(void)
1219
1220
1220
1221
maxlen = RT_NAME_MAX ;
1221
1222
#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" );
1225
1226
#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" );
1229
1230
#endif /*RT_USING_SMP*/
1230
1231
1231
1232
count = rt_object_get_length (RT_Object_Class_Thread );
@@ -1257,7 +1258,7 @@ long list_process(void)
1257
1258
1258
1259
if (th .lwp == RT_NULL )
1259
1260
{
1260
- rt_kprintf (" %-*.*s " , maxlen , RT_NAME_MAX , "kernel" );
1261
+ rt_kprintf (" %-*.*s " , maxlen , RT_NAME_MAX , "kernel" );
1261
1262
print_thread_info (& th , maxlen );
1262
1263
}
1263
1264
}
@@ -1276,7 +1277,7 @@ long list_process(void)
1276
1277
for (node = list -> next ; node != list ; node = node -> next )
1277
1278
{
1278
1279
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 );
1280
1281
print_thread_info (thread , maxlen );
1281
1282
}
1282
1283
}
0 commit comments