[src/trunk]: src/etc various speed-ups (and related work):

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3df25ffc74ae
branches:  trunk
changeset: 504376:3df25ffc74ae
user:      lukem <lukem%NetBSD.org@localhost>
date:      Wed Feb 28 16:49:18 2001 +0000

description:
various speed-ups (and related work):
- only load rc.conf if $_rc_conf_loaded is not set
- use case instead of if for various string comparisons
- print the date at the start of the boot as well as at the end
- if $rc_fast_and_loose is set, always run the rc.d scripts in the
  current shell rather than in a subshell. this is not on by default
  because it's potentially dangerous (a rogue command could terminate
  the boot), but it is provided as an optional speedup for people
  with slow machines that have an expensive fork

diffstat:

 etc/rc      |   9 ++++--
 etc/rc.subr |  75 +++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 47 insertions(+), 37 deletions(-)

diffs (174 lines):

diff -r 38e5240e2f5e -r 3df25ffc74ae etc/rc
--- a/etc/rc    Wed Feb 28 16:10:22 2001 +0000
+++ b/etc/rc    Wed Feb 28 16:49:18 2001 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: rc,v 1.154 2000/12/15 00:00:09 lukem Exp $
+# $NetBSD: rc,v 1.155 2001/02/28 16:49:18 lukem Exp $
 #
 # rc --
 #      Run the scripts in /etc/rc.d with rcorder.
@@ -14,6 +14,7 @@
 
 . /etc/rc.subr
 . /etc/rc.conf
+_rc_conf_loaded=YES
 
 if ! checkyesno rc_configured; then
        echo "/etc/rc.conf is not configured.  Multiuser boot aborted."
@@ -35,8 +36,10 @@
 
 files=`rcorder -s nostart /etc/rc.d/*`
 
-for i in $files; do
-       run_rc_script $i start
+date
+
+for _rc_elem in $files; do
+       run_rc_script $_rc_elem start
 done
 
 date
diff -r 38e5240e2f5e -r 3df25ffc74ae etc/rc.subr
--- a/etc/rc.subr       Wed Feb 28 16:10:22 2001 +0000
+++ b/etc/rc.subr       Wed Feb 28 16:49:18 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rc.subr,v 1.29 2000/11/17 03:47:43 lukem Exp $
+# $NetBSD: rc.subr,v 1.30 2001/02/28 16:49:19 lukem Exp $
 #
 # Copyright (c) 1997-2000 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -117,16 +117,16 @@
        fi
        _procnamebn=${_procname##*/}
        ps -p $_pid -o 'pid,command' | while read _npid _arg0 _argv; do
-               if [ "$_npid" = "PID" ]; then
-                       continue
-               fi
-               if [   "$_arg0" = "$_procname" \
-                   -o "$_arg0" = "$_procnamebn" \
-                   -o "$_arg0" = "${_procnamebn}:" \
-                   -o "$_arg0" = "(${_procnamebn})" ]; then
+               case "$_npid" in
+                   PID)
+                       continue ;;
+               esac
+               case "$_arg0" in
+                   $_procname|$_procnamebn|${_procnamebn}:|"(${_procnamebn})")
                        echo $_npid
                        return
-               fi
+                       ;;
+               esac
        done
 }
 
@@ -144,16 +144,16 @@
        _procnamebn=${_procname##*/}
        _pref=
        ps -ax -o 'pid,command' | while read _npid _arg0 _argv; do
-               if [ "$_npid" = "PID" ]; then
-                       continue
-               fi
-               if [   "$_arg0" = "$_procname" \
-                   -o "$_arg0" = "$_procnamebn" \
-                   -o "$_arg0" = "${_procnamebn}:" \
-                   -o "$_arg0" = "(${_procnamebn})" ]; then
+               case "$_npid" in
+                   PID)
+                       continue ;;
+               esac
+               case "$_arg0" in
+                   $_procname|$_procnamebn|${_procnamebn}:|"(${_procnamebn})")
                        echo -n "$_pref$_npid"
                        _pref=" "
-               fi
+                       ;;
+               esac
        done
 }
 
@@ -256,7 +256,7 @@
 {
        _arg=$1
        if [ -z "$name" ]; then
-               err 3 '$name is not set.'
+               err 3 'run_rc_command: $name is not set.'
        fi
 
        case "$_arg" in
@@ -297,18 +297,16 @@
        else
                eval _flags=\$${name}_flags
        fi
-       eval _chdir=\$${name}_chdir
-       eval _chroot=\$${name}_chroot
-       eval _nice=\$${name}_nice
-       eval _user=\$${name}_user
-       eval _group=\$${name}_group
-       eval _groups=\$${name}_groups
+       eval _chdir=\$${name}_chdir     _chroot=\$${name}_chroot \
+           _nice=\$${name}_nice        _user=\$${name}_user \
+           _group=\$${name}_group      _groups=\$${name}_groups
 
                                        # if ${rcvar} is set, and $1 is not
                                        # "rcvar" or "status", then run
                                        #       checkyesno ${rcvar}
                                        # and return if that failed
                                        #
+       # XXXX use case?
        if [ -n "${rcvar}" -a "$_arg" != "rcvar" -a "$_arg" != "status" ]; then
                if ! checkyesno ${rcvar}; then
                        return 0
@@ -325,8 +323,7 @@
                                        # if there's a custom ${XXX_cmd},
                                        # run that instead of the default
                                        #
-               eval _cmd=\$${_arg}_cmd
-               eval _precmd=\$${_arg}_precmd
+               eval _cmd=\$${_arg}_cmd _precmd=\$${_arg}_precmd
                if [ -n "$_cmd" ]; then
                                        # if the precmd failed and force
                                        # isn't set, exit
@@ -515,14 +512,21 @@
                err 3 'USAGE: run_rc_script file arg'
        fi
 
-       case "$_file" in
-       *.sh)                           # run in current shell
+       if [ -n "$rc_fast_and_loose" ]; then
+               unset name command command_args extra_commands pidfile rcvar
+               unset required_dirs required_files required_vars
+               eval unset ${_arg}_cmd ${_arg}_precmd
                set $_arg ; . $_file
-               ;;
-       *)                              # run in subshell
-               ( set $_arg ; . $_file )
-               ;;
-       esac
+       else
+               case "$_file" in
+               *.sh)                           # run in current shell
+                       set $_arg ; . $_file
+                       ;;
+               *)                              # run in subshell
+                       ( set $_arg ; . $_file )
+                       ;;
+               esac
+       fi
 }
 
 #
@@ -536,7 +540,10 @@
                err 3 'USAGE: load_rc_config command'
        fi
 
-       . /etc/rc.conf
+       if [ -z "$_rc_conf_loaded" ]; then
+               . /etc/rc.conf
+               _rc_conf_loaded=YES
+       fi
        if [ -f /etc/rc.conf.d/"$_command" ]; then
                . /etc/rc.conf.d/"$_command"
        fi