From owner-p4-projects@FreeBSD.ORG  Thu Jan 13 22:34:08 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C25DC1065675; Thu, 13 Jan 2011 22:34:08 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 850821065673
	for <perforce@freebsd.org>; Thu, 13 Jan 2011 22:34:08 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 57FE98FC16
	for <perforce@freebsd.org>; Thu, 13 Jan 2011 22:34:08 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0DMY80B043383
	for <perforce@freebsd.org>; Thu, 13 Jan 2011 22:34:08 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0DMY8hu043380
	for perforce@freebsd.org; Thu, 13 Jan 2011 22:34:08 GMT
	(envelope-from trasz@freebsd.org)
Date: Thu, 13 Jan 2011 22:34:08 GMT
Message-Id: <201101132234.p0DMY8hu043380@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 187783 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Jan 2011 22:34:09 -0000

http://p4web.freebsd.org/@@187783?ac=10

Change 187783 by trasz@trasz_victim on 2011/01/13 22:33:09

	u

Affected files ...

.. //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#4 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#4 (text+ko) ====

@@ -29,10 +29,6 @@
 #
 # $FreeBSD$
 
-format_stats() {
-	awk -F= '/^pctcpu/ { pctcpu=$2 } /^rss/ { rss=$2 } /^vmem/ { vmem=$2 } /^swap/ { swap=$2 } END { printf "%s\t%s\t%s\t%s\n", pctcpu, rss, vmem, swap }'
-}
-
 usage() {
 	echo "usage: `basename $0` [-h]  [wait [count]]"
 	exit 1
@@ -57,18 +53,32 @@
 while :; do
 	if [ "`basename $0`" = "jailstat" ]; then
 		jails="`ps ax -o jid= | sort -u | sed 1d`"
-		printf "JID\t%%CPU\tRSS\tVSIZE\tSWAP\n"
+		printf "JID\t%%CPU\tLIMIT\tRSS\tLIMIT\tVMEM\tLIMIT\tSWAP\tLIMIT\n"
 		for jail in $jails; do
-			printf "$jail\t"
-			rctl $hflag -u j:$jail | format_stats
+			# Put resource=value pairs into environment variables.
+			eval `rctl $hflag -u j:$jail`
+
+			pctcpulimit=`rctl j:$jail:pctcpu:deny=/jail | sed 's/.*=//'`
+			rsslimit=`rctl j:$jail:rss:deny=/jail | sed 's/.*=//'`
+			vmemlimit=`rctl j:$jail:vmem:deny=/jail | sed 's/.*=//'`
+			swaplimit=`rctl j:$jail:swap:deny=/jail | sed 's/.*=//'`
+
+			printf "%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\n" "$jail" "$pctcpu" "$pctcpulimit" "$rss" "$rsslimit" "$vmem" "$vmemlimit" "$swap" "$swaplimit"
 		done
 
 	else
 		users="`ps ax -o user= | sort -u`"
-		printf "USER\t%%CPU\tRSS\tVSIZE\tSWAP\n"
+		printf "USER\t%%CPU\tLIMIT\tRSS\tLIMIT\tVMEM\tLIMIT\tSWAP\tLIMIT\n"
 		for user in $users; do
-			printf "$user\t"
-			rctl $hflag -u u:$user | format_stats
+			# Put resource=value pairs into environment variables.
+			eval `rctl $hflag -u u:$user`
+
+			pctcpulimit=`rctl u:$user:pctcpu:deny=/user | sed 's/.*=//'`
+			rsslimit=`rctl u:$user:rss:deny=/user | sed 's/.*=//'`
+			vmemlimit=`rctl u:$user:vmem:deny=/user | sed 's/.*=//'`
+			swaplimit=`rctl u:$user:swap:deny=/user | sed 's/.*=//'`
+
+			printf "%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\n" "$user" "$pctcpu" "$pctcpulimit" "$rss" "$rsslimit" "$vmem" "$vmemlimit" "$swap" "$swaplimit"
 		done
 	fi