summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2004-11-18 15:10:25 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2004-11-18 15:10:25 +0000
commit5c5ac86cce111eb40d33fdd6e17d0c3bedbf1437 (patch)
tree08937f9d27c3b5287a2168a5c84bd3a7fdb3c0f2 /sys
parent68e96d160057e41e02c2d54230b19169a52855d0 (diff)
handle SONPROC; ok aaron, deraadt, krw
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/kern_proc.c4
-rw-r--r--sys/kern/tty.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 93a576831e4..cccc4f6170b 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_proc.c,v 1.22 2004/10/04 12:03:45 pedro Exp $ */
+/* $OpenBSD: kern_proc.c,v 1.23 2004/11/18 15:10:24 markus Exp $ */
/* $NetBSD: kern_proc.c,v 1.14 1996/02/09 18:59:41 christos Exp $ */
/*
@@ -375,7 +375,7 @@ void
proc_printit(struct proc *p, const char *modif, int (*pr)(const char *, ...))
{
static const char *const pstat[] = {
- "idle", "run", "sleep", "stop", "zombie", "dead"
+ "idle", "run", "sleep", "stop", "zombie", "dead", "onproc"
};
char pstbuf[5];
const char *pst = pstbuf;
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 20cd1c00897..4af17dea526 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.66 2004/09/19 21:34:43 mickey Exp $ */
+/* $OpenBSD: tty.c,v 1.67 2004/11/18 15:10:24 markus Exp $ */
/* $NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $ */
/*-
@@ -2146,7 +2146,8 @@ ttyinfo(tp)
* we pick out just "short-term" sleepers (P_SINTR == 0).
* 4) Further ties are broken by picking the highest pid.
*/
-#define ISRUN(p) (((p)->p_stat == SRUN) || ((p)->p_stat == SIDL))
+#define ISRUN(p) (((p)->p_stat == SRUN) || ((p)->p_stat == SIDL) || \
+ ((p)->p_stat == SONPROC))
#define TESTAB(a, b) ((a)<<1 | (b))
#define ONLYA 2
#define ONLYB 1