Return-Path: Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org Received: (qmail 33992 invoked from network); 14 Jul 2006 10:18:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Jul 2006 10:18:12 -0000 Received: (qmail 43790 invoked by uid 500); 14 Jul 2006 10:18:12 -0000 Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org Received: (qmail 43714 invoked by uid 500); 14 Jul 2006 10:18:12 -0000 Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@perl.apache.org List-Id: Delivered-To: mailing list modperl-cvs@perl.apache.org Received: (qmail 43703 invoked by uid 99); 14 Jul 2006 10:18:12 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jul 2006 03:18:12 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jul 2006 03:18:11 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id C82A41A981A; Fri, 14 Jul 2006 03:17:51 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r421857 - /perl/modperl/trunk/lib/Apache2/SizeLimit.pm Date: Fri, 14 Jul 2006 10:17:51 -0000 To: modperl-cvs@perl.apache.org From: pgollucci@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060714101751.C82A41A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: pgollucci Date: Fri Jul 14 03:17:49 2006 New Revision: 421857 URL: http://svn.apache.org/viewvc?rev=421857&view=rev Log: sync with http://svn.apache.org/viewvc?rev=419948&view=rev over in Apache-SizeLimit land. Modified: perl/modperl/trunk/lib/Apache2/SizeLimit.pm Modified: perl/modperl/trunk/lib/Apache2/SizeLimit.pm URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/SizeLimit.pm?rev=421857&r1=421856&r2=421857&view=diff ============================================================================== --- perl/modperl/trunk/lib/Apache2/SizeLimit.pm (original) +++ perl/modperl/trunk/lib/Apache2/SizeLimit.pm Fri Jul 14 03:17:49 2006 @@ -138,8 +138,16 @@ return ($size, 0); } -sub bsd_size_check { - return (BSD::Resource::getrusage())[ 2, 3 ]; +# rss is in KB but ixrss is in BYTES. +# This is true on at least FreeBSD, OpenBSD, NetBSD +# Philip M. Gollucci +sub _bsd_size_check { + + my @results = BSD::Resource::getrusage(); + my $max_rss = $results[2]; + my $max_ixrss = int ( $results[3] / 1024 ); + + return ( $max_rss, $max_ixrss ); } sub win32_size_check {