From owner-svn-src-user@FreeBSD.ORG  Mon Jul  8 12:07:37 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 7C3EA13F;
 Mon,  8 Jul 2013 12:07:37 +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 6F7041C50;
 Mon,  8 Jul 2013 12:07:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r68C7bOw056773;
 Mon, 8 Jul 2013 12:07:37 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r68C7bAR056772;
 Mon, 8 Jul 2013 12:07:37 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201307081207.r68C7bAR056772@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Mon, 8 Jul 2013 12:07:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r253031 - user/pho/stress2/testcases/lockf
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:07:37 -0000

Author: pho
Date: Mon Jul  8 12:07:36 2013
New Revision: 253031
URL: http://svnweb.freebsd.org/changeset/base/253031

Log:
  Added missing resource reservation to this test. Moved debug information to
  a higher verbose level.
  
  Sponsored by:	EMC / Isilon storage division

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

Modified: user/pho/stress2/testcases/lockf/lockf.c
==============================================================================
--- user/pho/stress2/testcases/lockf/lockf.c	Mon Jul  8 11:29:59 2013	(r253030)
+++ user/pho/stress2/testcases/lockf/lockf.c	Mon Jul  8 12:07:36 2013	(r253031)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 
 char file[128];
 int fd;
+int freespace;
 pid_t	pid;
 
 int
@@ -78,9 +79,36 @@ incr(void) {
 	if (lockf(fd, F_ULOCK, 0) == -1)
 		err(1, "lockf(%s, F_ULOCK)", file);
 }
+
 int
 setup(int nb)
 {
+	int64_t bl;
+	int64_t in;
+	int64_t reserve_bl;
+	int64_t reserve_in;
+
+	if (nb == 0) {
+		getdf(&bl, &in);
+
+		/* Resource requirements: */
+		reserve_in =    1 * op->incarnations;
+		reserve_bl = 4096 * op->incarnations;
+		freespace = (reserve_bl <= bl && reserve_in <= in);
+		if (!freespace)
+			reserve_bl = reserve_in = 0;
+
+		if (op->verbose > 1)
+			printf("lockf(incarnations=%d). Free(%jdk, %jd), reserve(%jdk, %jd)\n",
+			    op->incarnations, bl/1024, in, reserve_bl/1024, reserve_in);
+		reservedf(reserve_bl, reserve_in);
+		putval(freespace);
+	} else {
+		freespace = getval();
+	}
+	if (!freespace)
+		exit(0);
+
         return (0);
 }
 
@@ -113,7 +141,7 @@ test(void)
 		for (i = 0; i < 100; i++) {
 			while ((get() & 1) == 0)
 				;
-			if (op->verbose > 2)
+			if (op->verbose > 3)
 				printf("Child  %d, sem = %d\n", i, get()),
 					fflush(stdout);
 			incr();
@@ -123,7 +151,7 @@ test(void)
 		for (i = 0; i < 100; i++) {
 			while ((get() & 1) == 1)
 				;
-			if (op->verbose > 2)
+			if (op->verbose > 3)
 				printf("Parent %d, sem = %d\n", i, get()),
 					fflush(stdout);
 			incr();