From owner-svn-src-user@FreeBSD.ORG  Tue Jul  9 08:16:08 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id F2C8AB5;
 Tue,  9 Jul 2013 08:16:07 +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 CC11F1F69;
 Tue,  9 Jul 2013 08:16:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r698G7TR009383;
 Tue, 9 Jul 2013 08:16:07 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r698G72J009382;
 Tue, 9 Jul 2013 08:16:07 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201307090816.r698G72J009382@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Tue, 9 Jul 2013 08:16:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r253064 - user/pho/stress2/testcases/rename
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: Tue, 09 Jul 2013 08:16:08 -0000

Author: pho
Date: Tue Jul  9 08:16:07 2013
New Revision: 253064
URL: http://svnweb.freebsd.org/changeset/base/253064

Log:
  Tune the resource reservation.
  
  Sponsored by:	EMC / Isilon storage division

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

Modified: user/pho/stress2/testcases/rename/rename.c
==============================================================================
--- user/pho/stress2/testcases/rename/rename.c	Tue Jul  9 08:03:47 2013	(r253063)
+++ user/pho/stress2/testcases/rename/rename.c	Tue Jul  9 08:16:07 2013	(r253064)
@@ -56,17 +56,17 @@ setup(int nb)
 		getdf(&bl, &in);
 		size = in / op->incarnations;
 
-		if (size > 100)
-			size = 100;	/* arbitrary limit number of files pr. dir */
+		if (size > 1000)
+			size = 1000;	/* arbitrary limit number of files pr. dir */
 
 		/* Resource requirements: */
 		while (size > 0) {
-			reserve_in =  1 * size * op->incarnations + 2 * op->incarnations;
-			reserve_bl = 100 * size * op->incarnations;
+			reserve_in =  2 * size * op->incarnations + 2 * op->incarnations;
+			reserve_bl = 30 * size * op->incarnations;
 //			printf("size = %lu, reserve(%jd, %jd)\n", size, reserve_bl/1024, reserve_in);
 			if (reserve_bl <= bl && reserve_in <= in)
 				break;
-			size--;
+			size = size / 2;
 		}
 		if (size == 0)
 			reserve_bl = reserve_in = 0;
@@ -79,6 +79,8 @@ setup(int nb)
 	} else {
 		size = getval();
 	}
+	if (size == 0)
+		exit(0);
 
 	sprintf(path,"%s.%05d", getprogname(), getpid());
 	if (mkdir(path, 0770) < 0)
@@ -108,21 +110,21 @@ test_rename(void)
 	int tfd;
 
 	pid = getpid();
-	for (i = 0; i < size; i++) {
+	for (i = 0; i < (int)size; i++) {
 		sprintf(file1,"p%05d.%05d", pid, i);
 		if ((tfd = open(file1, O_RDONLY|O_CREAT, 0660)) == -1)
 			err(1, "openat(%s), %s:%d", file1, __FILE__, __LINE__);
 		close(tfd);
 	}
-	for (j = 0; j < 100; j++) {
-		for (i = 0; i < size; i++) {
+	for (j = 0; j < 100 && done_testing == 0; j++) {
+		for (i = 0; i < (int)size; i++) {
 			sprintf(file1,"p%05d.%05d", pid, i);
 			sprintf(file2,"p%05d.%05d.togo", pid, i);
 			if (rename(file1, file2) == -1)
 				err(1, "rename(%s, %s). %s:%d", file1, file2,
 						__FILE__, __LINE__);
 		}
-		for (i = 0; i < size; i++) {
+		for (i = 0; i < (int)size; i++) {
 			sprintf(file1,"p%05d.%05d", pid, i);
 			sprintf(file2,"p%05d.%05d.togo", pid, i);
 			if (rename(file2, file1) == -1)
@@ -131,7 +133,7 @@ test_rename(void)
 		}
 	}
 
-	for (i = 0; i < size; i++) {
+	for (i = 0; i < (int)size; i++) {
 		sprintf(file1,"p%05d.%05d", pid, i);
 		if (unlink(file1) == -1)
 			err(1, "unlink(%s), %s:%d", file1, __FILE__, __LINE__);