Date: Thu, 5 Apr 2018 06:20:31 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r332058 - user/pho/stress2/misc Message-ID: <201804050620.w356KVgc076651@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Thu Apr 5 06:20:30 2018 New Revision: 332058 URL: https://svnweb.freebsd.org/changeset/base/332058 Log: Style fix. No functional change intended. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/sendfile.sh user/pho/stress2/misc/sendfile11.sh user/pho/stress2/misc/sendfile12.sh user/pho/stress2/misc/sendfile2.sh user/pho/stress2/misc/sendfile3.sh user/pho/stress2/misc/sendfile4.sh user/pho/stress2/misc/sendfile5.sh user/pho/stress2/misc/sendfile6.sh user/pho/stress2/misc/sendfile8.sh user/pho/stress2/misc/sendfile9.sh user/pho/stress2/misc/tmpfs7.sh Modified: user/pho/stress2/misc/sendfile.sh ============================================================================== --- user/pho/stress2/misc/sendfile.sh Thu Apr 5 03:26:42 2018 (r332057) +++ user/pho/stress2/misc/sendfile.sh Thu Apr 5 06:20:30 2018 (r332058) @@ -48,8 +48,7 @@ out=outputFile for i in 1 2 3 4 8 16 1k 2k 3k 4k 5k 1m 2m 3m 4m 5m ; do rm -f $in $out - dd if=/dev/random of=$in bs=$i count=1 2>&1 | \ - egrep -v "records|transferred" + dd if=/dev/random of=$in bs=$i count=1 status=none /tmp/sendfile $in $out 12345 cmp $in $out || { echo FAIL; ls -l $in $out; } rm -f $in $out Modified: user/pho/stress2/misc/sendfile11.sh ============================================================================== --- user/pho/stress2/misc/sendfile11.sh Thu Apr 5 03:26:42 2018 (r332057) +++ user/pho/stress2/misc/sendfile11.sh Thu Apr 5 06:20:30 2018 (r332058) @@ -46,7 +46,7 @@ mount | grep $mntpoint | grep -q /dev/md && umount -f [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart -dd if=/dev/random of=/tmp/geli.key bs=64 count=1 > /dev/null 2>&1 +dd if=/dev/random of=/tmp/geli.key bs=64 count=1 status=none echo test | geli init -s 8192 -J - -K /tmp/geli.key /dev/md$mdstart > /dev/null echo test | geli attach -j - -k /tmp/geli.key /dev/md$mdstart newfs $newfs_flags /dev/md$mdstart.eli > /dev/null @@ -56,7 +56,7 @@ chmod 777 $mntpoint set +e cd $mntpoint -dd if=/dev/zero of=file bs=1m count=512 +dd if=/dev/zero of=file bs=1m count=512 status=none (cd $odir/../testcases/swap; ./swap -t 5m -i 20 -h -l 100) & sleep 5 /tmp/sendfile11 file output 12345; s=$? @@ -223,7 +223,6 @@ main(int argc, char **argv) if ((pid = fork()) == 0) { writer(); exit(EXIT_SUCCESS); - } else if (pid > 0) { reader(); kill(pid, SIGINT); Modified: user/pho/stress2/misc/sendfile12.sh ============================================================================== --- user/pho/stress2/misc/sendfile12.sh Thu Apr 5 03:26:42 2018 (r332057) +++ user/pho/stress2/misc/sendfile12.sh Thu Apr 5 06:20:30 2018 (r332058) @@ -55,7 +55,7 @@ chmod 777 $mntpoint set +e cd $mntpoint -dd if=/dev/zero of=file bs=1m count=512 2>&1 | egrep -v "records|transferred" +dd if=/dev/zero of=file bs=1m count=512 status=none (cd $odir/../testcases/swap; ./swap -t 5m -i 20 -h -l 100) > /dev/null & sleep 5 /tmp/sendfile12 file output 12345; s=$? @@ -231,7 +231,6 @@ main(int argc, char **argv) if ((pid = fork()) == 0) { writer(); exit(EXIT_SUCCESS); - } else if (pid > 0) { reader(); kill(pid, SIGINT); Modified: user/pho/stress2/misc/sendfile2.sh ============================================================================== --- user/pho/stress2/misc/sendfile2.sh Thu Apr 5 03:26:42 2018 (r332057) +++ user/pho/stress2/misc/sendfile2.sh Thu Apr 5 06:20:30 2018 (r332058) @@ -43,8 +43,7 @@ rm -f sendfile2.c [ -d "$RUNDIR" ] || mkdir -p $RUNDIR cd $RUNDIR -dd if=/dev/random of=large bs=1m count=3 2>&1 | - egrep -v "records|transferred" +dd if=/dev/random of=large bs=1m count=3 status=none md1=`md5 large` nc -l 7000 > lf & Modified: user/pho/stress2/misc/sendfile3.sh ============================================================================== --- user/pho/stress2/misc/sendfile3.sh Thu Apr 5 03:26:42 2018 (r332057) +++ user/pho/stress2/misc/sendfile3.sh Thu Apr 5 06:20:30 2018 (r332058) @@ -50,8 +50,7 @@ parallel=20 for i in 50m 100m; do rm -f $in - dd if=/dev/random of=$in bs=$i count=1 2>&1 | \ - egrep -v "records|transferred" + dd if=/dev/random of=$in bs=$i count=1 status=none for j in `jot $parallel`; do rm -f ${out}$j /tmp/sendfile3 $in ${out}$j 1234$j & @@ -120,10 +119,10 @@ reader(void) { t = 0; if ((buf = malloc(bufsize)) == NULL) - err(1, "malloc(%d), %s:%d", bufsize, __FILE__, __LINE__); + err(1, "malloc(%d), %s:%d", bufsize, __FILE__, __LINE__); if ((fd = open(outputFile, O_RDWR | O_CREAT | O_TRUNC, 0640)) == -1) - err(1, "open(%s)", outputFile); + err(1, "open(%s)", outputFile); for (;;) { if ((n = read(msgsock, buf, bufsize)) < 0) @@ -203,7 +202,6 @@ main(int argc, char **argv) if ((pid = fork()) == 0) { writer(); exit(EXIT_SUCCESS); - } else if (pid > 0) { reader(); kill(pid, SIGINT); Modified: user/pho/stress2/misc/sendfile4.sh ============================================================================== --- user/pho/stress2/misc/sendfile4.sh Thu Apr 5 03:26:42 2018 (r332057) +++ user/pho/stress2/misc/sendfile4.sh Thu Apr 5 06:20:30 2018 (r332058) @@ -40,9 +40,7 @@ mycc -o sendfile4 -Wall -Wextra -O2 sendfile4.c || exi rm -f sendfile4.c cd $here -dd if=/dev/zero of=$diskimage bs=1m count=6 2>&1 | \ - egrep -v "records|transferred" - +dd if=/dev/zero of=$diskimage bs=1m count=6 status=none /tmp/sendfile4 $diskimage || echo FAIL rm -f /tmp/sendfile4 $diskimage Modified: user/pho/stress2/misc/sendfile5.sh ============================================================================== --- user/pho/stress2/misc/sendfile5.sh Thu Apr 5 03:26:42 2018 (r332057) +++ user/pho/stress2/misc/sendfile5.sh Thu Apr 5 06:20:30 2018 (r332058) @@ -46,8 +46,7 @@ need=1024 [ `df -k $(dirname $diskimage) | tail -1 | awk '{print int($4 / 1024)'}` \ -lt $need ] && printf "Need %d MB on %s.\n" $need `dirname $diskimage` && exit 0 -dd if=/dev/zero of=$diskimage bs=1m count=$need 2>&1 | - egrep -v "records|transferred" +dd if=/dev/zero of=$diskimage bs=1m count=$need status=none cd $here mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint Modified: user/pho/stress2/misc/sendfile6.sh ============================================================================== --- user/pho/stress2/misc/sendfile6.sh Thu Apr 5 03:26:42 2018 (r332057) +++ user/pho/stress2/misc/sendfile6.sh Thu Apr 5 06:20:30 2018 (r332058) @@ -242,7 +242,7 @@ bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint -dd if=/dev/random of=$mntpoint/data bs=123456 count=1 > /dev/null 2>&1 +dd if=/dev/random of=$mntpoint/data bs=123456 count=1 status=none ./sendfile6_server $mntpoint/data mysocket & sleep 0.2 ./sendfile6_client mysocket > data.$$ Modified: user/pho/stress2/misc/sendfile8.sh ============================================================================== --- user/pho/stress2/misc/sendfile8.sh Thu Apr 5 03:26:42 2018 (r332057) +++ user/pho/stress2/misc/sendfile8.sh Thu Apr 5 06:20:30 2018 (r332058) @@ -51,7 +51,7 @@ newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint cd $mntpoint -dd if=/dev/random of=in bs=1m count=50 2>&1 | egrep -v "records|transferred" +dd if=/dev/random of=in bs=1m count=50 status=none /tmp/sendfile8 in out 76543 s=$? cd $odir Modified: user/pho/stress2/misc/sendfile9.sh ============================================================================== --- user/pho/stress2/misc/sendfile9.sh Thu Apr 5 03:26:42 2018 (r332057) +++ user/pho/stress2/misc/sendfile9.sh Thu Apr 5 06:20:30 2018 (r332058) @@ -50,7 +50,7 @@ newfs $newfs_flags -n md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint cd $mntpoint -dd if=/dev/random of=in bs=1m count=50 2>&1 | egrep -v "records|transferred" +dd if=/dev/random of=in bs=1m count=50 status=none /tmp/sendfile9 in out 76543 s=$? cd $odir Modified: user/pho/stress2/misc/tmpfs7.sh ============================================================================== --- user/pho/stress2/misc/tmpfs7.sh Thu Apr 5 03:26:42 2018 (r332057) +++ user/pho/stress2/misc/tmpfs7.sh Thu Apr 5 06:20:30 2018 (r332058) @@ -237,7 +237,7 @@ rm -f server.c client.c util.c util.o util.h mysocket mount | grep "$mntpoint" | grep -q tmpfs && umount $mntpoint mount -t tmpfs tmpfs $mntpoint -dd if=/dev/random of=$mntpoint/data bs=123456 count=1 > /dev/null 2>&1 +dd if=/dev/random of=$mntpoint/data bs=123456 count=1 status=none ./server $mntpoint/data mysocket & sleep 0.2 ./client mysocket > data.$$
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804050620.w356KVgc076651>