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

- Catch up to new proc flags.

Browse Source
This commit is contained in:
John Baldwin 2001-01-24 12:59:50 +00:00
parent 6d3e7b9b0b
commit e0aa5ab718
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/ps/print.c
View File

@ -167,13 +167,14 @@ state(k, ve)
KINFO *k;
VARENT *ve;
{
int flag;
int flag, sflag;
char *cp;
VAR *v;
char buf[16];
v = ve->var;
flag = k->ki_p->ki_flag;
sflag = k->ki_p->ki_flag;
cp = buf;
switch (k->ki_p->ki_stat) {
@ -183,7 +184,7 @@ state(k, ve)
break;
case SSLEEP:
if (flag & P_SINTR) /* interruptable (long) */
if (sflag & PS_SINTR) /* interruptable (long) */
*cp = k->ki_p->ki_slptime >= MAXSLP ? 'I' : 'S';
else
*cp = 'D';
@ -210,7 +211,7 @@ state(k, ve)
*cp = '?';
}
cp++;
if (!(flag & P_INMEM))
if (!(sflag & PS_INMEM))
*cp++ = 'W';
if (k->ki_p->ki_nice < NZERO)
*cp++ = '<';
@ -520,7 +521,7 @@ getpcpu(k)
#define fxtofl(fixpt) ((double)(fixpt) / fscale)
/* XXX - I don't like this */
if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_flag & P_INMEM) == 0)
if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_sflag & PS_INMEM) == 0)
return (0.0);
if (rawcpu)
return (100.0 * fxtofl(k->ki_p->ki_pctcpu));
@ -552,7 +553,7 @@ getpmem(k)
if (failure)
return (0.0);
if ((k->ki_p->ki_flag & P_INMEM) == 0)
if ((k->ki_p->ki_sflag & PS_INMEM) == 0)
return (0.0);
/* XXX want pmap ptpages, segtab, etc. (per architecture) */
szptudot = UPAGES;

4
bin/ps/ps.c
View File

@ -508,14 +508,14 @@ fmt(fn, ki, comm, maxlen)
return (s);
}
#define UREADOK(ki) (forceuread || (ki->ki_p->ki_flag & P_INMEM))
#define UREADOK(ki) (forceuread || (ki->ki_p->ki_sflag & PS_INMEM))
static void
saveuser(ki)
KINFO *ki;
{
if (ki->ki_p->ki_flag & P_INMEM) {
if (ki->ki_p->ki_sflag & PS_INMEM) {
/*
* The u-area might be swapped out, and we can't get
* at it because we have a crashdump and no swap.