diff options
| author |   otto <otto@openbsd.org> | 2018-11-06 07:55:08 +0000 |
|---|---|---|
| committer | otto <otto@openbsd.org> | 2018-11-06 07:55:08 +0000 |
| commit | 43c9f4767227dfaf4abc96c5a98422e23ccc704a (patch) | |
| tree | ea9caabe611d72614f56a990e7b04f54935cd929 | |
| parent | new sysctl for userland malloc flags, kernel part. ok millert@ deraadt@ (diff) | |
| download | wireguard-openbsd-43c9f4767227dfaf4abc96c5a98422e23ccc704a.tar.xz wireguard-openbsd-43c9f4767227dfaf4abc96c5a98422e23ccc704a.zip | |
vm.malloc_conf, userland sysctl parts; ok millert@ deraadt@
| -rw-r--r-- | lib/libc/sys/sysctl.2 | 9 | ||||
| -rw-r--r-- | sbin/sysctl/sysctl.c | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lib/libc/sys/sysctl.2 b/lib/libc/sys/sysctl.2 index 76481b04be2..0044223e8ab 100644 --- a/lib/libc/sys/sysctl.2 +++ b/lib/libc/sys/sysctl.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysctl.2,v 1.12 2018/11/04 19:31:14 denis Exp $ +.\" $OpenBSD: sysctl.2,v 1.13 2018/11/06 07:55:08 otto Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: November 4 2018 $ +.Dd $Mdocdate: November 6 2018 $ .Dt SYSCTL 2 .Os .Sh NAME @@ -2135,6 +2135,7 @@ privileges may change the value. .It Sy "Second level name" Ta Sy "Type" Ta Sy "Changeable" .It Dv VM_ANONMIN Ta "integer" Ta "yes" .It Dv VM_LOADAVG Ta "struct loadavg" Ta "no" +.It Dv VM_MALLOC_CONF Ta "string" Ta "yes" .It Dv VM_MAXSLP Ta "integer" Ta "no" .It Dv VM_METER Ta "struct vmtotal" Ta "no" .It Dv VM_NKMEMPAGES Ta "integer" Ta "no" @@ -2153,6 +2154,10 @@ pages which contain anonymous mapping. Return the load average history. The returned data consists of a .Li struct loadavg . +.It Dv VM_MALLOC_CONF Pq Va vm.malloc_conf +The +.Xr malloc.conf 5 +option string. .It Dv VM_MAXSLP Pq Va vm.maxslp The time for a process to be blocked before being swappable, in seconds. diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index 9f0255e2c77..6e0e680032a 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.c,v 1.237 2018/09/29 04:29:48 visa Exp $ */ +/* $OpenBSD: sysctl.c,v 1.238 2018/11/06 07:55:08 otto Exp $ */ /* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */ /* @@ -567,7 +567,8 @@ parse(char *string, int flags) } else if (mib[1] == VM_NKMEMPAGES || mib[1] == VM_ANONMIN || mib[1] == VM_VTEXTMIN || - mib[1] == VM_VNODEMIN) { + mib[1] == VM_VNODEMIN || + mib[1] == VM_MALLOC_CONF) { break; } if (flags == 0) |