gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crash: mcps: print both PID and TID

Browse Source 
Change-Id: Iafac099b1d953642509711a972962894b6111984
This commit is contained in:
Balazs Gerofi
2019-04-22 11:09:19 +09:00
committed by Masamichi Takagi
parent 80f964e44f
commit 6297181dcd
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/crash/mckernel.c
View File

@ -505,7 +505,7 @@ static int
mcps_print_one(ulong thread, int cpu, int is_active, int is_idle) mcps_print_one(ulong thread, int cpu, int is_active, int is_idle)
{ {
ulong proc, parent_proc, tmp; ulong proc, parent_proc, tmp;
int tid = 0, ppid = 0, status; int tid = 0, pid = 0, ppid = 0, status;
long saved_cmdline_len; long saved_cmdline_len;
char *saved_cmdline, *comm = is_idle ? "idle" : ""; char *saved_cmdline, *comm = is_idle ? "idle" : "";
char *status_st; char *status_st;
@ -558,6 +558,9 @@ mcps_print_one(ulong thread, int cpu, int is_active, int is_idle)
else else
comm = saved_cmdline; comm = saved_cmdline;
} }
readmem(proc + MCK_MEMBER_OFFSET(process_pid), KVADDR,
&pid, sizeof(int), "process_pid",
RETURN_ON_ERROR);
readmem(proc + MCK_MEMBER_OFFSET(process_ppid_parent), KVADDR, readmem(proc + MCK_MEMBER_OFFSET(process_ppid_parent), KVADDR,
&parent_proc, sizeof(ulong), "process_ppid_parent", &parent_proc, sizeof(ulong), "process_ppid_parent",
RETURN_ON_ERROR); RETURN_ON_ERROR);
@ -567,9 +570,9 @@ mcps_print_one(ulong thread, int cpu, int is_active, int is_idle)
RETURN_ON_ERROR); RETURN_ON_ERROR);
} }
fprintf(fp, "%s%6d %6d %3d %016lx %2s %s\n", fprintf(fp, "%s%6d %6d %6d %3d %016lx %2s %s\n",
is_active ? ">" : " ", is_active ? ">" : " ",
tid, ppid, cpu, thread, tid, pid, ppid, cpu, thread,
status_st, comm); status_st, comm);
if (saved_cmdline_len) if (saved_cmdline_len)
FREEBUF(saved_cmdline); FREEBUF(saved_cmdline);
@ -614,8 +617,8 @@ cmd_mcps(void)
if (argerrs) if (argerrs)
cmd_usage(pc->curcmd, SYNOPSIS); cmd_usage(pc->curcmd, SYNOPSIS);
fprintf(fp, " %6s %6s %3s %-16s %2s %s\n", fprintf(fp, " %6s %6s %6s %3s %-16s %2s %s\n",
"PID", "PPID", "CPU", "THREAD", "ST", "COMM"); "TID", "PID", "PPID", "CPU", "THREAD", "ST", "COMM");
for (cpu = 0; cpu < MCK_SYMBOL(num_processors); cpu++) { for (cpu = 0; cpu < MCK_SYMBOL(num_processors); cpu++) {
ulong clv = MCK_SYMBOL(clv) + cpu * MCK_SIZE(clv); ulong clv = MCK_SYMBOL(clv) + cpu * MCK_SIZE(clv);
ulong thread, idle_thread; ulong thread, idle_thread;