From owner-svn-src-user@freebsd.org  Fri Jul  7 11:20:37 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 3FB04DA08CE
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri,  7 Jul 2017 11:20:37 +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 0E019761CA;
 Fri,  7 Jul 2017 11:20: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 v67BKaX7061912;
 Fri, 7 Jul 2017 11:20:36 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v67BKaQS061911;
 Fri, 7 Jul 2017 11:20:36 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201707071120.v67BKaQS061911@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: Fri, 7 Jul 2017 11:20:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r320768 - user/pho/stress2/misc
X-SVN-Group: user
X-SVN-Commit-Author: pho
X-SVN-Commit-Paths: user/pho/stress2/misc
X-SVN-Commit-Revision: 320768
X-SVN-Commit-Repository: base
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: Fri, 07 Jul 2017 11:20:37 -0000

Author: pho
Date: Fri Jul  7 11:20:35 2017
New Revision: 320768
URL: https://svnweb.freebsd.org/changeset/base/320768

Log:
  Handle vm.stats.vm.v_wire_count exceeding vm.max_wired.
  
  Sponsored by:	Dell EMC Isilon

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

Modified: user/pho/stress2/misc/mmap18.sh
==============================================================================
--- user/pho/stress2/misc/mmap18.sh	Fri Jul  7 10:22:13 2017	(r320767)
+++ user/pho/stress2/misc/mmap18.sh	Fri Jul  7 11:20:35 2017	(r320768)
@@ -46,8 +46,9 @@ mycc -o mmap18 -Wall -Wextra -O2 mmap18.c -lpthread ||
 rm -f mmap18.c
 
 s=0
-wire=$((`sysctl -n vm.max_wired` - `sysctl -n vm.stats.vm.v_wire_count`))
 for i in `jot 5`; do
+	wire=$((`sysctl -n vm.max_wired` - \
+	    `sysctl -n vm.stats.vm.v_wire_count`))
 	/tmp/mmap18 $wire || s=1
 done
 
@@ -267,8 +268,8 @@ main(int argc, char *argv[])
 	if (getrlimit(RLIMIT_MEMLOCK, &rl) == -1)
 		warn("getrlimit");
 	maxlock = atol(argv[1]);
-	if (maxlock == 0)
-		errx(1, "Argument is zero");
+	if (maxlock <= 0)
+		errx(1, "Bad argument %jd", maxlock);
 	maxlock = (maxlock / 10 * 8) / PARALLEL * PAGE_SIZE;
 	if (maxlock < rl.rlim_cur) {
 		rl.rlim_max = rl.rlim_cur = maxlock;