svn commit: r318020 - user/pho/stress2/misc

[Peter Holm]

Author: pho
Date: Tue May  9 10:42:23 2017
New Revision: 318020
URL: https://svnweb.freebsd.org/changeset/base/318020

Log:
  Limit VM pressure when run without a swap disk.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/misc/swap2.sh

Modified: user/pho/stress2/misc/swap2.sh
==============================================================================
--- user/pho/stress2/misc/swap2.sh	Tue May  9 09:53:18 2017	(r318019)
+++ user/pho/stress2/misc/swap2.sh	Tue May  9 10:42:23 2017	(r318020)
@@ -57,19 +57,19 @@ mycc -o swap2 -Wall -Wextra -O2 swap2.c 
 rm -f swap2.c
 cd $odir
 
-usermem=`sysctl hw.usermem | sed 's/.* //'`
-swap=`sysctl vm.swap_total | sed 's/.* //'`
+usermem=`sysctl -n hw.usermem`
+swap=`sysctl -n vm.swap_total`
 
 if [ $swap -gt 0 ]; then
 	size=$((usermem/10*11))
 else
-	size=$((usermem/10*9))
+	size=$((usermem/10*8))
 fi
 
 /tmp/swap2 $((size / 4096)) &
 sleep 30
 su $testuser -c "(cd ../testcases/rw;   ./rw   -t 3m -i 40 -l 100 -v -h -h)" &
-wait; wait
+wait
 
 while mount | grep $mntpoint | grep -q /dev/md; do
 	umount $mntpoint || sleep 1