From owner-svn-src-user@freebsd.org  Tue May  2 06:16:36 2017
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C5337D5A2EC
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Tue,  2 May 2017 06:16:36 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 8B753162C;
 Tue,  2 May 2017 06:16:36 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v426GZHk091135;
 Tue, 2 May 2017 06:16:35 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v426GZfS091134;
 Tue, 2 May 2017 06:16:35 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201705020616.v426GZfS091134@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Tue, 2 May 2017 06:16:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r317672 - 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.23
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 May 2017 06:16:36 -0000

Author: pho
Date: Tue May  2 06:16:35 2017
New Revision: 317672
URL: https://svnweb.freebsd.org/changeset/base/317672

Log:
  Simplify test termination, return exit status 0 and added casts for round_page().
  
  Sponsored by:	Dell EMC Isilon

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

Modified: user/pho/stress2/misc/mmap26.sh
==============================================================================
--- user/pho/stress2/misc/mmap26.sh	Tue May  2 06:06:12 2017	(r317671)
+++ user/pho/stress2/misc/mmap26.sh	Tue May  2 06:16:35 2017	(r317672)
@@ -53,11 +53,9 @@ sleep 1
 
 (cd /tmp; /tmp/mmap26 /tmp/mmap26.inputfile)
 
-while ps auxww | grep -v grep | grep -qw swap; do
-	killall -9 swap 2>/dev/null
-done
+while pkill -9 swap; do :; done
 rm -f /tmp/mmap26 /tmp/mmap26.inputfile /tmp/mmap26.core
-exit
+exit 0
 
 EOF
 #include <sys/fcntl.h>
@@ -103,7 +101,8 @@ test(void)
 	p[len - 1] = 1;
 
 	/* one byte past EOF */
-	if (round_page(p + len) == round_page(p + len - 1)) {
+	if (round_page((unsigned long)&p[len]) ==
+	    round_page((unsigned long)&p[len - 1])) {
 		fprintf(stderr, "Expect: Segmentation fault (core dumped)\n");
 		c = p[len];
 	}