aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2010-08-02 16:46:12 -0700
committerRoland McGrath <roland@redhat.com>2010-08-02 16:46:12 -0700
commit5a42321d438211210e0869e5e90f8d75d1354e14 (patch)
tree0808c239ed05760445e989c5681acd039c26c4f4
parent73507d3ae077c2dcf0da857a5a244deff3d4d223 (diff)
downloadglibc-5a42321d438211210e0869e5e90f8d75d1354e14.zip
glibc-5a42321d438211210e0869e5e90f8d75d1354e14.tar.gz
glibc-5a42321d438211210e0869e5e90f8d75d1354e14.tar.bz2
Hurd: fix timeout rounding in select
-rw-r--r--ChangeLog5
-rw-r--r--hurd/hurdselect.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a90d21..bd589f7 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-31 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/multiarch/Makefile [subdir=string] (sysdep_routines):
diff --git a/hurd/hurdselect.c b/hurd/hurdselect.c
index 544eee9..a7228f0 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
{