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

[Peter Holm]

Author: pho
Date: Tue Mar 29 10:22:00 2016
New Revision: 297378
URL: https://svnweb.freebsd.org/changeset/base/297378

Log:
  Do not use the "SIG" prefix for trap names.

Modified:
  user/pho/stress2/misc/altbufferflushes.sh
  user/pho/stress2/misc/lookup_shared.sh
  user/pho/stress2/misc/mkfifo3.sh
  user/pho/stress2/misc/overcommit2.sh

Modified: user/pho/stress2/misc/altbufferflushes.sh
==============================================================================
--- user/pho/stress2/misc/altbufferflushes.sh	Tue Mar 29 10:09:38 2016	(r297377)
+++ user/pho/stress2/misc/altbufferflushes.sh	Tue Mar 29 10:22:00 2016	(r297378)
@@ -80,7 +80,7 @@ diskfree=`df -k /var/tmp | tail -1 | awk
 [ $((diskfree / 1024 / 1024)) -lt 5 ] && echo "Not enough disk space" && exit 1
 
 rm -f /var/.snap/stress2 /var/tmp/big.?
-trap "rm -f /var/.snap/stress2 /var/tmp/big.?" EXIT SIGINT
+trap "rm -f /var/.snap/stress2 /var/tmp/big.?" EXIT INT
 persist 'mksnap_ffs /var /var/.snap/stress2'
 tresh=`sysctl  vfs.dirtybufthresh | awk '{print $NF}'`
 sysctl vfs.dirtybufthresh=10

Modified: user/pho/stress2/misc/lookup_shared.sh
==============================================================================
--- user/pho/stress2/misc/lookup_shared.sh	Tue Mar 29 10:09:38 2016	(r297377)
+++ user/pho/stress2/misc/lookup_shared.sh	Tue Mar 29 10:22:00 2016	(r297378)
@@ -31,7 +31,7 @@
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 saved=`sysctl vfs.lookup_shared | awk '{print $NF}'`
-trap "sysctl vfs.lookup_shared=$saved" EXIT SIGINT
+trap "sysctl vfs.lookup_shared=$saved" EXIT INT
 
 export runRUNTIME=10m            # Run tests for 10 minutes
 for i in 1 0; do

Modified: user/pho/stress2/misc/mkfifo3.sh
==============================================================================
--- user/pho/stress2/misc/mkfifo3.sh	Tue Mar 29 10:09:38 2016	(r297377)
+++ user/pho/stress2/misc/mkfifo3.sh	Tue Mar 29 10:22:00 2016	(r297378)
@@ -48,7 +48,7 @@ rm -f mkfifo3.c
 cd $odir
 
 fifo=/tmp/mkfifo3.fifo
-trap "rm -f $fifo /tmp/mkfifo3" EXIT SIGINT
+trap "rm -f $fifo /tmp/mkfifo3" EXIT INT
 
 /tmp/mkfifo3 &
 

Modified: user/pho/stress2/misc/overcommit2.sh
==============================================================================
--- user/pho/stress2/misc/overcommit2.sh	Tue Mar 29 10:09:38 2016	(r297377)
+++ user/pho/stress2/misc/overcommit2.sh	Tue Mar 29 10:22:00 2016	(r297378)
@@ -43,7 +43,7 @@ old=`sysctl -n vm.overcommit`
 size=$((`sysctl -n hw.usermem` / 1024 / 1024))	# in MB
 size=$((size + size / 100 * 20))		# 120% of hw.usermem
 sysctl vm.overcommit=1
-trap "sysctl vm.overcommit=$old" EXIT SIGINT
+trap "sysctl vm.overcommit=$old" EXIT INT
 
 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
 mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart