From owner-svn-src-user@FreeBSD.ORG  Mon Jul  8 11:30:00 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 6BB512C2;
 Mon,  8 Jul 2013 11:29:59 +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 AB6551D6D;
 Mon,  8 Jul 2013 11:29:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r68BTxch044782;
 Mon, 8 Jul 2013 11:29:59 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r68BTxCU044781;
 Mon, 8 Jul 2013 11:29:59 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201307081129.r68BTxCU044781@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Mon, 8 Jul 2013 11:29:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r253030 - user/pho/stress2/testcases/link
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 11:30:00 -0000

Author: pho
Date: Mon Jul  8 11:29:59 2013
New Revision: 253030
URL: http://svnweb.freebsd.org/changeset/base/253030

Log:
  Change max number of files per dir from 20.000 to 32.000.
  Fine tune the resource reservation.
  
  Sponsored by:	 EMC / Isilon storage division

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

Modified: user/pho/stress2/testcases/link/link.c
==============================================================================
--- user/pho/stress2/testcases/link/link.c	Mon Jul  8 11:18:47 2013	(r253029)
+++ user/pho/stress2/testcases/link/link.c	Mon Jul  8 11:29:59 2013	(r253030)
@@ -64,18 +64,15 @@ setup(int nb)
 			pct = random_int(1, 90);
 		size = size / 100 * pct + 1;
 
-		if (size > 20000 && op->hog == 0)
-			size = 20000;	/* arbitrary limit number of files pr. dir */
+		if (size > 32000 && op->hog == 0)
+			size = 32000;	/* arbitrary limit number of files pr. dir */
 		if (size > LINK_MAX)
 			size = LINK_MAX;
 
-
 		/* Resource requirements: */
-		reserve_in =  2 * op->incarnations + 1;
+		reserve_in =  2 * op->incarnations + 7;
 		reserve_bl = 26 * size * op->incarnations;
-		if (reserve_bl > bl)
-			size = bl / 26 * op->incarnations;
-		if (reserve_in > in)
+		if (reserve_in > in || reserve_bl > bl)
 			size = reserve_in = reserve_bl = 0;
 
 		if (op->verbose > 1)
@@ -102,6 +99,8 @@ setup(int nb)
 void
 cleanup(void)
 {
+	if (size == 0)
+		return;
 	(void)chdir("..");
 	if (path[0] != 0 && rmdir(path) == -1)
 		warn("rmdir(%s), %s:%d", path, __FILE__, __LINE__);
@@ -116,7 +115,7 @@ test(void)
 	char lfile[128];
 
 	pid = getpid();
-	for (j = 0; j < size && done_testing == 0; j++) {
+	for (j = 0; j < (int)size && done_testing == 0; j++) {
 		sprintf(file,"p%05d.%05d", pid, j);
 		if (j == 0) {
 			if ((fd = creat(file, 0660)) == -1) {