From owner-svn-src-user@freebsd.org  Fri May 12 09:30:58 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 A1229D66235
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri, 12 May 2017 09:30:58 +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 6E8D2199C;
 Fri, 12 May 2017 09:30:58 +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 v4C9Uvt5042959;
 Fri, 12 May 2017 09:30:57 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4C9UvPd042958;
 Fri, 12 May 2017 09:30:57 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201705120930.v4C9UvPd042958@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, 12 May 2017 09:30:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r318235 - user/pho/stress2/tools
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: Fri, 12 May 2017 09:30:58 -0000

Author: pho
Date: Fri May 12 09:30:57 2017
New Revision: 318235
URL: https://svnweb.freebsd.org/changeset/base/318235

Log:
  Added more items to watch.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/tools/vmstat.sh

Modified: user/pho/stress2/tools/vmstat.sh
==============================================================================
--- user/pho/stress2/tools/vmstat.sh	Fri May 12 08:35:46 2017	(r318234)
+++ user/pho/stress2/tools/vmstat.sh	Fri May 12 09:30:57 2017	(r318235)
@@ -41,6 +41,7 @@ while getopts dmz flag; do
         esac
 done
 
+pages=`sysctl -n vm.stats.vm.v_page_count`
 start=`date '+%s'`
 OIFS=$IFS
 while true; do
@@ -54,7 +55,7 @@ while true; do
 	done
 
 	# ITEM                   SIZE  LIMIT     USED
-	[ -z "$optz" ] && vmstat -z | sed "1,2d;/^$/d;s/: /, /" |
+	[ -z "$optz" ] && vmstat -z | sed "1,2d;/^$/d;s/: /, /" | sed -E 's/[^[:print:]\r\t]/ /g' |
 	    while read l; do
 		IFS=','
 		set $l
@@ -70,8 +71,17 @@ while true; do
 		   echo "vmstat -z $1,$tot"
 	done
 
+	r=`sysctl -n vm.stats.vm.v_wire_count`
+	[ -n "$r" ] &&
 	echo "vm.cnt.v_wire_count, \
-	    $((`sysctl -n vm.stats.vm.v_wire_count` * 4))"
+	    $((r * 4))"
+	r=`sysctl -n vm.stats.vm.v_free_count`
+	[ -n "$r" ] &&
+	echo "pages in use, \
+	    $(((pages - r) * 4))"
+	r=`sysctl -n vm.kmem_map_size`
+	[ -n "$r" ] &&
+	echo "kmem_map_size, $r"
 	sleep 10
 done | awk $debug -F, '
 {