From owner-p4-projects@FreeBSD.ORG  Wed Jan 26 19:38:36 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 78B611065674; Wed, 26 Jan 2011 19:38:36 +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 3B1A71065672
	for <perforce@freebsd.org>; Wed, 26 Jan 2011 19:38:36 +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 0E5648FC08
	for <perforce@freebsd.org>; Wed, 26 Jan 2011 19:38:36 +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 p0QJcZq9067407
	for <perforce@freebsd.org>; Wed, 26 Jan 2011 19:38:35 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0QJcZ6r067404
	for perforce@freebsd.org; Wed, 26 Jan 2011 19:38:35 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 26 Jan 2011 19:38:35 GMT
Message-Id: <201101261938.p0QJcZ6r067404@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 188203 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: Wed, 26 Jan 2011 19:38:36 -0000

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

Change 188203 by trasz@trasz_victim on 2011/01/26 19:38:04

	Optimize a little, using shell string manipulation instead of sed.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/usr.bin/jailstat/jailstat.sh#2 edit

Differences ...

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

@@ -34,6 +34,16 @@
 	exit 1
 }
 
+get_limit() {
+	rule=`rctl $hflag $1`
+	if [ -z "$rule" ]; then
+		echo "-"
+	else
+		amount="${rule##*=}"
+		echo "$amount"
+	fi
+}
+
 hflag="-h"
 
 while getopts 's' cmd_arg; do
@@ -66,14 +76,10 @@
 			# Put resource=value pairs into environment variables.
 			eval `rctl $hflag -u j:$jail`
 
-			pctcpulimit=`rctl $hflag j:$jail:pctcpu:deny=/jail | sed 's/.*=//'`
-			: ${pctcpulimit:="-"}
-			rsslimit=`rctl $hflag j:$jail:rss:deny=/jail | sed 's/.*=//'`
-			: ${rsslimit:="-"}
-			vmemlimit=`rctl $hflag j:$jail:vmem:deny=/jail | sed 's/.*=//'`
-			: ${vmemlimit:="-"}
-			swaplimit=`rctl $hflag j:$jail:swap:deny=/jail | sed 's/.*=//'`
-			: ${swaplimit:="-"}
+			pctcpulimit=`get_limit j:$jail:pctcpu:deny=/jail`
+			rsslimit=`get_limit j:$jail:rss:deny=/jail`
+			vmemlimit=`get_limit j:$jail:vmem:deny=/jail`
+			swaplimit=`get_limit j:$jail:swap:deny=/jail`
 
 			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
@@ -85,14 +91,10 @@
 			# Put resource=value pairs into environment variables.
 			eval `rctl $hflag -u u:$user`
 
-			pctcpulimit=`rctl $hflag u:$user:pctcpu:deny=/user | sed 's/.*=//'`
-			: ${pctcpulimit:="-"}
-			rsslimit=`rctl $hflag u:$user:rss:deny=/user | sed 's/.*=//'`
-			: ${rsslimit:="-"}
-			vmemlimit=`rctl $hflag u:$user:vmem:deny=/user | sed 's/.*=//'`
-			: ${vmemlimit:="-"}
-			swaplimit=`rctl $hflag u:$user:swap:deny=/user | sed 's/.*=//'`
-			: ${swaplimit:="-"}
+			pctcpulimit=`get_limit u:$user:pctcpu:deny=/user`
+			rsslimit=`get_limit u:$user:rss:deny=/user`
+			vmemlimit=`get_limit u:$user:vmem:deny=/user`
+			swaplimit=`get_limit u:$user:swap:deny=/user`
 
 			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
@@ -109,4 +111,3 @@
 	[ "$count" -gt 0 -a "$n" -ge "$count" ] && break
 	sleep "$wait"
 done
-