aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2010-08-02 16:46:12 -0700
committerPetr Baudis <pasky@suse.cz>2010-11-09 01:47:25 +0100
commit07b72c0b42b82f0432afcfb60a2cbb2c0f011420 (patch)
treeba5c068d0b31ee406a607a2faff2ff4b89994709
parent720be42915b3f5ae735f9f044b64285a2e34d33a (diff)
downloadglibc-07b72c0b42b82f0432afcfb60a2cbb2c0f011420.tar
glibc-07b72c0b42b82f0432afcfb60a2cbb2c0f011420.tar.gz
glibc-07b72c0b42b82f0432afcfb60a2cbb2c0f011420.tar.bz2
glibc-07b72c0b42b82f0432afcfb60a2cbb2c0f011420.zip
Hurd: fix timeout rounding in select
(cherry picked from commit 5a42321d438211210e0869e5e90f8d75d1354e14)
-rw-r--r--ChangeLog5
-rw-r--r--hurd/hurdselect.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ea5e7d2789..5652715365 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 544eee9cb5..a7228f0611 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
{