Date: Sat, 15 Oct 2011 21:23:05 +0000 (UTC) From: Ken Smith <kensmith@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r226405 - in stable/9: . etc/defaults lib/libc/stdlib sys/amd64/conf sys/i386/conf sys/ia64/conf sys/pc98/conf sys/powerpc/conf sys/sparc64/conf Message-ID: <201110152123.p9FLN5Ht031202@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kensmith Date: Sat Oct 15 21:23:04 2011 New Revision: 226405 URL: http://svn.freebsd.org/changeset/base/226405 Log: Remove extra debuggin gsupport that is turned on for head but turned off for stable branches: - shift to MALLOC_PRODUCTION - turn off automatic crash dumps - remove kernel debuggers, INVARIANT*[1], WITNESS* from GENERIC kernel config files [1] INVARIANT* left on for ia64 at least temporarily, marcel@ will test to see if they are still required as they had been for stable/8. Approved by: re (implicit) Modified: stable/9/UPDATING stable/9/etc/defaults/rc.conf stable/9/lib/libc/stdlib/malloc.c stable/9/sys/amd64/conf/GENERIC stable/9/sys/i386/conf/GENERIC stable/9/sys/ia64/conf/GENERIC stable/9/sys/pc98/conf/GENERIC stable/9/sys/powerpc/conf/GENERIC stable/9/sys/sparc64/conf/GENERIC Modified: stable/9/UPDATING ============================================================================== --- stable/9/UPDATING Sat Oct 15 21:06:08 2011 (r226404) +++ stable/9/UPDATING Sat Oct 15 21:23:04 2011 (r226405) @@ -9,18 +9,10 @@ handbook. Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.x IS SLOW: - FreeBSD 9.x has many debugging features turned on, in both the kernel - and userland. These features attempt to detect incorrect use of - system primitives, and encourage loud failure through extra sanity - checking and fail stop semantics. They also substantially impact - system performance. If you want to do performance measurement, - benchmarking, and optimization, you'll want to turn them off. This - includes various WITNESS- related kernel options, INVARIANTS, malloc - debugging flags in userland, and various verbose features in the - kernel. Many developers choose to disable these features on build - machines to maximize performance. (To disable malloc debugging, run - ln -s aj /etc/malloc.conf.) +NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.x IS SLOW ON IA64: + For ia64 the INVARIANTS and INVARIANT_SUPPORT kernel options + were left in the GENERIC kernel because the kernel does not + work properly without them. 20110913: This commit modifies vfs_register() so that it uses a hash Modified: stable/9/etc/defaults/rc.conf ============================================================================== --- stable/9/etc/defaults/rc.conf Sat Oct 15 21:06:08 2011 (r226404) +++ stable/9/etc/defaults/rc.conf Sat Oct 15 21:23:04 2011 (r226405) @@ -594,7 +594,7 @@ lpd_flags="" # Flags to lpd (if enabled nscd_enable="NO" # Run the nsswitch caching daemon. chkprintcap_enable="NO" # Run chkprintcap(8) before running lpd. chkprintcap_flags="-d" # Create missing directories by default. -dumpdev="AUTO" # Device to crashdump to (device name, AUTO, or NO). +dumpdev="NO" # Device to crashdump to (device name, AUTO, or NO). dumpdir="/var/crash" # Directory where crash dumps are to be stored savecore_flags="" # Used if dumpdev is enabled above, and present. crashinfo_enable="YES" # Automatically generate crash dump summary. Modified: stable/9/lib/libc/stdlib/malloc.c ============================================================================== --- stable/9/lib/libc/stdlib/malloc.c Sat Oct 15 21:06:08 2011 (r226404) +++ stable/9/lib/libc/stdlib/malloc.c Sat Oct 15 21:23:04 2011 (r226405) @@ -123,7 +123,7 @@ * defaults the A and J runtime options to off. These settings are appropriate * for production systems. */ -/* #define MALLOC_PRODUCTION */ +#define MALLOC_PRODUCTION #ifndef MALLOC_PRODUCTION /* Modified: stable/9/sys/amd64/conf/GENERIC ============================================================================== --- stable/9/sys/amd64/conf/GENERIC Sat Oct 15 21:06:08 2011 (r226404) +++ stable/9/sys/amd64/conf/GENERIC Sat Oct 15 21:23:04 2011 (r226405) @@ -65,17 +65,6 @@ options MAC # TrustedBSD MAC Framewor #options KDTRACE_HOOKS # Kernel DTrace hooks options INCLUDE_CONFIG_FILE # Include this file in kernel -# Debugging for use in -current -options KDB # Enable kernel debugger support. -options DDB # Support DDB. -options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones - # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel Modified: stable/9/sys/i386/conf/GENERIC ============================================================================== --- stable/9/sys/i386/conf/GENERIC Sat Oct 15 21:06:08 2011 (r226404) +++ stable/9/sys/i386/conf/GENERIC Sat Oct 15 21:23:04 2011 (r226405) @@ -65,17 +65,6 @@ options MAC # TrustedBSD MAC Framewor #options KDTRACE_HOOKS # Kernel DTrace hooks options INCLUDE_CONFIG_FILE # Include this file in kernel -# Debugging for use in -current -options KDB # Enable kernel debugger support. -options DDB # Support DDB. -options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones - # To make an SMP kernel, the next two lines are needed options SMP # Symmetric MultiProcessor Kernel device apic # I/O APIC Modified: stable/9/sys/ia64/conf/GENERIC ============================================================================== --- stable/9/sys/ia64/conf/GENERIC Sat Oct 15 21:06:08 2011 (r226404) +++ stable/9/sys/ia64/conf/GENERIC Sat Oct 15 21:23:04 2011 (r226405) @@ -28,17 +28,13 @@ makeoptions DEBUG=-g # Build kernel with options AUDIT # Security event auditing options CD9660 # ISO 9660 Filesystem options COMPAT_FREEBSD7 # Compatible with FreeBSD7 -options DDB # Support DDB -options DEADLKRES # Enable the deadlock resolver options FFS # Berkeley Fast Filesystem -options GDB # Support remote GDB options GEOM_LABEL # Provides labelization options INCLUDE_CONFIG_FILE # Include this file in kernel options INET # InterNETworking options INET6 # IPv6 communications protocols options INVARIANTS # Enable calls of extra sanity checking options INVARIANT_SUPPORT # required by INVARIANTS -options KDB # Enable kernel debugger support options KTRACE # ktrace(1) syscall trace support options MAC # TrustedBSD MAC Framework options MD_ROOT # MD usable as root device @@ -64,10 +60,7 @@ options SYSVSHM # SYSV-style shared me options UFS_ACL # Support for access control lists options UFS_DIRHASH # Hash-based directory lookup scheme options UFS_GJOURNAL # Enable gjournal-based UFS journaling -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed options _KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B RT extensions -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones # Various "busses" device firewire # FireWire bus code Modified: stable/9/sys/pc98/conf/GENERIC ============================================================================== --- stable/9/sys/pc98/conf/GENERIC Sat Oct 15 21:06:08 2011 (r226404) +++ stable/9/sys/pc98/conf/GENERIC Sat Oct 15 21:23:04 2011 (r226405) @@ -66,17 +66,6 @@ options AUDIT # Security event auditi options MAC # TrustedBSD MAC Framework options INCLUDE_CONFIG_FILE # Include this file in kernel -# Debugging for use in -current -options KDB # Enable kernel debugger support. -options DDB # Support DDB. -options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones - # To make an SMP kernel, the next two lines are needed #options SMP # Symmetric MultiProcessor Kernel #device apic # I/O APIC Modified: stable/9/sys/powerpc/conf/GENERIC ============================================================================== --- stable/9/sys/powerpc/conf/GENERIC Sat Oct 15 21:06:08 2011 (r226404) +++ stable/9/sys/powerpc/conf/GENERIC Sat Oct 15 21:23:04 2011 (r226405) @@ -67,16 +67,6 @@ options AUDIT # Security event auditi options MAC # TrustedBSD MAC Framework options INCLUDE_CONFIG_FILE # Include this file in kernel -# Debugging for use in -current -options KDB #Enable the kernel debugger -options DDB #Support DDB -#options DEADLKRES #Enable the deadlock resolver -options INVARIANTS #Enable calls of extra sanity checking -options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS #Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones - # To make an SMP kernel, the next line is needed options SMP # Symmetric MultiProcessor Kernel Modified: stable/9/sys/sparc64/conf/GENERIC ============================================================================== --- stable/9/sys/sparc64/conf/GENERIC Sat Oct 15 21:06:08 2011 (r226404) +++ stable/9/sys/sparc64/conf/GENERIC Sat Oct 15 21:23:04 2011 (r226405) @@ -63,17 +63,6 @@ options AUDIT # Security event auditi options MAC # TrustedBSD MAC Framework options INCLUDE_CONFIG_FILE # Include this file in kernel -# Debugging for use in -current -options KDB # Enable kernel debugger support. -options DDB # Support DDB. -options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones - # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110152123.p9FLN5Ht031202>