From fc21f40567ac7485e9e987cf5a539bd0d11c7155 Mon Sep 17 00:00:00 2001 From: gjb Date: Fri, 27 Jun 2014 22:05:21 +0000 Subject: Revert r267961, r267973: These changes prevent sysctl(8) from returning proper output, such as: 1) no output from sysctl(8) 2) erroneously returning ENOMEM with tools like truss(1) or uname(1) truss: can not get etype: Cannot allocate memory --- sys/kern/sysv_msg.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sys/kern/sysv_msg.c') diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c index a572a0e..d58cb7e 100644 --- a/sys/kern/sysv_msg.c +++ b/sys/kern/sysv_msg.c @@ -196,7 +196,13 @@ msginit() { int i, error; + TUNABLE_INT_FETCH("kern.ipc.msgseg", &msginfo.msgseg); + TUNABLE_INT_FETCH("kern.ipc.msgssz", &msginfo.msgssz); msginfo.msgmax = msginfo.msgseg * msginfo.msgssz; + TUNABLE_INT_FETCH("kern.ipc.msgmni", &msginfo.msgmni); + TUNABLE_INT_FETCH("kern.ipc.msgmnb", &msginfo.msgmnb); + TUNABLE_INT_FETCH("kern.ipc.msgtql", &msginfo.msgtql); + msgpool = malloc(msginfo.msgmax, M_MSG, M_WAITOK); msgmaps = malloc(sizeof(struct msgmap) * msginfo.msgseg, M_MSG, M_WAITOK); msghdrs = malloc(sizeof(struct msg) * msginfo.msgtql, M_MSG, M_WAITOK); -- cgit v1.1