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

[Peter Holm]

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;