@@ -33,17 +33,33 @@ class Snap_Dispatcher { * Under some OSes, additional prefixes may be needed for running * PHP properly in the background. If $use_prefix is true, then * those prefixes will be prepended to the PHP path. - * @param $use_prefix should any OS prefixes be used + * @param $use_prefix should any OS prefixes be used, including calls to "nice" * @return string **/ protected function getPHP($use_prefix = true) { - if (substr(PHP_OS, 0, 3) == 'WIN' && $use_prefix) { - return 'start /b ' . $this->php; + if (!$use_prefix) { + return $this->php; } + + // windows gets a nice via /low + if (substr(PHP_OS, 0, 3) == 'WIN') { + return 'start /low /b ' . $this->php; + } + + $php = $this->php; + + // cgi mode needs "quiet" flag if (SNAP_CGI_MODE) { - return $this->php . ' -q'; + $php .= ' -q'; } - return $this->php; + + // get snap NICE option if set and use it + $options = Snap_Request::getLongOptions(array('nice' => '')); + if ($options['nice']) { + $php = $options['nice'] . ' -n 15 ' . $php; + } + + return $php; } /** core/snap/dispatcher.php @@ -14,6 +14,7 @@ $options = Snap_Request::getLongOptions(array( 'mode' => 'init', 'out' => 'text', 'php' => 'php', + 'nice' => '', 'match' => '^.*\.stest\.php$', 'help' => false, 'test' => '', snaptest.php @@ -27,13 +27,34 @@ if [[ ! -x "$PHPX" ]] ; then fi fi -if [[ ! -z PHPX ]] ; then +if [[ ! -z $PHPX ]] ; then PHP=$PHPX fi +# Auto Locate Nice +NICEX=`which nice` +if [[ ! -x "$NICEX" ]] ; then + NICEX="" + if [ -z $NICEX ] ; then + if [ -x "/usr/local/bin/nice" ] ; then + NICEX="/usr/local/bin/nice" + fi + if [ -x "/usr/bin/nice" ] ; then + NICEX="/usr/bin/nice" + fi + if [ -x "/opt/local/bin/nice" ] ; then + NICEX="/opt/local/bin/nice" + fi + fi +fi + +if [[ ! -z $NICEX ]] ; then + NICE=$NICEX +fi + # parse the options CMD="" -while getoptex "out. php. match. help;" "$@" +while getoptex "out. php. nice. match. help;" "$@" do if [ "$OPTOPT" = "php" ] ; then if [ -x "$OPTARG" ] ; then @@ -43,6 +64,14 @@ do exit 0 fi fi + if [ "$OPTOPT" = "nice" ] ; then + if [ -x "$OPTARG" ] ; then + NICE=$OPTARG + else + echo "The path of $OPTARG was not a valid nice path." + exit 0 + fi + fi if [ "$OPTOPT" = "help" ] ; then CMD="$CMD --help" else @@ -77,13 +106,15 @@ CGI=`$PHP -v | grep cgi | wc -l | sed "s/[^0-9]//g"` # run php on the snaptest.php file with the commands if [ "$CGI" = "0" ] ; then - CMD="$PHP -q $FPATH/snaptest.php --php=$PHP $CMD $PTH" + CMD="$PHP -q $FPATH/snaptest.php --php=$PHP --nice=$NICE $CMD $PTH" else # if we are running in CGI mode, we need to mangle our . characters # otherwise PHP mangles them in the request PHPSAFE=`echo "$PHP" | sed "s/\./__D_O_T__/g"` CMDSAFE=`echo "$CMD" | sed "s/\./__D_O_T__/g"` PTHSAFE=`echo "$PTH" | sed "s/\./__D_O_T__/g"` - CMD="$PHP -q $FPATH/snaptest.php --php=$PHPSAFE $CMDSAFE $PTHSAFE" + NICESAFE=`echo "$NICE" | sed "s/\./__D_O_T__/g"` + + CMD="$PHP -q $FPATH/snaptest.php --php=$PHPSAFE --nice=$NICESAFE $CMDSAFE $PTHSAFE" fi $CMD snaptest.sh ba01e1c3416368e5c5453ec47e015a56c9c4f4ea Jakob Heuser jakob@felocity.org http://github.com/Jakobo/snaptest/commit/fd09552bca256dd2f608f11a5d146c470392009a fd09552bca256dd2f608f11a5d146c470392009a 2008-04-09T15:33:36-07:00 2008-04-09T15:33:36-07:00 Added support for gnu nice when available. d0c366cb30b53dab3c2e5b8969701ee35f75acc1 Jakob Heuser jakob@felocity.org