From owner-svn-src-user@freebsd.org Tue Mar 29 10:22:02 2016 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37740AE1B49 for ; Tue, 29 Mar 2016 10:22:02 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E55A81C48; Tue, 29 Mar 2016 10:22:01 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2TAM1R3061636; Tue, 29 Mar 2016 10:22:01 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2TAM0ig061632; Tue, 29 Mar 2016 10:22:00 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201603291022.u2TAM0ig061632@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 29 Mar 2016 10:22:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r297378 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Mar 2016 10:22:02 -0000 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