Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 16 Nov 2015 04:53:13 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r290911 - head/contrib/netbsd-tests/kernel
Message-ID:  <201511160453.tAG4rDje043588@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Mon Nov 16 04:53:13 2015
New Revision: 290911
URL: https://svnweb.freebsd.org/changeset/base/290911

Log:
  Ignore EINTR from usleep(3) in try_locks(..)
  
  NetBSD's usleep(3) only returns -1/sets errno=EINVAL when `microseconds`
  is one million or more
  
  MFC after: 3 days
  Submitted by: pho
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/contrib/netbsd-tests/kernel/t_lockf.c

Modified: head/contrib/netbsd-tests/kernel/t_lockf.c
==============================================================================
--- head/contrib/netbsd-tests/kernel/t_lockf.c	Mon Nov 16 04:28:00 2015	(r290910)
+++ head/contrib/netbsd-tests/kernel/t_lockf.c	Mon Nov 16 04:53:13 2015	(r290911)
@@ -102,6 +102,9 @@ trylocks(int id)
 		(void)fcntl(fd, F_SETLKW, &fl);
 
 		if (usleep(sleeptime) < 0) 
+#if defined(__FreeBSD__)
+		  if (errno != EINTR)
+#endif
 		  err(1, "usleep");
 	}
 	printf("%d: done\n", id);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511160453.tAG4rDje043588>