d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make ps -M corefile work again. This has been broken for quite some time.

Browse Source 
kvm_proclist() was aborting when it saw the ithreads with no pgrp.
This commit is contained in:
peter 2001-08-24 09:43:44 +00:00
parent 33e9a790f5
commit 3d8ba93519
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/libkvm/kvm_proc.c
View File

@ -122,6 +122,7 @@ kvm_proclist(kd, what, arg, p, bp, maxcnt)
kp = &kinfo_proc;
kp->ki_structsize = sizeof(kinfo_proc);
for (; cnt < maxcnt && p != NULL; p = LIST_NEXT(&proc, p_list)) {
memset(kp, 0, sizeof *kp);
if (KREAD(kd, (u_long)p, &proc)) {
_kvm_err(kd, kd->program, "can't read proc at %x", p);
return (-1);
@ -196,11 +197,6 @@ kvm_proclist(kd, what, arg, p, bp, maxcnt)
pstats.p_cru.ru_utime.tv_usec +
pstats.p_cru.ru_stime.tv_usec;
}
if (KREAD(kd, (u_long)proc.p_pgrp, &pgrp)) {
_kvm_err(kd, kd->program, "can't read pgrp at %x",
proc.p_pgrp);
return (-1);
}
if (proc.p_oppid)
kp->ki_ppid = proc.p_oppid;
else if (proc.p_pptr) {
@ -212,6 +208,13 @@ kvm_proclist(kd, what, arg, p, bp, maxcnt)
kp->ki_ppid = pproc.p_pid;
} else
kp->ki_ppid = 0;
if (proc.p_pgrp == NULL)
goto nopgrp;
if (KREAD(kd, (u_long)proc.p_pgrp, &pgrp)) {
_kvm_err(kd, kd->program, "can't read pgrp at %x",
proc.p_pgrp);
return (-1);
}
kp->ki_pgid = pgrp.pg_id;
kp->ki_jobc = pgrp.pg_jobc;
if (KREAD(kd, (u_long)pgrp.pg_session, &sess)) {
@ -251,8 +254,10 @@ kvm_proclist(kd, what, arg, p, bp, maxcnt)
}
kp->ki_tsid = sess.s_sid;
}
} else
} else {
nopgrp:
kp->ki_tdev = NODEV;
}
if (proc.p_wmesg)
(void)kvm_read(kd, (u_long)proc.p_wmesg,
kp->ki_wmesg, WMESGLEN);