From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 2 Aug 2010 23:46:12 +0000 (-0700)
Subject: Hurd: fix timeout rounding in select
X-Git-Tag: glibc-2.11.3~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07b72c0b42b82f0432afcfb60a2cbb2c0f011420;p=thirdparty%2Fglibc.git

Hurd: fix timeout rounding in select
(cherry picked from commit 5a42321d438211210e0869e5e90f8d75d1354e14)
---

diff --git a/ChangeLog b/ChangeLog
index ea5e7d2789b..56527153656 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-31  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* hurd/hurdselect.c (_hurd_select): Round timeout up instead of down
+	when converting to ms.
+
 2010-07-29  Roland McGrath  <roland@redhat.com>
 
 	[BZ 11856]
diff --git a/hurd/hurdselect.c b/hurd/hurdselect.c
index 544eee9cb5b..a7228f06118 100644
--- a/hurd/hurdselect.c
+++ b/hurd/hurdselect.c
@@ -52,7 +52,7 @@ _hurd_select (int nfds,
   int firstfd, lastfd;
   mach_msg_timeout_t to = (timeout != NULL ?
 			   (timeout->tv_sec * 1000 +
-			    timeout->tv_nsec / 1000000) :
+			    (timeout->tv_nsec + 999999) / 1000000) :
 			   0);
   struct
     {