Module Name: src
Committed By: riz
Date: Wed Nov 4 17:04:14 UTC 2015
Modified Files:
src/share/man/man4 [netbsd-7]: options.4
src/share/man/man9 [netbsd-7]: malloc.9
Log Message:
Pull up following revision(s) (requested by maxv in ticket #940):
share/man/man4/options.4: revision 1.446
share/man/man4/options.4: revision 1.447
share/man/man9/malloc.9: revision 1.52
share/man/man9/malloc.9: revision 1.53
Remove the DIAGNOSTIC section, and two references to MALLOC and FREE.
Remove KMEMSTATS.
Remove the malloc debug options. They no longer exist.
Remove KMEMSTATS
To generate a diff of this commit:
cvs rdiff -u -r1.439.2.3 -r1.439.2.4 src/share/man/man4/options.4
cvs rdiff -u -r1.49.2.1 -r1.49.2.2 src/share/man/man9/malloc.9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.439.2.3 src/share/man/man4/options.4:1.439.2.4
--- src/share/man/man4/options.4:1.439.2.3 Sun May 24 10:39:44 2015
+++ src/share/man/man4/options.4 Wed Nov 4 17:04:14 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: options.4,v 1.439.2.3 2015/05/24 10:39:44 martin Exp $
+.\" $NetBSD: options.4,v 1.439.2.4 2015/11/04 17:04:14 riz Exp $
.\"
.\" Copyright (c) 1996
.\" Perry E. Metzger. All rights reserved.
@@ -30,7 +30,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd May 24, 2015
+.Dd August 7, 2015
.Dt OPTIONS 4
.Os
.Sh NAME
@@ -662,17 +662,6 @@ Note that not all systems are capable of
buffer.
There are also some systems on which memory contents are not preserved
across reboots.
-.It Cd options MALLOCLOG
-Enables an event log for
-.Xr malloc 9 .
-Useful for tracking down
-.Dq Data modified on freelist
-and
-.Dq multiple free
-problems.
-.It Cd options MALLOCLOGSIZE=integer
-Defines the number of entries in the malloc log.
-Default is 100000 entries.
.It Cd options KERNHIST
Enables the kernel history logs, which create in-memory traces of
various kernel activities.
@@ -1276,19 +1265,6 @@ and
.Em MEMORY_DISK_IS_ROOT .
It is incompatible with
.Em MEMORY_DISK_ROOT_SIZE .
-.It Cd options MALLOC_NOINLINE
-Time critical fixed size memory allocation is performed with
-.Fn MALLOC
-and
-.Fn FREE .
-Normally these expand to inline code, but with
-.Em MALLOC_NOINLINE
-these call the normal
-.Fn malloc
-and
-.Fn free
-functions.
-Useful for install media kernels, small memory systems and embedded systems.
.It Cd options HZ=integer
On ports that support it, set the system clock frequency (see
.Xr hz 9 )
@@ -1445,24 +1421,6 @@ would necessitate changing
.Em RTC_OFFSET
twice a year.
As such, this solution is imperfect.
-.It Cd options KMEMSTATS
-The kernel memory allocator,
-.Xr malloc 9 ,
-will keep statistics on its performance if this option is enabled.
-Unfortunately, this option therefore essentially disables the
-.Fn MALLOC
-and
-.Fn FREE
-forms of the memory allocator, which are used to enhance the performance
-of certain critical sections of code in the kernel.
-This option therefore can lead to a significant decrease in the
-performance of certain code in the kernel if enabled.
-Examples of such code include the
-.Fn namei
-routine, the
-.Xr ccd 4
-driver,
-and much of the networking code.
.It Cd options MAXUPRC=integer
Sets the soft
.Dv RLIMIT_NPROC
Index: src/share/man/man9/malloc.9
diff -u src/share/man/man9/malloc.9:1.49.2.1 src/share/man/man9/malloc.9:1.49.2.2
--- src/share/man/man9/malloc.9:1.49.2.1 Sat Jan 17 12:10:55 2015
+++ src/share/man/man9/malloc.9 Wed Nov 4 17:04:14 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: malloc.9,v 1.49.2.1 2015/01/17 12:10:55 martin Exp $
+.\" $NetBSD: malloc.9,v 1.49.2.2 2015/11/04 17:04:14 riz Exp $
.\"
.\" Copyright (c) 1996, 2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,15 +27,13 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd December 27, 2014
+.Dd August 7, 2015
.Dt MALLOC 9
.Os
.Sh NAME
.Nm malloc ,
-.Nm MALLOC ,
.Nm realloc ,
.Nm free ,
-.Nm FREE ,
.Nm malloc_type_attach ,
.Nm malloc_type_detach ,
.Nm MALLOC_DEFINE ,
@@ -251,67 +249,10 @@ Misc temporary data buffers.
Other malloc types are defined by the corresponding subsystem; see the
documentation for that subsystem for information its available malloc
types.
-.Pp
-Statistics based on the
-.Fa type
-argument are maintained only if the kernel option
-.Dv KMEMSTATS
-is used when compiling the kernel
-.Po
-the default in current
-.Nx
-kernels
-.Pc
-and can be examined by using
-.Sq vmstat -m .
.Sh RETURN VALUES
.Fn malloc
returns a kernel virtual address that is suitably aligned for storage of
any type of object.
-.Sh DIAGNOSTICS
-A kernel compiled with the
-.Dv DIAGNOSTIC
-configuration option attempts to detect memory corruption caused by
-such things as writing outside the allocated area and imbalanced calls to the
-.Fn malloc
-and
-.Fn free
-functions.
-Failing consistency checks will cause a panic or a system console message:
-.Pp
-.Bl -bullet -offset indent -compact
-.It
-panic:
-.Dq malloc - bogus type
-.It
-panic:
-.Dq malloc: out of space in kmem_map
-.It
-panic:
-.Dq malloc: allocation too large
-.It
-panic:
-.Dq malloc: wrong bucket
-.It
-panic:
-.Dq malloc: lost data
-.It
-panic:
-.Dq free: unaligned addr
-.It
-panic:
-.Dq free: duplicated free
-.It
-panic:
-.Dq free: multiple frees
-.It
-panic:
-.Dq init: minbucket too small/struct freelist too big
-.It
-.Dq multiply freed item Aq addr
-.It
-.Dq Data modified on freelist: Aq data object description
-.El
.Sh SEE ALSO
.Xr vmstat 1 ,
.Xr memoryallocators 9
