svn commit: r254699 - head/sys/kern

[John Baldwin]

Author: jhb
Date: Fri Aug 23 13:47:41 2013
New Revision: 254699
URL: http://svnweb.freebsd.org/changeset/base/254699

Log:
  Use tvtohz() to convert a socket buffer timeout to a tick value rather
  than using a home-rolled version.  The home-rolled version could result
  in shorter-than-requested sleeps.
  
  Reported by:	Vitja Makarov <vitja.makarov at gmail.com>
  MFC after:	2 weeks

Modified:
  head/sys/kern/uipc_socket.c

Modified: head/sys/kern/uipc_socket.c
==============================================================================
--- head/sys/kern/uipc_socket.c	Fri Aug 23 13:47:18 2013	(r254698)
+++ head/sys/kern/uipc_socket.c	Fri Aug 23 13:47:41 2013	(r254699)
@@ -2699,21 +2699,16 @@ sosetopt(struct socket *so, struct socko
 			if (error)
 				goto bad;
 
-			/* assert(hz > 0); */
 			if (tv.tv_sec < 0 || tv.tv_sec > INT_MAX / hz ||
 			    tv.tv_usec < 0 || tv.tv_usec >= 1000000) {
 				error = EDOM;
 				goto bad;
 			}
-			/* assert(tick > 0); */
-			/* assert(ULONG_MAX - INT_MAX >= 1000000); */
-			val = (u_long)(tv.tv_sec * hz) + tv.tv_usec / tick;
-			if (val > INT_MAX) {
+			val = tvtohz(&tv);
+			if (val == INT_MAX) {
 				error = EDOM;
 				goto bad;
 			}
-			if (val == 0 && tv.tv_usec != 0)
-				val = 1;
 
 			switch (sopt->sopt_name) {
 			case SO_SNDTIMEO: