From owner-svn-src-user@FreeBSD.ORG  Thu Feb  5 17:21:43 2015
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9A09FE5;
 Thu,  5 Feb 2015 17:21:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 8733CC51;
 Thu,  5 Feb 2015 17:21:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15HLh2n037418;
 Thu, 5 Feb 2015 17:21:43 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15HLhWr037417;
 Thu, 5 Feb 2015 17:21:43 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201502051721.t15HLhWr037417@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Thu, 5 Feb 2015 17:21:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r278270 - 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.18-1
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Feb 2015 17:21:43 -0000

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);
 }