From owner-svn-src-user@FreeBSD.ORG  Mon Jul  8 12:11:55 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1885F30C;
 Mon,  8 Jul 2013 12:11:55 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0B93F1CAE;
 Mon,  8 Jul 2013 12:11:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r68CBs87059109;
 Mon, 8 Jul 2013 12:11:54 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r68CBsk1059108;
 Mon, 8 Jul 2013 12:11:54 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201307081211.r68CBsk1059108@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Mon, 8 Jul 2013 12:11:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r253032 - user/pho/stress2/testcases/mkdir
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jul 2013 12:11:55 -0000

Author: pho
Date: Mon Jul  8 12:11:54 2013
New Revision: 253032
URL: http://svnweb.freebsd.org/changeset/base/253032

Log:
  Fine tune resource reservation.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/testcases/mkdir/mkdir.c

Modified: user/pho/stress2/testcases/mkdir/mkdir.c
==============================================================================
--- user/pho/stress2/testcases/mkdir/mkdir.c	Mon Jul  8 12:07:36 2013	(r253031)
+++ user/pho/stress2/testcases/mkdir/mkdir.c	Mon Jul  8 12:11:54 2013	(r253032)
@@ -60,17 +60,15 @@ setup(int nb)
 			pct = random_int(1, 90);
 		size = size / 100 * pct + 1;
 
-		size = size % 10000;	/* arbitrary limit depth */
-		size = size % 200;	/* arbitrary limit depth */ /* XXX Soft Update */
+		size = size % 200;	/* arbitrary limit depth */
 
 		/* Resource requirements: */
 		while (size > 0) {
-			reserve_in =    1 * size * op->incarnations + 1;
-			reserve_bl = 2048 * size * op->incarnations;
-//			printf("---size = %lu, reserve(%jd, %jd)\n", size, reserve_bl/1024, reserve_in);
+			reserve_in =    1 * size * op->incarnations;
+			reserve_bl = 4096 * size * op->incarnations;
 			if (reserve_bl <= bl && reserve_in <= in)
 				break;
-			size--;
+			size = size / 2;
 		}
 		if (size == 0)
 			reserve_bl = reserve_in = 0;
@@ -83,6 +81,9 @@ setup(int nb)
 	} else
 		size = getval();
 
+	if (size == 0)
+		exit(0);
+
 	return (0);
 }
 
@@ -104,7 +105,7 @@ mkDir(char *path, int level) {
 	if (done_testing == 1)
 		size = level;
 
-	if (level < size) {
+	if (level < (int)size) {
 		sprintf(newPath,"d%d", level+1);
 		mkDir(newPath, level+1);
 	}
@@ -114,7 +115,7 @@ void
 rmDir(char *path, int level) {
 	char newPath[MAXPATHLEN + 1];
 
-	if (level < size) {
+	if (level < (int)size) {
 		sprintf(newPath,"d%d", level+1);
 		rmDir(newPath, level+1);
 	}