From owner-svn-src-user@FreeBSD.ORG  Tue Jul  9 06:51:42 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 19B86DC2;
 Tue,  9 Jul 2013 06:51:42 +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 0D86E1BB1;
 Tue,  9 Jul 2013 06:51:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r696pfZp084085;
 Tue, 9 Jul 2013 06:51:41 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r696pfvm084084;
 Tue, 9 Jul 2013 06:51:41 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201307090651.r696pfvm084084@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Tue, 9 Jul 2013 06:51:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r253056 - user/pho/stress2/testcases/symlink
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 06:51:42 -0000

Author: pho
Date: Tue Jul  9 06:51:41 2013
New Revision: 253056
URL: http://svnweb.freebsd.org/changeset/base/253056

Log:
  Tune resource reservation, exit success and test more often for test done.
  
  Sponsored by:	EMC / Isilon storage division

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

Modified: user/pho/stress2/testcases/symlink/symlink.c
==============================================================================
--- user/pho/stress2/testcases/symlink/symlink.c	Tue Jul  9 06:39:32 2013	(r253055)
+++ user/pho/stress2/testcases/symlink/symlink.c	Tue Jul  9 06:51:41 2013	(r253056)
@@ -62,17 +62,16 @@ setup(int nb)
 			pct = random_int(1, 90);
 		size = size / 100 * pct + 1;
 
-		if (size > 20000)
-			size = 20000;	/* arbitrary limit number of files pr. dir */
+		if (size > 32000)
+			size = 32000;	/* arbitrary limit number of files pr. dir */
 
 		/* Resource requirements: */
 		while (size > 0) {
-			reserve_in =  1 * size * op->incarnations;
-			reserve_bl = 36 * size * op->incarnations;
-//			printf("size = %lu, reserve(%jd, %jd)\n", size, reserve_bl/1024, reserve_in);
+			reserve_in =  1 * size * op->incarnations + op->incarnations;
+			reserve_bl = 26 * size * op->incarnations;
 			if (reserve_bl <= bl && reserve_in <= in)
 				break;
-			size--;
+			size = size / 2;
 		}
 		if (size == 0)
 			reserve_bl = reserve_in = 0;
@@ -85,6 +84,8 @@ setup(int nb)
 	} else {
 		size = getval();
 	}
+	if (size == 0)
+		exit(0);
 
 	sprintf(path,"%s.%05d", getprogname(), getpid());
 	if (mkdir(path, 0770) < 0)
@@ -113,7 +114,7 @@ test(void)
 	char file[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 (symlink("/tmp/not/there", file) == -1) {
 			if (errno != EINTR) {
@@ -124,7 +125,6 @@ test(void)
 				break;
 			}
 		}
-		if (j % 4000) sleep(1);
 	}
 
 	for (i = --j; i >= 0; i--) {