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

- Catch up to proc flag changes.

Browse Source
This commit is contained in:
John Baldwin 2001-01-24 11:20:05 +00:00
parent 168666be74
commit b939335607
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/fs/procfs/procfs_status.c
View File

@ -123,19 +123,23 @@ procfs_dostatus(curp, p, pfs, uio)
DOCHECK();
}
if (p->p_flag & P_INMEM) {
mtx_enter(&sched_lock, MTX_SPIN);
if (p->p_sflag & PS_INMEM) {
struct timeval ut, st;
calcru(p, &ut, &st, (struct timeval *) NULL);
mtx_exit(&sched_lock, MTX_SPIN);
ps += snprintf(ps, psbuf + sizeof(psbuf) - ps,
" %ld,%ld %ld,%ld %ld,%ld",
p->p_stats->p_start.tv_sec,
p->p_stats->p_start.tv_usec,
ut.tv_sec, ut.tv_usec,
st.tv_sec, st.tv_usec);
} else
} else {
mtx_exit(&sched_lock, MTX_SPIN);
ps += snprintf(ps, psbuf + sizeof(psbuf) - ps,
" -1,-1 -1,-1 -1,-1");
}
DOCHECK();
ps += snprintf(ps, psbuf + sizeof(psbuf) - ps, " %s",

8
sys/miscfs/procfs/procfs_status.c
View File

@ -123,19 +123,23 @@ procfs_dostatus(curp, p, pfs, uio)
DOCHECK();
}
if (p->p_flag & P_INMEM) {
mtx_enter(&sched_lock, MTX_SPIN);
if (p->p_sflag & PS_INMEM) {
struct timeval ut, st;
calcru(p, &ut, &st, (struct timeval *) NULL);
mtx_exit(&sched_lock, MTX_SPIN);
ps += snprintf(ps, psbuf + sizeof(psbuf) - ps,
" %ld,%ld %ld,%ld %ld,%ld",
p->p_stats->p_start.tv_sec,
p->p_stats->p_start.tv_usec,
ut.tv_sec, ut.tv_usec,
st.tv_sec, st.tv_usec);
} else
} else {
mtx_exit(&sched_lock, MTX_SPIN);
ps += snprintf(ps, psbuf + sizeof(psbuf) - ps,
" -1,-1 -1,-1 -1,-1");
}
DOCHECK();
ps += snprintf(ps, psbuf + sizeof(psbuf) - ps, " %s",

4
sys/vm/vm_fault.c
View File

@ -854,13 +854,15 @@ RetryFault:;
vm_page_activate(fs.m);
}
if (curproc && (curproc->p_flag & P_INMEM) && curproc->p_stats) {
mtx_enter(&sched_lock, MTX_SPIN);
if (curproc && (curproc->p_sflag & PS_INMEM) && curproc->p_stats) {
if (hardfault) {
curproc->p_stats->p_ru.ru_majflt++;
} else {
curproc->p_stats->p_ru.ru_minflt++;
}
}
mtx_exit(&sched_lock, MTX_SPIN);
/*
* Unlock everything, and return