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

[Peter Holm]

Author: pho
Date: Thu Feb  5 17:21:42 2015
New Revision: 278270
URL: https://svnweb.freebsd.org/changeset/base/278270

Log:
  Cleanup script and fix trailing whitespace.
  
  Sponsored by:	 EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/sendfile_shm.sh

Modified: user/pho/stress2/misc/sendfile_shm.sh
==============================================================================
--- user/pho/stress2/misc/sendfile_shm.sh	Thu Feb  5 16:31:49 2015	(r278269)
+++ user/pho/stress2/misc/sendfile_shm.sh	Thu Feb  5 17:21:42 2015	(r278270)
@@ -28,8 +28,6 @@
 # $FreeBSD$
 #
 
-[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
-
 # Sendfile(2) over posix shmfd
 # Test scenario by kib@
 
@@ -43,7 +41,7 @@ cc -o sendfile_shm -Wall -Wextra -O2 sen
 rm -f sendfile_shm.c
 cd $here
 
-daemon ../testcases/swap/swap -t 2m -i 20 > /dev/null 2>&1 
+daemon ../testcases/swap/swap -t 2m -i 20 > /dev/null 2>&1
 sleep 5
 for i in `jot 10`; do
 	/tmp/sendfile_shm /boot/kernel/kernel /tmp/sendfile_shm.$i > \
@@ -52,8 +50,7 @@ done
 for i in `jot 10`; do
 	wait
 done
-while ps aux | grep -v grep | grep -q swap; do
-	killall -9 swap
+while pkill -9 swap; do
 	sleep .5
 done
 for i in `jot 10`; do
@@ -198,6 +195,6 @@ main(int argc, char *argv[])
 		sleep(1);
 		receivefd(s[1], outfd, st.st_size);
 	}
-	
+
 	return (0);
 }