Date: Thu, 22 Jan 2015 19:03:44 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277535 - user/pho/stress2/misc Message-ID: <201501221903.t0MJ3ipG054066@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Thu Jan 22 19:03:43 2015 New Revision: 277535 URL: https://svnweb.freebsd.org/changeset/base/277535 Log: Remove trailing whitespace. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/extattr_set_fd.sh user/pho/stress2/misc/fifo2.sh user/pho/stress2/misc/jail3.sh user/pho/stress2/misc/jail4.sh user/pho/stress2/misc/kevent.sh user/pho/stress2/misc/kevent5.sh user/pho/stress2/misc/kinfo.sh user/pho/stress2/misc/kinfo2.sh user/pho/stress2/misc/linger.sh user/pho/stress2/misc/linger4.sh user/pho/stress2/misc/namecache2.sh user/pho/stress2/misc/nullfs11.sh user/pho/stress2/misc/nullfs5.sh user/pho/stress2/misc/posix_fadvise.sh user/pho/stress2/misc/rename10.sh user/pho/stress2/misc/rename5.sh user/pho/stress2/misc/rename7.sh user/pho/stress2/misc/sem.sh user/pho/stress2/misc/sendfile.sh user/pho/stress2/misc/sendfile2.sh user/pho/stress2/misc/sigstop.sh user/pho/stress2/misc/suj10.sh user/pho/stress2/misc/suj17.sh user/pho/stress2/misc/suj32.sh user/pho/stress2/misc/suj5.sh user/pho/stress2/misc/swap2.sh user/pho/stress2/misc/symlink.sh user/pho/stress2/misc/truncate.sh user/pho/stress2/misc/truncate2.sh user/pho/stress2/misc/truncate3.sh user/pho/stress2/misc/vunref.sh Modified: user/pho/stress2/misc/extattr_set_fd.sh ============================================================================== --- user/pho/stress2/misc/extattr_set_fd.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/extattr_set_fd.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -69,7 +69,7 @@ char buf[4096]; int main(void) { - int fd; + int fd; if ((fd = open("theFile", O_RDWR | O_CREAT, 0622)) == -1) err(1, "open(%s)", "theFile"); Modified: user/pho/stress2/misc/fifo2.sh ============================================================================== --- user/pho/stress2/misc/fifo2.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/fifo2.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -200,11 +200,11 @@ main(void) while ((time(NULL) - start) < 120) { if (fork() == 0) { arc4random_stir(); - for (j = 0; j < 1; j++) + for (j = 0; j < 1; j++) if (pthread_create(&cp[j], NULL, calls, NULL) != 0) perror("pthread_create"); - for (j = 0; j < 1; j++) + for (j = 0; j < 1; j++) pthread_join(cp[j], NULL); _exit(0); } Modified: user/pho/stress2/misc/jail3.sh ============================================================================== --- user/pho/stress2/misc/jail3.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/jail3.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -56,7 +56,7 @@ main() version = 0x0, path = 0x2809cd61 <Address 0x2809cd61 out of bounds>, hostname = 0x2809b650 <Address 0x2809b650 out of bounds>, - jailname = 0x0, + jailname = 0x0, ip4s = 0x1, ip6s = 0x0, ip4 = 0x0, Modified: user/pho/stress2/misc/jail4.sh ============================================================================== --- user/pho/stress2/misc/jail4.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/jail4.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -57,7 +57,7 @@ main() /* version = 0x2, path = 0x28190cb1 <Address 0x28190cb1 out of bounds>, - hostname = 0x28167b90 <Address 0x28167b90 out of bounds>, + hostname = 0x28167b90 <Address 0x28167b90 out of bounds>, jailname = 0x28198700 <Address 0x28198700 out of bounds>, ip4s = 0x0, ip6s = 0x0, Modified: user/pho/stress2/misc/kevent.sh ============================================================================== --- user/pho/stress2/misc/kevent.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/kevent.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -170,6 +170,6 @@ main(int argc, char **argv) if (pthread_cond_destroy(&cond) == -1) err(1, "pthread_condattr_destroy"); } - + return (0); } Modified: user/pho/stress2/misc/kevent5.sh ============================================================================== --- user/pho/stress2/misc/kevent5.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/kevent5.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -99,7 +99,7 @@ test(void) { close(kq); /* Once the rendezvous file is gone create a new kevent */ - + if ((fd = open(file2, O_RDONLY, 0)) == -1) err(1, "open(%s)(2)", file2); Modified: user/pho/stress2/misc/kinfo.sh ============================================================================== --- user/pho/stress2/misc/kinfo.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/kinfo.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -151,13 +151,13 @@ main(int argc, char **argv) alarm(60); for (;;) churning(); - } + } if (r < 0) { perror("fork"); exit(2); } - for (;;) + for (;;) list(); return (0); Modified: user/pho/stress2/misc/kinfo2.sh ============================================================================== --- user/pho/stress2/misc/kinfo2.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/kinfo2.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -127,7 +127,7 @@ list(void) for (;;) { #if 0 printf("name: %-10s, inode %7d, type %2d, namelen %d, d_reclen %d\n", - dp->d_name, dp->d_fileno, dp->d_type, dp->d_namlen, + dp->d_name, dp->d_fileno, dp->d_type, dp->d_namlen, dp->d_reclen); fflush(stdout); #endif @@ -163,13 +163,13 @@ main(int argc, char **argv) alarm(60); for (;;) churning(); - } + } if (r < 0) { perror("fork"); exit(2); } - for (;;) + for (;;) list(); return (0); Modified: user/pho/stress2/misc/linger.sh ============================================================================== --- user/pho/stress2/misc/linger.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/linger.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -120,7 +120,7 @@ test(void) sprintf(file,"p%05d.%05d", pid, i); if (unlink(file) == -1) warn("unlink(%s)", file); - + } return (0); } @@ -145,7 +145,7 @@ main(void) if ((fd = open("rendezvous", O_CREAT, 0644)) == -1) err(1, "open()"); close(fd); - + for (j = 0; j < PARALLEL; j++) { wait(&status); error += status; Modified: user/pho/stress2/misc/linger4.sh ============================================================================== --- user/pho/stress2/misc/linger4.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/linger4.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -115,7 +115,7 @@ Creat(int loopno) sprintf(file,"p%05d.%05d", pid, i); if (unlink(file) == -1) err(3, "unlink(%s)", file); - + } chdir (".."); if (rmdir(path) == -1) Modified: user/pho/stress2/misc/namecache2.sh ============================================================================== --- user/pho/stress2/misc/namecache2.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/namecache2.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -128,7 +128,7 @@ statThread(void *arg __unused) return 0; } -int +int main(void) { char filename1 [20], filename2[20], filename3[20]; Modified: user/pho/stress2/misc/nullfs11.sh ============================================================================== --- user/pho/stress2/misc/nullfs11.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/nullfs11.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -73,7 +73,7 @@ test() { s=`date '+%s'` for i in `jot $parallel`; do (mkdir $mp2/test$i; cd $mp2/test$i; \ - /tmp/fstool -l -f 50 -n 500 -s $((i * 4))k) & + /tmp/fstool -l -f 50 -n 500 -s $((i * 4))k) & done for i in `jot $parallel`; do wait Modified: user/pho/stress2/misc/nullfs5.sh ============================================================================== --- user/pho/stress2/misc/nullfs5.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/nullfs5.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -59,7 +59,7 @@ mount -t nullfs `dirname $RUNDIR` $mp export RUNDIR=`pwd`/mp1/stressX export runRUNTIME=10m -(cd ..; ./run.sh marcus.cfg) +(cd ..; ./run.sh marcus.cfg) umount $mp 2>&1 | grep -v busy Modified: user/pho/stress2/misc/posix_fadvise.sh ============================================================================== --- user/pho/stress2/misc/posix_fadvise.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/posix_fadvise.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -39,7 +39,7 @@ sed '1,/^EOF/d' < $odir/$0 > posix_fadvi cc -o posix_fadvise -Wall -Wextra -O2 -g posix_fadvise.c n1=`vmstat -m | grep fadvise | awk '{print $2 + 0}'` -/tmp/posix_fadvise +/tmp/posix_fadvise n2=`vmstat -m | grep fadvise | awk '{print $2 + 0}'` if [ $((n2 - n1)) -gt 10 ]; then echo FAIL Modified: user/pho/stress2/misc/rename10.sh ============================================================================== --- user/pho/stress2/misc/rename10.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/rename10.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -131,7 +131,7 @@ spin(void) _exit(0); } -void +void renamer() { int fd, i; @@ -176,6 +176,6 @@ main() { for (i = 0; i < PARALLEL * 2; i++) wait(NULL); wait(NULL); - + return (0); } Modified: user/pho/stress2/misc/rename5.sh ============================================================================== --- user/pho/stress2/misc/rename5.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/rename5.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -122,7 +122,7 @@ main() } for (i = 0; i < 2; i++) { - if (fork() == 0) + if (fork() == 0) test(); } for (i = 0; i < 2; i++) Modified: user/pho/stress2/misc/rename7.sh ============================================================================== --- user/pho/stress2/misc/rename7.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/rename7.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -34,7 +34,7 @@ # $ umount /mnt # umount: unmount of /mnt failed: Device busy # $ umount -f /mnt -# $ +# $ . ../default.cfg Modified: user/pho/stress2/misc/sem.sh ============================================================================== --- user/pho/stress2/misc/sem.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/sem.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$"); int semid = -1; key_t semkey; -struct sembuf sop[2]; +struct sembuf sop[2]; size_t pgsize; pid_t pid; Modified: user/pho/stress2/misc/sendfile.sh ============================================================================== --- user/pho/stress2/misc/sendfile.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/sendfile.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -208,7 +208,7 @@ main(int argc, char **argv) } else if (pid > 0) { reader(); kill(pid, SIGINT); - } else + } else err(1, "fork(), %s:%d", __FILE__, __LINE__); return (0); Modified: user/pho/stress2/misc/sendfile2.sh ============================================================================== --- user/pho/stress2/misc/sendfile2.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/sendfile2.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -141,4 +141,4 @@ main () { } return (0); -} +} Modified: user/pho/stress2/misc/sigstop.sh ============================================================================== --- user/pho/stress2/misc/sigstop.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/sigstop.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -42,7 +42,7 @@ cc -o sigstop -Wall -Wextra sigstop.c || rm -f sigstop.c cd $here -su $testuser -c "/tmp/sigstop" +su $testuser -c "/tmp/sigstop" rm -f /tmp/sigstop exit Modified: user/pho/stress2/misc/suj10.sh ============================================================================== --- user/pho/stress2/misc/suj10.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/suj10.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -140,7 +140,7 @@ test(void) sprintf(file,"p%05d.%05d", pid, i); if (rmdir(file) == -1) err(3, "unlink(%s)", file); - + } chdir(".."); sprintf(file,"d%05d", pid); @@ -168,7 +168,7 @@ main(void) if ((fd = open("rendezvous", O_CREAT, 0644)) == -1) err(1, "open()"); close(fd); - + for (j = 0; j < PARALLEL; j++) wait(NULL); Modified: user/pho/stress2/misc/suj17.sh ============================================================================== --- user/pho/stress2/misc/suj17.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/suj17.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -121,7 +121,7 @@ main() for (i = 0; i < 1; i++) { for (j = 0; j < 6; j++) { - if (fork() == 0) + if (fork() == 0) test(); } if ((fd = open("rendezvous", O_CREAT, 0644)) == -1) Modified: user/pho/stress2/misc/suj32.sh ============================================================================== --- user/pho/stress2/misc/suj32.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/suj32.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -90,6 +90,6 @@ main(void) if (mkdir(name, 00700) == -1) err(1, "mkdir(%s)", name); } - + return (0); } Modified: user/pho/stress2/misc/suj5.sh ============================================================================== --- user/pho/stress2/misc/suj5.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/suj5.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -103,7 +103,7 @@ test(int size) sprintf(file,"p%05d", getpid()); - if ((fd = creat(file, 0660)) == -1) + if ((fd = creat(file, 0660)) == -1) err(1, "creat(%s)", file); to = sizeof(buf); Modified: user/pho/stress2/misc/swap2.sh ============================================================================== --- user/pho/stress2/misc/swap2.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/swap2.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -114,7 +114,7 @@ setup(void) printf("setup: pid %d. Total %luMb\n", getpid(), size / 1024 / 1024 * INCARNATIONS); #endif - + if (size == 0) errx(1, "Argument too small"); Modified: user/pho/stress2/misc/symlink.sh ============================================================================== --- user/pho/stress2/misc/symlink.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/symlink.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -123,7 +123,7 @@ main(int argc, char **argv) sprintf(file,"p%05d.%05d", pid, i); if (unlink(file) == -1) err(3, "unlink(%s)", file); - + } return (0); } Modified: user/pho/stress2/misc/truncate.sh ============================================================================== --- user/pho/stress2/misc/truncate.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/truncate.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -91,7 +91,7 @@ main(void) int i, status; for (i = 0; i < 20; i++) { - if (fork() == 0) + if (fork() == 0) test(); } for (i = 0; i < 20; i++) Modified: user/pho/stress2/misc/truncate2.sh ============================================================================== --- user/pho/stress2/misc/truncate2.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/truncate2.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -42,7 +42,7 @@ cd $RUNDIR sleep 1 while ps | grep -v grep | egrep -q "truncate2$"; do - $here/../testcases/swap/swap -t 2m -i 20 + $here/../testcases/swap/swap -t 2m -i 20 done rm -f /tmp/truncate2 @@ -91,7 +91,7 @@ main(int argc, char **argv) int i, status; for (i = 0; i < 20; i++) { - if (fork() == 0) + if (fork() == 0) test(); } for (i = 0; i < 20; i++) Modified: user/pho/stress2/misc/truncate3.sh ============================================================================== --- user/pho/stress2/misc/truncate3.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/truncate3.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -114,7 +114,7 @@ main(int argc, char **argv) int i, status; for (i = 0; i < 20; i++) { - if (fork() == 0) + if (fork() == 0) test(); } for (i = 0; i < 20; i++) Modified: user/pho/stress2/misc/vunref.sh ============================================================================== --- user/pho/stress2/misc/vunref.sh Thu Jan 22 17:53:30 2015 (r277534) +++ user/pho/stress2/misc/vunref.sh Thu Jan 22 19:03:43 2015 (r277535) @@ -72,7 +72,7 @@ if [ $# -eq 0 ]; then sleep 2 while [ ! -z "`ls $RUNDIR/active.* 2>/dev/null`" ] ; do - ../testcases/swap/swap -t 2m -i 20 + ../testcases/swap/swap -t 2m -i 20 done for i in `jot $mounts`; do @@ -215,7 +215,7 @@ main() return (1); for (i = 0; i < 2; i++) { - if (fork() == 0) + if (fork() == 0) test(); } for (i = 0; i < 2; i++)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501221903.t0MJ3ipG054066>