6805730 some simple changes would make 'init 5' much faster
6809492 startd shouldn't let hung subprocesses impede shutdown

*** 18,28 ****
  # information: Portions Copyright [yyyy] [name of copyright owner]
  #
  # CDDL HEADER END
  #
  #
! # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  smf_present () {
          [ -r /etc/svc/volatile/repository_door ] && \
--- 18,28 ----
  # information: Portions Copyright [yyyy] [name of copyright owner]
  #
  # CDDL HEADER END
  #
  #
! # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  smf_present () {
          [ -r /etc/svc/volatile/repository_door ] && \
*** 158,167 ****
--- 158,172 ----
  #   Since killing a contract with pkill(1) is not atomic,
  #   smf_kill_contract will continue to send SIGNAL to CONTRACT
  #   every second until the contract is empty.  This will catch
  #   races between fork(2) and pkill(1).
  #
+ #   Note that time in this routine is tracked (after being input
+ #   via TIMEOUT) in 10ths of a second.  This is because we want
+ #   to sleep for short periods of time, and expr(1) is too dumb
+ #   to do non-integer math.
+ #
  #   Returns 1 if the contract is invalid.
  #   Returns 2 if WAIT is "1", TIMEOUT is > 0, and TIMEOUT expires.
  #   Returns 0 on success.
  #
  smf_kill_contract() {
*** 169,178 ****
--- 174,186 ----
          time_waited=0
          time_to_wait=$4
  
          [ -z "$time_to_wait" ] && time_to_wait=0
  
+         # convert to 10ths.
+         time_to_wait=`expr $time_to_wait * 10`
+ 
          # Verify contract id is valid using pgrep
          /usr/bin/pgrep -c $1 > /dev/null 2>&1
          ret=$?
          if [ $ret -gt 1 ] ; then
                  echo "Error, invalid contract \"$1\"" >&2
*** 193,213 ****
          [ -z "$3" ] && return 0
          [ "$3" -eq 0 ] && return 0
   
          # If contract does not empty, keep killing the contract to catch
          # any child processes missed because they were forking
-         /usr/bin/sleep 5
          /usr/bin/pgrep -c $1 > /dev/null 2>&1
          while [ $? -eq 0 ] ; do
!                 
!                 time_waited=`/usr/bin/expr $time_waited + 5`
!                 
!                 # Return  if TIMEOUT was passed, and it has expired
                  [ "$time_to_wait" -gt 0 -a $time_waited -ge $time_to_wait ] && \
                      return 2
                  /usr/bin/pkill -$2 -c $1
!                 /usr/bin/sleep 5
                  /usr/bin/pgrep -c $1 > /dev/null 2>&1
          done
  
          return 0
  }
--- 201,230 ----
          [ -z "$3" ] && return 0
          [ "$3" -eq 0 ] && return 0
   
          # If contract does not empty, keep killing the contract to catch
          # any child processes missed because they were forking
          /usr/bin/pgrep -c $1 > /dev/null 2>&1
          while [ $? -eq 0 ] ; do
!                 # Return 2 if TIMEOUT was passed, and it has expired
                  [ "$time_to_wait" -gt 0 -a $time_waited -ge $time_to_wait ] && \
                      return 2
+ 
+                 #
+                 # At five second intervals, issue the kill again.  Note that
+                 # the sleep time constant (in tenths) must be a factor of 50
+                 # for the remainder trick to work.  i.e. sleeping 2 tenths is
+                 # fine, but 27 tenths is not.
+                 #
+                 remainder=`/usr/bin/expr $time_waited % 50`
+                 if [ $time_waited -gt 0 -a $remainder -eq 0 ]; then
                          /usr/bin/pkill -$2 -c $1
!                 fi
! 
!                 # Wait two tenths, and go again.
!                 /usr/bin/sleep 0.2
!                 time_waited=`/usr/bin/expr $time_waited + 2`
                  /usr/bin/pgrep -c $1 > /dev/null 2>&1
          done
  
          return 0
  }