From owner-svn-src-user@freebsd.org Wed Apr 4 09:11:16 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9A9E6F9FA95 for ; Wed, 4 Apr 2018 09:11:16 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 498226DE54; Wed, 4 Apr 2018 09:11:16 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 43FEC119C9; Wed, 4 Apr 2018 09:11:16 +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 w349BGSE070190; Wed, 4 Apr 2018 09:11:16 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w349BG8S070186; Wed, 4 Apr 2018 09:11:16 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201804040911.w349BG8S070186@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 4 Apr 2018 09:11:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r332001 - 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: 332001 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.25 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Apr 2018 09:11:16 -0000 Author: pho Date: Wed Apr 4 09:11:15 2018 New Revision: 332001 URL: https://svnweb.freebsd.org/changeset/base/332001 Log: Scale back memory usage when no swap disk is available. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/crossmp3.sh Modified: user/pho/stress2/misc/crossmp3.sh ============================================================================== --- user/pho/stress2/misc/crossmp3.sh Wed Apr 4 09:05:48 2018 (r332000) +++ user/pho/stress2/misc/crossmp3.sh Wed Apr 4 09:11:15 2018 (r332001) @@ -41,14 +41,15 @@ . ../default.cfg CONT=/tmp/crossmp3.continue -N=`sysctl -n hw.ncpu` -usermem=`sysctl -n hw.usermem` -[ `swapinfo | wc -l` -eq 1 ] && usermem=$((usermem/100*80)) -size=$((usermem / 1024 / 1024 / N)) +if [ $# -eq 0 ]; then + N=`sysctl -n hw.ncpu` + usermem=`sysctl -n hw.usermem` + [ `sysctl -n vm.swap_total` -eq 0 ] && usermem=$((usermem / 2)) + size=$((usermem / 1024 / 1024 / N)) + echo "Using $N memory disks of size $size MB." -mounts=$N # Number of parallel scripts + mounts=$N # Number of parallel scripts -if [ $# -eq 0 ]; then for i in `jot $mounts`; do m=$(( i + mdstart - 1 )) [ ! -d ${mntpoint}$m ] && @@ -68,14 +69,13 @@ if [ $# -eq 0 ]; then ./$0 $m & ./$0 find & done - wait for i in `jot $mounts`; do m=$(( i + mdstart - 1 )) mdconfig -d -u $m done - + exit 0 else if [ $1 = find ]; then while [ -f $CONT ]; do