Author: kensmith
Date: Thu Sep 10 14:04:00 2009
New Revision: 197065
URL: http://svn.freebsd.org/changeset/base/197065

Log:
  Remove extra debugging support that is turned on for head but turned off
  for stable branches:
  
        - shift to MALLOC_PRODUCTION
        - turn off automatic crash dumps
        - Remove kernel debuggers, INVARIANTS*[1], WITNESS* from
          GENERIC kernel config files[2]
  
  [1] INVARIANTS* left on for ia64 by request marcel
  [2] sun4v was left as-is
  
  Reviewed by:  marcel, kib
  Approved by:  re (implicit)

Modified:
  stable/8/etc/defaults/rc.conf
  stable/8/lib/libc/stdlib/malloc.c
  stable/8/sys/amd64/conf/GENERIC
  stable/8/sys/i386/conf/GENERIC
  stable/8/sys/ia64/conf/GENERIC
  stable/8/sys/pc98/conf/GENERIC
  stable/8/sys/powerpc/conf/GENERIC
  stable/8/sys/sparc64/conf/GENERIC

Modified: stable/8/etc/defaults/rc.conf
==============================================================================
--- stable/8/etc/defaults/rc.conf       Thu Sep 10 13:20:27 2009        
(r197064)
+++ stable/8/etc/defaults/rc.conf       Thu Sep 10 14:04:00 2009        
(r197065)
@@ -549,7 +549,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/8/lib/libc/stdlib/malloc.c
==============================================================================
--- stable/8/lib/libc/stdlib/malloc.c   Thu Sep 10 13:20:27 2009        
(r197064)
+++ stable/8/lib/libc/stdlib/malloc.c   Thu Sep 10 14:04:00 2009        
(r197065)
@@ -114,7 +114,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/8/sys/amd64/conf/GENERIC
==============================================================================
--- stable/8/sys/amd64/conf/GENERIC     Thu Sep 10 13:20:27 2009        
(r197064)
+++ stable/8/sys/amd64/conf/GENERIC     Thu Sep 10 14:04:00 2009        
(r197065)
@@ -76,15 +76,6 @@ options              FLOWTABLE               # per-cpu 
routing ca
 #options       KDTRACE_FRAME           # Ensure frames are compiled in
 #options       KDTRACE_HOOKS           # Kernel DTrace hooks
 
-# Debugging for use in -current
-options        KDB                     # Enable kernel debugger support.
-options        DDB                     # Support DDB.
-options        GDB                     # Support remote GDB.
-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
-
 # Make an SMP-capable kernel by default
 options        SMP                     # Symmetric MultiProcessor Kernel
 

Modified: stable/8/sys/i386/conf/GENERIC
==============================================================================
--- stable/8/sys/i386/conf/GENERIC      Thu Sep 10 13:20:27 2009        
(r197064)
+++ stable/8/sys/i386/conf/GENERIC      Thu Sep 10 14:04:00 2009        
(r197065)
@@ -76,15 +76,6 @@ options      MAC                     # TrustedBSD MAC 
Framewor
 options                FLOWTABLE               # per-cpu routing cache
 #options       KDTRACE_HOOKS           # Kernel DTrace hooks
 
-# Debugging for use in -current
-options        KDB                     # Enable kernel debugger support.
-options        DDB                     # Support DDB.
-options        GDB                     # Support remote GDB.
-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
-
 # To make an SMP kernel, the next two lines are needed
 options        SMP                     # Symmetric MultiProcessor Kernel
 device         apic                    # I/O APIC

Modified: stable/8/sys/ia64/conf/GENERIC
==============================================================================
--- stable/8/sys/ia64/conf/GENERIC      Thu Sep 10 13:20:27 2009        
(r197064)
+++ stable/8/sys/ia64/conf/GENERIC      Thu Sep 10 14:04:00 2009        
(r197065)
@@ -30,15 +30,12 @@ options     CD9660          # ISO 9660 Filesystem
 options        COMPAT_43TTY    # BSD 4.3 TTY compat (sgtty)
 options        COMPAT_FREEBSD6 # Compatible with FreeBSD6
 options        COMPAT_FREEBSD7 # Compatible with FreeBSD7
-options        DDB             # Support DDB
 options        FFS             # Berkeley Fast Filesystem
-options        GDB             # Support remote GDB
 options        GEOM_LABEL      # Provides labelization
 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
@@ -62,8 +59,6 @@ options       P1003_1B_SEMAPHORES     # POSIX-sty
 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        HWPMC_HOOKS             # Necessary kernel hooks for hwpmc(4)
 

Modified: stable/8/sys/pc98/conf/GENERIC
==============================================================================
--- stable/8/sys/pc98/conf/GENERIC      Thu Sep 10 13:20:27 2009        
(r197064)
+++ stable/8/sys/pc98/conf/GENERIC      Thu Sep 10 14:04:00 2009        
(r197065)
@@ -76,15 +76,6 @@ options      HWPMC_HOOKS             # Necessary kernel
 options        AUDIT                   # Security event auditing
 options        MAC                     # TrustedBSD MAC Framework
 
-# Debugging for use in -current
-options        KDB                     # Enable kernel debugger support.
-options        DDB                     # Support DDB.
-options        GDB                     # Support remote GDB.
-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
-
 # To make an SMP kernel, the next two lines are needed
 #options       SMP                     # Symmetric MultiProcessor Kernel
 #device                apic                    # I/O APIC

Modified: stable/8/sys/powerpc/conf/GENERIC
==============================================================================
--- stable/8/sys/powerpc/conf/GENERIC   Thu Sep 10 13:20:27 2009        
(r197064)
+++ stable/8/sys/powerpc/conf/GENERIC   Thu Sep 10 14:04:00 2009        
(r197065)
@@ -67,14 +67,6 @@ options      HWPMC_HOOKS             # Necessary kernel
 options        AUDIT                   # Security event auditing
 options        MAC                     # TrustedBSD MAC Framework
 
-# Debugging for use in -current
-options        KDB                     #Enable the kernel debugger
-options        DDB                     #Support DDB
-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
-
 # To make an SMP kernel, the next line is needed
 #options       SMP                     # Symmetric MultiProcessor Kernel
 

Modified: stable/8/sys/sparc64/conf/GENERIC
==============================================================================
--- stable/8/sys/sparc64/conf/GENERIC   Thu Sep 10 13:20:27 2009        
(r197064)
+++ stable/8/sys/sparc64/conf/GENERIC   Thu Sep 10 14:04:00 2009        
(r197065)
@@ -72,15 +72,6 @@ options      HWPMC_HOOKS             # Necessary kernel
 options        AUDIT                   # Security event auditing
 options        MAC                     # TrustedBSD MAC Framework
 
-# Debugging for use in -current
-options        KDB                     # Enable kernel debugger support.
-options        DDB                     # Support DDB.
-options        GDB                     # Support remote GDB.
-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
-
 # Make an SMP-capable kernel by default
 options        SMP                     # Symmetric MultiProcessor Kernel
 
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to