From owner-svn-src-user@freebsd.org  Wed Jul 20 18:27:43 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8908BB9FA34
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Wed, 20 Jul 2016 18:27:43 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4D2AF168A;
 Wed, 20 Jul 2016 18:27:43 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6KIRgEO044441;
 Wed, 20 Jul 2016 18:27:42 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6KIRgZr044439;
 Wed, 20 Jul 2016 18:27:42 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201607201827.u6KIRgZr044439@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Wed, 20 Jul 2016 18:27:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r303108 - in user/pho/stress2/testcases: lockf lockf2
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.22
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Jul 2016 18:27:43 -0000

Author: pho
Date: Wed Jul 20 18:27:42 2016
New Revision: 303108
URL: https://svnweb.freebsd.org/changeset/base/303108

Log:
  Handle EINTR + style fixes.
  
  Sponsored by:	EMC / Isilon Storage Division

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

Modified: user/pho/stress2/testcases/lockf/lockf.c
==============================================================================
--- user/pho/stress2/testcases/lockf/lockf.c	Wed Jul 20 18:26:48 2016	(r303107)
+++ user/pho/stress2/testcases/lockf/lockf.c	Wed Jul 20 18:27:42 2016	(r303108)
@@ -30,28 +30,32 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/wait.h>
-#include <signal.h>
-#include <errno.h>
+
 #include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #include <stress.h>
 
-char file[128];
+pid_t pid;
 int fd;
 int freespace;
-pid_t	pid;
+char file[128];
 
 int
 get(void) {
-	int sem;
-	if (lockf(fd, F_LOCK, 0) == -1)
+	int r, sem;
+
+	do {
+		r = lockf(fd, F_LOCK, 0);
+	} while (r == -1 && errno == EINTR);
+	if (r == -1)
 		err(1, "lockf(%s, F_LOCK)", file);
 	if (read(fd, &sem, sizeof(sem)) != sizeof(sem))
 		err(1, "get: read(%d)", fd);
@@ -64,8 +68,12 @@ get(void) {
 
 void
 incr(void) {
-	int sem;
-	if (lockf(fd, F_LOCK, 0) == -1)
+	int r, sem;
+
+	do {
+		r = lockf(fd, F_LOCK, 0);
+	} while (r == -1 && errno == EINTR);
+	if (r == -1)
 		err(1, "lockf(%s, F_LOCK)", file);
 	if (read(fd, &sem, sizeof(sem)) != sizeof(sem))
 		err(1, "incr: read(%d)", fd);

Modified: user/pho/stress2/testcases/lockf2/lockf2.c
==============================================================================
--- user/pho/stress2/testcases/lockf2/lockf2.c	Wed Jul 20 18:26:48 2016	(r303107)
+++ user/pho/stress2/testcases/lockf2/lockf2.c	Wed Jul 20 18:27:42 2016	(r303108)
@@ -36,15 +36,15 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/types.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/param.h>
 #include <strings.h>
-#include <errno.h>
-#include <err.h>
+#include <unistd.h>
 
 #include <stress.h>
 
@@ -103,9 +103,9 @@ cleanup(void)
 int
 test(void)
 {
-	int i;
 	off_t pos;
 	off_t size;
+	int i, r;
 
 	if ((fd = open(file, O_RDWR, 0600)) == -1)
 		err(1, "open(%s)", file);
@@ -117,7 +117,10 @@ test(void)
 		size = random_int(1, 1024 * 1024 - pos);
 		if (size > 64)
 			size = 64;
-		if (lockf(fd, F_LOCK, size) == -1)
+		do {
+			r = lockf(fd, F_LOCK, size);
+		} while (r == -1 && errno == EINTR);
+		if (r == -1)
 			err(1, "lockf(%s, F_LOCK)", file);
 		size = random_int(1, size);
 		if (lockf(fd, F_ULOCK, size) == -1)