diff options
| author |   millert <millert@openbsd.org> | 2004-01-07 21:51:30 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2004-01-07 21:51:30 +0000 |
| commit | fccd46f68409af4e10c301d5e63557f736a73b66 (patch) | |
| tree | eecf8e649580cc2ff41f1e0aaea0e2dee3cc82ff | |
| parent | no kern_watchdog for SMALL_KERNEL; ok deraadt@ (diff) | |
| download | wireguard-openbsd-fccd46f68409af4e10c301d5e63557f736a73b66.tar.xz wireguard-openbsd-fccd46f68409af4e10c301d5e63557f736a73b66.zip | |
Add p_rlim_rss_cur for ps "lim" field. OK deraadt@
| -rw-r--r-- | sys/kern/kern_sysctl.c | 4 | ||||
| -rw-r--r-- | sys/sys/sysctl.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index e39f26dbe67..9efc6ec6562 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.97 2004/01/07 21:30:59 markus Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.98 2004/01/07 21:51:30 millert Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -1233,6 +1233,8 @@ fill_kproc2(struct proc *p, struct kinfo_proc2 *ki) ki->p_eflag |= EPROC_CTTY; if (SESS_LEADER(p)) ki->p_eflag |= EPROC_SLEADER; + if (p->p_rlimit) + ki->p_rlim_rss_cur = p->p_rlimit[RLIMIT_RSS].rlim_cur; /* XXX Is this double check necessary? */ if (P_ZOMBIE(p)) { diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 08e42a099e4..71b6fb329f6 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.h,v 1.70 2004/01/07 04:13:02 millert Exp $ */ +/* $OpenBSD: sysctl.h,v 1.71 2004/01/07 21:51:30 millert Exp $ */ /* $NetBSD: sysctl.h,v 1.16 1996/04/09 20:55:36 cgd Exp $ */ /* @@ -445,6 +445,7 @@ struct kinfo_proc2 { u_int32_t p_svuid; /* UID_T: saved user id */ u_int32_t p_svgid; /* GID_T: saved group id */ char p_emul[KI_EMULNAMELEN]; /* syscall emulation name */ + u_int64_t p_rlim_rss_cur; /* RLIM_T: soft limit for rss */ }; /* |