diff options
| author | jeff <jeff@FreeBSD.org> | 2007-09-17 05:31:39 +0000 |
|---|---|---|
| committer | jeff <jeff@FreeBSD.org> | 2007-09-17 05:31:39 +0000 |
| commit | 3fc0f8b973fdc2f392a3234d653e09d71e2aab98 (patch) | |
| tree | e572a7b77f24339d2dc6ebf6b83c1e2c1ce0f6a5 /sys/fs/procfs | |
| parent | 74666fdfce0e06484d5f82e8fced0c16c06477d1 (diff) | |
| download | FreeBSD-src-3fc0f8b973fdc2f392a3234d653e09d71e2aab98.zip FreeBSD-src-3fc0f8b973fdc2f392a3234d653e09d71e2aab98.tar.gz | |
- Move all of the PS_ flags into either p_flag or td_flags.
- p_sflag was mostly protected by PROC_LOCK rather than the PROC_SLOCK or
previously the sched_lock. These bugs have existed for some time.
- Allow swapout to try each thread in a process individually and then
swapin the whole process if any of these fail. This allows us to move
most scheduler related swap flags into td_flags.
- Keep ki_sflag for backwards compat but change all in source tools to
use the new and more correct location of P_INMEM.
Reported by: pho
Reviewed by: attilio, kib
Approved by: re (kensmith)
Diffstat (limited to 'sys/fs/procfs')
| -rw-r--r-- | sys/fs/procfs/procfs_status.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c index 1a8148b..871d7fc 100644 --- a/sys/fs/procfs/procfs_status.c +++ b/sys/fs/procfs/procfs_status.c @@ -112,7 +112,6 @@ procfs_doprocstatus(PFS_FILL_ARGS) sbuf_printf(sb, "noflags"); } - PROC_SLOCK(p); #ifdef KSE if (p->p_flag & P_SA) wmesg = "-kse- "; @@ -128,9 +127,10 @@ procfs_doprocstatus(PFS_FILL_ARGS) wmesg = "nochan"; } - if (p->p_sflag & PS_INMEM) { + if (p->p_flag & P_INMEM) { struct timeval start, ut, st; + PROC_SLOCK(p); calcru(p, &ut, &st); PROC_SUNLOCK(p); start = p->p_stats->p_start; @@ -139,10 +139,8 @@ procfs_doprocstatus(PFS_FILL_ARGS) (intmax_t)start.tv_sec, start.tv_usec, (intmax_t)ut.tv_sec, ut.tv_usec, (intmax_t)st.tv_sec, st.tv_usec); - } else { - PROC_SUNLOCK(p); + } else sbuf_printf(sb, " -1,-1 -1,-1 -1,-1"); - } sbuf_printf(sb, " %s", wmesg); |
