Date: Sat, 28 Nov 2015 09:42:52 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291422 - user/pho/stress2/misc Message-ID: <201511280942.tAS9gqXA097476@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Sat Nov 28 09:42:52 2015 New Revision: 291422 URL: https://svnweb.freebsd.org/changeset/base/291422 Log: Fix wait usage in shell scripts. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/alternativeFlushPath.sh user/pho/stress2/misc/devfs.sh user/pho/stress2/misc/fdescfs.sh user/pho/stress2/misc/fuse2.sh user/pho/stress2/misc/isofs.sh user/pho/stress2/misc/pfl2.sh user/pho/stress2/misc/procfs.sh user/pho/stress2/misc/pthread3.sh user/pho/stress2/misc/pthread4.sh user/pho/stress2/misc/quota10.sh user/pho/stress2/misc/recursiveflushes.sh user/pho/stress2/misc/revoke.sh user/pho/stress2/misc/suj30.sh user/pho/stress2/misc/tmpfs2.sh user/pho/stress2/misc/umountf4.sh user/pho/stress2/misc/umountf6.sh user/pho/stress2/misc/vunref.sh Modified: user/pho/stress2/misc/alternativeFlushPath.sh ============================================================================== --- user/pho/stress2/misc/alternativeFlushPath.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/alternativeFlushPath.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -54,9 +54,7 @@ rm -f alternativeFlushPath.c for j in `jot 10`; do /tmp/alternativeFlushPath & done -for j in `jot 10`; do - wait -done +wait sysctl vfs.altbufferflushes rm -rf /tmp/alternativeFlushPath $dir Modified: user/pho/stress2/misc/devfs.sh ============================================================================== --- user/pho/stress2/misc/devfs.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/devfs.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -47,10 +47,7 @@ if [ $# -eq 0 ]; then ./$0 $i & ./$0 find & done - - for i in `jot $mounts`; do - wait; wait - done + wait else if [ $1 = find ]; then while [ -r $cont ]; do Modified: user/pho/stress2/misc/fdescfs.sh ============================================================================== --- user/pho/stress2/misc/fdescfs.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/fdescfs.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -47,10 +47,7 @@ if [ $# -eq 0 ]; then ./$0 $i & ./$0 find & done - - for i in `jot $mounts`; do - wait; wait - done + wait else if [ $1 = find ]; then exec 6< /dev/zero Modified: user/pho/stress2/misc/fuse2.sh ============================================================================== --- user/pho/stress2/misc/fuse2.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/fuse2.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -61,10 +61,7 @@ if [ $# -eq 0 ]; then ./$0 $m & ./$0 find & done - - for i in `jot $mounts`; do - wait; wait - done + wait for i in `jot $mounts`; do m=$(( i + mdstart - 1 )) Modified: user/pho/stress2/misc/isofs.sh ============================================================================== --- user/pho/stress2/misc/isofs.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/isofs.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -54,9 +54,7 @@ mount -t cd9660 /dev/md${mdstart} $mntpo for i in `jot 64`; do find /$mntpoint -type f > /dev/null 2>&1 & done -for i in `jot 64`; do - wait -done +wait umount ${mntpoint} mdconfig -d -u ${mdstart} Modified: user/pho/stress2/misc/pfl2.sh ============================================================================== --- user/pho/stress2/misc/pfl2.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/pfl2.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -92,7 +92,7 @@ export TESTPROGS="$TESTPROGS testcases/s export RUNDIR=$mp2/stressX export CTRLDIR=$mp2/stressX.control su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' > /dev/null 2>&1 & -wait; wait +wait while mount | grep "$mp2 " | grep -q /dev/md; do umount $mp2 || sleep 1 Modified: user/pho/stress2/misc/procfs.sh ============================================================================== --- user/pho/stress2/misc/procfs.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/procfs.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -49,10 +49,7 @@ if [ $# -eq 0 ]; then ./$0 $m & ./$0 find $m > /dev/null 2>&1 & done - - for i in `jot $mounts`; do - wait; wait - done + wait else if [ $1 = find ]; then while [ -r /tmp/$0 ]; do Modified: user/pho/stress2/misc/pthread3.sh ============================================================================== --- user/pho/stress2/misc/pthread3.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/pthread3.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -41,9 +41,7 @@ rm -f pthread3.c for i in `jot 8`; do /tmp/pthread3 & done -for i in `jot 8`; do - wait -done +wait rm -f /tmp/pthread3 Modified: user/pho/stress2/misc/pthread4.sh ============================================================================== --- user/pho/stress2/misc/pthread4.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/pthread4.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -46,9 +46,7 @@ for i in `jot 5`; do for i in `jot 8`; do /tmp/pthread4 & done - for i in `jot 8`; do - wait - done + wait ' done > $log 2>&1 rm -f /tmp/pthread4 Modified: user/pho/stress2/misc/quota10.sh ============================================================================== --- user/pho/stress2/misc/quota10.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/quota10.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -65,10 +65,7 @@ if [ $# -eq 0 ]; then ./$0 $m & ./$0 find $m & done - - for i in `jot $mounts`; do - wait; wait - done + wait for i in `jot $mounts`; do m=$(( i + mdstart - 1 )) @@ -87,7 +84,7 @@ else else # The test: Parallel mount and unmounts - for i in `jot 1000`; do + for i in `jot 200`; do m=$1 opt=`[ $(( m % 2 )) -eq 0 ] && echo -f` mount $opt /dev/md${m}${part} ${mntpoint}$m Modified: user/pho/stress2/misc/recursiveflushes.sh ============================================================================== --- user/pho/stress2/misc/recursiveflushes.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/recursiveflushes.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -61,9 +61,7 @@ for i in `jot 32`; do # Create 32 Mb files dd if=/dev/zero of=big.$i bs=16k count=2048 2>&1 | egrep -v "records|transferred"& done -for i in `jot 32`; do - wait -done +wait for i in `jot 32`; do rm -f big.$i done Modified: user/pho/stress2/misc/revoke.sh ============================================================================== --- user/pho/stress2/misc/revoke.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/revoke.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -46,9 +46,7 @@ for i in `jot $n`; do ./revoke /dev/ttyva > /dev/null 2>&1 & ./revoke /dev/ttyvb > /dev/null 2>&1 & ./revoke /dev/ttyvc > /dev/null 2>&1 & - for j in `jot 4`; do - wait - done + wait done rm -f revoke Modified: user/pho/stress2/misc/suj30.sh ============================================================================== --- user/pho/stress2/misc/suj30.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/suj30.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -54,9 +54,7 @@ chmod 777 $mntpoint for i in `jot 10`; do /tmp/suj30 $mntpoint/test-$i 100000 & done -for i in `jot 10`; do - wait -done +wait while mount | grep -q $mntpoint; do umount $mntpoint || sleep 1 Modified: user/pho/stress2/misc/tmpfs2.sh ============================================================================== --- user/pho/stress2/misc/tmpfs2.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/tmpfs2.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -43,10 +43,7 @@ if [ $# -eq 0 ]; then ./$0 $i & ./$0 find & done - - for i in `jot $mounts`; do - wait; wait - done + wait else if [ $1 = find ]; then Modified: user/pho/stress2/misc/umountf4.sh ============================================================================== --- user/pho/stress2/misc/umountf4.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/umountf4.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -57,10 +57,7 @@ if [ $# -eq 0 ]; then ./$0 $m & ./$0 find & done - - for i in `jot $mounts`; do - wait; wait - done + wait for i in `jot $mounts`; do m=$(( i + mdstart - 1 )) Modified: user/pho/stress2/misc/umountf6.sh ============================================================================== --- user/pho/stress2/misc/umountf6.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/umountf6.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -59,10 +59,7 @@ if [ $# -eq 0 ]; then ./$0 $m & ./$0 find & done - - for i in `jot $mounts`; do - wait; wait - done + wait for i in `jot $mounts`; do m=$((i + mdstart - 1)) Modified: user/pho/stress2/misc/vunref.sh ============================================================================== --- user/pho/stress2/misc/vunref.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/vunref.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -74,10 +74,7 @@ if [ $# -eq 0 ]; then while [ ! -z "`ls $RUNDIR/active.* 2>/dev/null`" ] ; do ../testcases/swap/swap -t 2m -i 20 done - - for i in `jot $mounts`; do - wait; wait - done + wait for i in `jot $mounts`; do m=$((i + mdstart - 1))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511280942.tAS9gqXA097476>