From owner-p4-projects@FreeBSD.ORG Thu Feb 10 20:52:28 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55A3710656A8; Thu, 10 Feb 2011 20:52:28 +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 17976106566B for ; Thu, 10 Feb 2011 20:52:28 +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 04A7E8FC1B for ; Thu, 10 Feb 2011 20:52:28 +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 p1AKqRt7047382 for ; Thu, 10 Feb 2011 20:52:27 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p1AKqRpw047379 for perforce@freebsd.org; Thu, 10 Feb 2011 20:52:27 GMT (envelope-from trasz@freebsd.org) Date: Thu, 10 Feb 2011 20:52:27 GMT Message-Id: <201102102052.p1AKqRpw047379@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 188695 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Feb 2011 20:52:28 -0000 http://p4web.freebsd.org/@@188695?ac=10 Change 188695 by trasz@trasz_victim on 2011/02/10 20:52:13 Simplify. Affected files ... .. //depot/projects/soc2009/trasz_limits/usr.bin/jailstat/jailstat.sh#4 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/usr.bin/jailstat/jailstat.sh#4 (text+ko) ==== @@ -70,9 +70,8 @@ n=0 while :; do if [ "`basename $0`" = "jailstat" ]; then - jails="`ps ax -o jid= | sort -u | sed 1d`" printf "JID\t%%CPU\tLIMIT\tRSS\tLIMIT\tVMEM\tLIMIT\tSWAP\tLIMIT\n" - for jail in $jails; do + jls jid | while read jail; do # Put resource=value pairs into environment variables. eval `rctl $hflag -u j:$jail` @@ -85,9 +84,8 @@ done else - users="`ps ax -o user= | sort -u`" printf "USER\t%%CPU\tLIMIT\tRSS\tLIMIT\tVMEM\tLIMIT\tSWAP\tLIMIT\n" - for user in $users; do + ps ax -o user= | sort -u | while read user; do # Put resource=value pairs into environment variables. eval `rctl $hflag -u u:$user`