From owner-svn-src-projects@FreeBSD.ORG  Sun May 10 18:58:30 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB821106564A;
	Sun, 10 May 2009 18:58:30 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9A7D28FC16;
	Sun, 10 May 2009 18:58:30 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4AIwUOm065898;
	Sun, 10 May 2009 18:58:30 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4AIwUUg065897;
	Sun, 10 May 2009 18:58:30 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <200905101858.n4AIwUUg065897@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Sun, 10 May 2009 18:58:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191974 - projects/stress2/testcases/swap
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 May 2009 18:58:30 -0000

Author: pho
Date: Sun May 10 18:58:30 2009
New Revision: 191974
URL: http://svn.freebsd.org/changeset/base/191974

Log:
  Handle the noswap scenario. While here, remove unused variable and fix
  spacing

Modified:
  projects/stress2/testcases/swap/swap.c

Modified: projects/stress2/testcases/swap/swap.c
==============================================================================
--- projects/stress2/testcases/swap/swap.c	Sun May 10 18:43:43 2009	(r191973)
+++ projects/stress2/testcases/swap/swap.c	Sun May 10 18:58:30 2009	(r191974)
@@ -48,7 +48,6 @@ setup(int nb)
 	int pct;
 	unsigned long mem;
 	int64_t  swapinfo = 0;
-	unsigned long s;
 	struct rlimit rlp;
 
 	if (nb == 0) {
@@ -69,7 +68,10 @@ setup(int nb)
 		if (op->hog >= 3)
 			pct = random_int(100, 110);
 
-		s = size = swapinfo / 100 * pct + mem;
+		if (swapinfo == 0)
+			size = mem / 100 * pct;
+		else
+			size = swapinfo / 100 * pct + mem;
 
 		size = size / op->incarnations;
 
@@ -84,7 +86,7 @@ setup(int nb)
 
 		if (op->verbose > 1 && nb == 0)
 			printf("setup: pid %d, %d%%. Total %luMb\n",
-				getpid(), pct, size / 1024 / 1024 *  op->incarnations);
+				getpid(), pct, size / 1024 / 1024 * op->incarnations);
 	} else
 		size = getval();
 	return (0);