Date: Wed, 4 Apr 2018 09:11:16 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r332001 - user/pho/stress2/misc Message-ID: <201804040911.w349BG8S070186@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Wed Apr 4 09:11:15 2018 New Revision: 332001 URL: https://svnweb.freebsd.org/changeset/base/332001 Log: Scale back memory usage when no swap disk is available. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/crossmp3.sh Modified: user/pho/stress2/misc/crossmp3.sh ============================================================================== --- user/pho/stress2/misc/crossmp3.sh Wed Apr 4 09:05:48 2018 (r332000) +++ user/pho/stress2/misc/crossmp3.sh Wed Apr 4 09:11:15 2018 (r332001) @@ -41,14 +41,15 @@ . ../default.cfg CONT=/tmp/crossmp3.continue -N=`sysctl -n hw.ncpu` -usermem=`sysctl -n hw.usermem` -[ `swapinfo | wc -l` -eq 1 ] && usermem=$((usermem/100*80)) -size=$((usermem / 1024 / 1024 / N)) +if [ $# -eq 0 ]; then + N=`sysctl -n hw.ncpu` + usermem=`sysctl -n hw.usermem` + [ `sysctl -n vm.swap_total` -eq 0 ] && usermem=$((usermem / 2)) + size=$((usermem / 1024 / 1024 / N)) + echo "Using $N memory disks of size $size MB." -mounts=$N # Number of parallel scripts + mounts=$N # Number of parallel scripts -if [ $# -eq 0 ]; then for i in `jot $mounts`; do m=$(( i + mdstart - 1 )) [ ! -d ${mntpoint}$m ] && @@ -68,14 +69,13 @@ if [ $# -eq 0 ]; then ./$0 $m & ./$0 find & done - wait for i in `jot $mounts`; do m=$(( i + mdstart - 1 )) mdconfig -d -u $m done - + exit 0 else if [ $1 = find ]; then while [ -f $CONT ]; do
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804040911.w349BG8S070186>