From owner-svn-src-user@freebsd.org  Tue May  9 10:42:24 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 BF2C9D63DD2
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Tue,  9 May 2017 10:42:24 +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 693C111FE;
 Tue,  9 May 2017 10:42:24 +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 v49AgNKj089314;
 Tue, 9 May 2017 10:42:23 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v49AgNTB089313;
 Tue, 9 May 2017 10:42:23 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201705091042.v49AgNTB089313@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, 9 May 2017 10:42:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r318020 - 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, 09 May 2017 10:42:24 -0000

Author: pho
Date: Tue May  9 10:42:23 2017
New Revision: 318020
URL: https://svnweb.freebsd.org/changeset/base/318020

Log:
  Limit VM pressure when run without a swap disk.
  
  Sponsored by:	Dell EMC Isilon

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

Modified: user/pho/stress2/misc/swap2.sh
==============================================================================
--- user/pho/stress2/misc/swap2.sh	Tue May  9 09:53:18 2017	(r318019)
+++ user/pho/stress2/misc/swap2.sh	Tue May  9 10:42:23 2017	(r318020)
@@ -57,19 +57,19 @@ mycc -o swap2 -Wall -Wextra -O2 swap2.c 
 rm -f swap2.c
 cd $odir
 
-usermem=`sysctl hw.usermem | sed 's/.* //'`
-swap=`sysctl vm.swap_total | sed 's/.* //'`
+usermem=`sysctl -n hw.usermem`
+swap=`sysctl -n vm.swap_total`
 
 if [ $swap -gt 0 ]; then
 	size=$((usermem/10*11))
 else
-	size=$((usermem/10*9))
+	size=$((usermem/10*8))
 fi
 
 /tmp/swap2 $((size / 4096)) &
 sleep 30
 su $testuser -c "(cd ../testcases/rw;   ./rw   -t 3m -i 40 -l 100 -v -h -h)" &
-wait; wait
+wait
 
 while mount | grep $mntpoint | grep -q /dev/md; do
 	umount $mntpoint || sleep 1